updated ndbapi examples

ndb/examples/ndbapi_example3/ndbapi_example3.cpp

@@ -22,7 +22,7 @@
 //
 //  There are many ways to program using the NDB API.  In this example
 //  we execute two inserts in the same transaction using 
-//  NdbConnection::Ndbexecute(NoCommit).
+//  NdbConnection::execute(NoCommit).
 // 
 //  Transaction failing is handled by re-executing the transaction
 //  in case of non-permanent transaction errors.
@@ -86,9 +86,9 @@ void printTransactionError(NdbTransaction *ndbTransaction) {
 
 //
 //  Example insert
-//  @param myNdb         Ndb object representing NDB Cluster
+//  @param myNdb          Ndb object representing NDB Cluster
 //  @param myTransaction  NdbTransaction used for transaction
-//  @param error         NdbError object returned in case of errors
+//  @param error          NdbError object returned in case of errors
 //  @return -1 in case of failures, 0 otherwise
 //
 int insert(int transactionId, NdbTransaction* myTransaction) {
@@ -203,10 +203,10 @@ int main()
     exit(-1);
   }
 
-  Ndb* myNdb = new Ndb( cluster_connection,
-			"TEST_DB_1" );  // Object representing the database
+  Ndb* myNdb= new Ndb( cluster_connection,
+		       "TEST_DB_1" );  // Object representing the database
   
-  if (myNdb->init() == -1) { 
+  if (myNdb->init() == -1) {
     APIERROR(myNdb->getNdbError());
     exit(-1);
   }

ndb/examples/ndbapi_example5/ndbapi_example5.cpp

@@ -58,8 +58,8 @@
 int myCreateEvent(Ndb* myNdb,
 		  const char *eventName,
 		  const char *eventTableName,
-		  const char **eventComlumnName,
-		  const int noEventComlumnName);
+		  const char **eventColumnName,
+		  const int noEventColumnName);
 
 int main()
 {
@@ -93,39 +93,30 @@ int main()
   Ndb* myNdb= new Ndb(cluster_connection,
 		      "TEST_DB");  // Object representing the database
 
-  if (myNdb->init() == -1) { 
-    APIERROR(myNdb->getNdbError());
-    exit(-1);
-  }
-
-  NdbDictionary::Dictionary *myDict;
+  if (myNdb->init() == -1) APIERROR(myNdb->getNdbError());
 
   const char *eventName= "CHNG_IN_TAB0";
   const char *eventTableName= "TAB0";
   const int noEventColumnName= 3;
-  const char *eventColumnName[noEventColumnName] =
+  const char *eventColumnName[noEventColumnName]=
     {"COL0",
      "COL1",
      "COL11"};
   
-  myDict = myNdb->getDictionary();
-
   // Create events
   myCreateEvent(myNdb,
 		eventName,
 		eventTableName,
 		eventColumnName,
 		noEventColumnName);
-  int j = 0;
+  int j= 0;
   while (j < 5) {
 
     // Start "transaction" for handling events
     NdbEventOperation* op;
     printf("create EventOperation\n");
-    if ((op = myNdb->createEventOperation(eventName,100)) == NULL) {
-      printf("Event operation creation failed\n");
-      exit(-1);
-    }
+    if ((op = myNdb->createEventOperation(eventName,100)) == NULL)
+      APIERROR(myNdb->getNdbError());
 
     printf("get values\n");
     NdbRecAttr* recAttr[noEventColumnName];
@@ -139,22 +130,21 @@ int main()
     // set up the callbacks
     printf("execute\n");
     if (op->execute()) { // This starts changes to "start flowing"
-      printf("operationd execution failed\n");
+      printf("operation execution failed\n");
       exit(-1);
     }
 
-    int i = 0;
-
+    int i= 0;
     while(i < 40) {
-      //printf("now waiting for event...\n");
-      int r = myNdb->pollEvents(1000); // wait for event or 1000 ms
-      if (r>0) {
-	//printf("got data! %d\n", r);
+      // printf("now waiting for event...\n");
+      int r= myNdb->pollEvents(1000); // wait for event or 1000 ms
+      if (r > 0) {
+	// printf("got data! %d\n", r);
 	int overrun;
 	while (op->next(&overrun) > 0) {
 	  i++;
 	  if (!op->isConsistent())
-	    printf("A node failiure has occured and events might be missing\n");
+	    printf("A node failure has occured and events might be missing\n");
 	  switch (op->getEventType()) {
 	  case NdbDictionary::Event::TE_INSERT:
 	    printf("%u INSERT: ", i);
@@ -190,13 +180,17 @@ int main()
       } else
 	;//printf("timed out\n");
     }
-    // don't want to listen to eventsanymore
+    // don't want to listen to events anymore
     myNdb->dropEventOperation(op);
 
     j++;
   }
 
-  myDict->dropEvent(eventName); // remove event from database
+  {
+    NdbDictionary::Dictionary *myDict = myNdb->getDictionary();
+    if (!myDict) APIERROR(myNdb->getNdbError());
+    myDict->dropEvent(eventName); // remove event from database
+  }
 
   delete myNdb;
   delete cluster_connection;
@@ -210,12 +204,8 @@ int myCreateEvent(Ndb* myNdb,
 		  const char **eventColumnName,
 		  const int noEventColumnName)
 {
-  NdbDictionary::Dictionary *myDict = myNdb->getDictionary();
-
-  if (!myDict) {
-    printf("Event Creation failedDictionary not found");
-    exit(-1);
-  }
+  NdbDictionary::Dictionary *myDict= myNdb->getDictionary();
+  if (!myDict) APIERROR(myNdb->getNdbError());
 
   NdbDictionary::Event myEvent(eventName);
   myEvent.setTable(eventTableName);

ndb/examples/ndbapi_scan_example/Makefile

@@ -9,12 +9,12 @@ LFLAGS = -Wall
 TOP_SRCDIR = ../../..
 INCLUDE_DIR = $(TOP_SRCDIR)/ndb/include
 LIB_DIR = -L$(TOP_SRCDIR)/ndb/src/.libs \
-          -L$(TOP_SRCDIR)/libmysql/.libs \
+          -L$(TOP_SRCDIR)/libmysql_r/.libs \
           -L$(TOP_SRCDIR)/mysys
 SYS_LIB = 
 
 $(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient -lmysys $(SYS_LIB) -o $(TARGET)
+	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) -lndbclient -lmysqlclient_r -lmysys -lz $(SYS_LIB) -o $(TARGET)
 
 $(TARGET).o: $(SRCS)
 	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/ndbapi $(SRCS)

ndb/examples/ndbapi_scan_example/ndbapi_scan.cpp

@@ -24,9 +24,12 @@
  *
  * Classes and methods used in this example:
  *
+ *  Ndb_cluster_connection
+ *       connect()
+ *       wait_until_ready()
+ *
  *  Ndb
  *       init()
- *       waitUntilRead()
  *       getDictionary()
  *       startTransaction()
  *       closeTransaction()
@@ -74,7 +77,6 @@
 
 
 #include <NdbApi.hpp>
-#include <NdbScanFilter.hpp>
 // Used for cout
 #include <iostream>
 
@@ -235,7 +237,7 @@ int scan_delete(Ndb* myNdb,
   int deletedRows = 0;
   int check;
   NdbError              err;
-  NdbConnection		*myTrans;
+  NdbTransaction	*myTrans;
   NdbScanOperation	*myScanOp;
 
   /**
@@ -407,7 +409,7 @@ int scan_update(Ndb* myNdb,
   int updatedRows = 0;
   int check;
   NdbError              err;
-  NdbConnection		*myTrans;
+  NdbTransaction	*myTrans;
   NdbScanOperation	*myScanOp;
 
   /**
@@ -588,7 +590,7 @@ int scan_print(Ndb * myNdb)
   int fetchedRows = 0;
   int check;
   NdbError              err;
-  NdbConnection		*myTrans;
+  NdbTransaction	*myTrans;
   NdbScanOperation	*myScanOp;
   /* Result of reading attribute value, three columns:
      REG_NO, BRAND, and COLOR