List:Commits« Previous MessageNext Message »
From:pekka Date:January 13 2006 5:02pm
Subject:bk commit into 5.1 tree (pekka:1.2049)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2049 06/01/13 18:02:43 pekka@stripped +7 -0
  ndb - wl#2972 event merge false by default => change option name

  storage/ndb/test/ndbapi/test_event_merge.cpp
    1.8 06/01/13 18:01:27 pekka@stripped +2 -2
    event merge false by default => change option name

  storage/ndb/test/ndbapi/test_event.cpp
    1.15 06/01/13 18:01:27 pekka@stripped +0 -4
    event merge false by default => change option name

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
    1.11 06/01/13 18:01:27 pekka@stripped +1 -1
    event merge false by default => change option name

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.31 06/01/13 18:01:27 pekka@stripped +2 -2
    event merge false by default => change option name

  storage/ndb/src/ndbapi/NdbEventOperation.cpp
    1.9 06/01/13 18:01:27 pekka@stripped +2 -2
    event merge false by default => change option name

  storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp
    1.3 06/01/13 18:01:27 pekka@stripped +2 -2
    event merge false by default => change option name

  storage/ndb/include/ndbapi/NdbEventOperation.hpp
    1.17 06/01/13 18:01:27 pekka@stripped +2 -4
    event merge false by default => change option name

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51-rbr

--- 1.16/storage/ndb/include/ndbapi/NdbEventOperation.hpp	2006-01-12 19:50:32 +01:00
+++ 1.17/storage/ndb/include/ndbapi/NdbEventOperation.hpp	2006-01-13 18:01:27 +01:00
@@ -94,11 +94,9 @@
    */
   State getState();
   /**
-   * By default events on same NdbEventOperation within same GCI
-   * are merged into a single event.  This can be changed with
-   * separateEvents(true).
+   * See NdbDictionary::Event.  Default is false.
    */
-  void separateEvents(bool flag);
+  void mergeEvents(bool flag);
 
   /**
    * Activates the NdbEventOperation to start receiving events. The

--- 1.8/storage/ndb/src/ndbapi/NdbEventOperation.cpp	2006-01-12 19:50:35 +01:00
+++ 1.9/storage/ndb/src/ndbapi/NdbEventOperation.cpp	2006-01-13 18:01:27 +01:00
@@ -38,9 +38,9 @@
   return m_impl.getState();
 }
 
-void NdbEventOperation::separateEvents(bool flag)
+void NdbEventOperation::mergeEvents(bool flag)
 {
-  m_impl.m_separateEvents = flag;
+  m_impl.m_mergeEvents = flag;
 }
 
 NdbRecAttr *

--- 1.30/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-01-13 00:20:26 +01:00
+++ 1.31/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-01-13 18:01:27 +01:00
@@ -104,7 +104,7 @@
 
   m_state= EO_CREATED;
 
-  m_separateEvents = true;
+  m_mergeEvents = false;
 
   m_has_error= 0;
 
@@ -1168,7 +1168,7 @@
     }
 
     bool use_hash =
-      ! op->m_separateEvents &&
+      op->m_mergeEvents &&
       sdata->operation < NdbDictionary::Event::_TE_FIRST_NON_DATA_EVENT;
 
     // find position in bucket hash table

--- 1.10/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp	2006-01-12 19:50:35 +01:00
+++ 1.11/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp	2006-01-13 18:01:27 +01:00
@@ -206,7 +206,7 @@
   Uint32 m_eventId;
   Uint32 m_oid;
 
-  bool m_separateEvents;
+  bool m_mergeEvents;
   
   EventBufData *m_data_item;
 

--- 1.14/storage/ndb/test/ndbapi/test_event.cpp	2006-01-12 00:16:52 +01:00
+++ 1.15/storage/ndb/test/ndbapi/test_event.cpp	2006-01-13 18:01:27 +01:00
@@ -169,7 +169,6 @@
     g_err << function << "Event operation creation failed\n";
     return NDBT_FAILED;
   }
-  pOp->separateEvents(true);
 
   g_info << function << "get values\n";
   NdbRecAttr* recAttr[1024];
@@ -381,7 +380,6 @@
       g_err << "Event operation creation failed\n";
       return NDBT_FAILED;
     }
-    pOp->separateEvents(true);
 
     g_info << "dropping event operation" << endl;
     int res = pNdb->dropEventOperation(pOp);
@@ -552,7 +550,6 @@
     g_err << "Event operation creation failed on %s" << buf << endl;
     DBUG_RETURN(NDBT_FAILED);
   }
-  pOp->separateEvents(true);
 
   int i;
   int n_columns= table->getNoOfColumns();
@@ -1198,7 +1195,6 @@
     {
       DBUG_RETURN(NDBT_FAILED);
     }
-    pOp->separateEvents(true);
 
     int n_columns= pTabs[i]->getNoOfColumns();
     for (int j = 0; j < n_columns; j++)

--- 1.7/storage/ndb/test/ndbapi/test_event_merge.cpp	2006-01-12 16:15:27 +01:00
+++ 1.8/storage/ndb/test/ndbapi/test_event_merge.cpp	2006-01-13 18:01:27 +01:00
@@ -850,7 +850,7 @@
     evt.addEventColumn(c.name);
   }
 #ifdef version51rbr
-  evt.separateEvents(g_opts.separate_events);
+  evt.mergeEvents(! g_opts.separate_events);
 #endif
   if (g_dic->getEvent(evt.getName()) != 0)
     chkdb(g_dic->dropEvent(evt.getName()) == 0);
@@ -881,7 +881,7 @@
 #else
   chkdb((g_evt_op = g_ndb->createEventOperation(g_evt->getName())) != 0);
   // available in gci merge changeset
-  g_evt_op->separateEvents(g_opts.separate_events); // not yet inherited
+  g_evt_op->mergeEvents(! g_opts.separate_events); // not yet inherited
 #endif
   uint i;
   for (i = 0; i < ncol(); i++) {

--- 1.2/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp	2005-12-05 15:19:27 +01:00
+++ 1.3/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp	2006-01-13 18:01:27 +01:00
@@ -100,7 +100,7 @@
 int main(int argc, char** argv)
 {
   ndb_init();
-  bool sep = argc > 1 && strcmp(argv[1], "-s") == 0;
+  bool merge_events = argc > 1 && strcmp(argv[1], "-m") == 0;
 
   Ndb_cluster_connection *cluster_connection=
     new Ndb_cluster_connection(); // Object representing the cluster
@@ -157,7 +157,7 @@
     printf("create EventOperation\n");
     if ((op = myNdb->createEventOperation(eventName)) == NULL)
       APIERROR(myNdb->getNdbError());
-    op->separateEvents(sep);
+    op->mergeEvents(merge_events);
 
     printf("get values\n");
     NdbRecAttr* recAttr[noEventColumnName];
Thread
bk commit into 5.1 tree (pekka:1.2049)pekka13 Jan