mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ndb - bug#20751 : report also composite op in merge

Browse source 
storage/ndb/test/ndbapi/test_event_merge.cpp:
  cannot skip tables if ops specified
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  report even composite op in merge
  test case: test_event_merge --no-blobs --ops ic:dcic
This commit is contained in:
unknown 2006-07-03 12:13:57 +02:00
parent d4350444c5
commit 9baac37a62
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
View file

@ -1809,11 +1809,18 @@ NdbEventBuffer::insertDataL(NdbEventOperationImpl *op,
}
// merge is on so we do not report blob part events
if (! is_blob_event) {
// report actual operation, not composite
// report actual operation and the composite
// there is no way to "fix" the flags for a composite op
// since the flags represent multiple ops on multiple PKs
EventBufData_list::Gci_op g = { op, (1 << sdata->operation) };
bucket->m_data.add_gci_op(g);
// XXX fix by doing merge at end of epoch (extra mem cost)
{
EventBufData_list::Gci_op g = { op, (1 << sdata->operation) };
bucket->m_data.add_gci_op(g);
}
{
EventBufData_list::Gci_op g = { op, (1 << data->sdata->operation) };
bucket->m_data.add_gci_op(g);
}
}
}
DBUG_RETURN_EVENT(0);

12
storage/ndb/test/ndbapi/test_event_merge.cpp
View file

@ -1535,11 +1535,19 @@ selecttables()
uint i;
for (i = 0; i < maxrun(); i++)
run(i).skip = false;
if (g_opts.opstring != 0) {
ll1("using all tables due to fixed ops");
return;
}
for (i = 0; i + 1 < maxrun(); i++)
run(urandom(maxrun())).skip = true;
uint cnt = 0;
for (i = 0; i < maxrun(); i++)
cnt += ! run(i).skip;
for (i = 0; i < maxrun(); i++) {
if (! run(i).skip) {
ll2("use table " << run(i).tabname);
cnt++;
}
}
ll1("use " << cnt << "/" << maxrun() << " tables in this loop");
}