Commit 9baac37a authored by unknown's avatar unknown
Browse files

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


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
parent d4350444

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

+10 −3
Original line number Diff line number Diff line
@@ -1809,12 +1809,19 @@ 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

        // 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);

  }

storage/ndb/test/ndbapi/test_event_merge.cpp

+10 −2
Original line number Diff line number Diff line
@@ -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");

}