neww ndb automake

1 files changed, 997 insertions, 0 deletions

diff --git a/ndb/test/ndbapi/index.cpp b/ndb/test/ndbapi/index.cpp
new file mode 100644
index 00000000000..508186de529
--- /dev/null
+++ b/ndb/test/ndbapi/index.cpp
@@ -0,0 +1,997 @@
+/* Copyright (C) 2003 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+/* ***************************************************
+       INDEX TEST 1
+       Test index functionality of NDB
+
+       Arguments:
+        -T create table
+        -L include a long attribute in key or index
+        -2 define primary key with two attributes
+        -c create index
+	-p make index unique (include primary key attribute)
+        -r read using index
+	-u update using index
+	-d delete using index
+	-n<no operations> do n operations (for -I -r -u -d -R -U -D)
+	-o<no parallel operations> (for -I -r -u -d -R -U -D)
+	-m<no indexes>
+
+       Returns:
+        0 - Test passed
+       -1 - Test failed
+        1 - Invalid arguments
+ * *************************************************** */
+
+#include <ndb_global.h>
+
+#include <NdbApi.hpp>
+#include <NdbOut.hpp>
+#include <NdbTick.h>
+#include <NdbMain.h>
+#include <NdbTest.hpp>
+#include <NDBT_Error.hpp>
+
+#ifndef MIN
+#define MIN(x,y) (((x)<(y))?(x):(y))
+#endif
+
+#define MAX_NO_PARALLEL_OPERATIONS 100
+
+bool testPassed = true;
+
+static void
+error_handler(const NdbError & err)
+{
+  // Test failed 
+  ndbout << endl << err << endl;
+  testPassed = false;
+}
+
+static void
+error_handler4(int line, const NdbError & err){
+  ndbout << endl << "Line " << line << endl;
+  // Test failed 
+  ndbout << err << endl;
+  testPassed = false;
+}
+
+static char *longName, *sixtysix, *ninetynine, *hundred;
+
+static void createTable(Ndb &myNdb, bool storeInACC, bool twoKey, bool longKey)
+{
+  NdbDictionary::Dictionary* dict = myNdb.getDictionary();
+  NdbDictionary::Table table("PERSON");
+  //NdbDictionary::Column column(); // Bug
+  NdbDictionary::Column column;
+  int res;
+
+  column.setName("NAME");
+  column.setPrimaryKey(true);
+  column.setType(NdbDictionary::Column::Char);
+  column.setLength((longKey)?
+		   1024       // 1KB => long key
+		   :12);
+  column.setNullable(false);
+  table.addColumn(column);
+
+  if (twoKey) {
+    column.setName("KEY2");
+    column.setPrimaryKey(true);
+    column.setType(NdbDictionary::Column::Unsigned);
+    column.setLength(1);
+    column.setNullable(false);
+    table.addColumn(column);
+  }
+
+  column.setName("PNUM1");
+  column.setPrimaryKey(false);
+  column.setType(NdbDictionary::Column::Unsigned);
+  column.setLength(1);
+  column.setNullable(false);
+  table.addColumn(column);
+
+  column.setName("PNUM2");
+  column.setPrimaryKey(false);
+  column.setType(NdbDictionary::Column::Unsigned);
+  column.setLength(1);
+  column.setNullable(false);
+  table.addColumn(column);
+
+  column.setName("PNUM3");
+  column.setPrimaryKey(false);
+  column.setType(NdbDictionary::Column::Unsigned);
+  column.setLength(1);
+  column.setNullable(false);
+  table.addColumn(column);
+
+  column.setName("PNUM4");
+  column.setPrimaryKey(false);
+  column.setType(NdbDictionary::Column::Unsigned);
+  column.setLength(1);
+  column.setNullable(false);
+  table.addColumn(column);
+
+  column.setName("AGE");
+  column.setPrimaryKey(false);
+  column.setType(NdbDictionary::Column::Unsigned);
+  column.setLength(1);
+  column.setNullable(false);
+  table.addColumn(column);
+
+  column.setName("STRING_AGE");
+  column.setPrimaryKey(false);
+  column.setType(NdbDictionary::Column::Char);
+  column.setLength(1);
+  column.setLength(256);
+  column.setNullable(false);
+  table.addColumn(column);
+
+  if ((res = dict->createTable(table)) == -1) {
+    error_handler(dict->getNdbError());
+  }
+  else
+      ndbout << "Created table" << ((longKey)?" with long key":"") <<endl;
+}
+
+static void createIndex(Ndb &myNdb, bool includePrimary, unsigned int noOfIndexes)
+{
+  Uint64 before, after;
+  NdbDictionary::Dictionary* dict = myNdb.getDictionary();
+  char indexName[] = "PNUMINDEX0000";
+  int res;
+
+  for(unsigned int indexNum = 0; indexNum < noOfIndexes; indexNum++) {
+    sprintf(indexName, "PNUMINDEX%.4u", indexNum);
+    NdbDictionary::Index index(indexName);
+    index.setTable("PERSON");
+    index.setType(NdbDictionary::Index::UniqueHashIndex);
+    if (includePrimary) {
+      const char* attr_arr[] = {"NAME", "PNUM1", "PNUM3"};
+      index.addIndexColumns(3, attr_arr);
+    }
+    else {
+      const char* attr_arr[] = {"PNUM1", "PNUM3"};
+      index.addIndexColumns(2, attr_arr);
+    }
+    before = NdbTick_CurrentMillisecond();
+    if ((res = dict->createIndex(index)) == -1) {
+      error_handler(dict->getNdbError());
+    }    
+    after = NdbTick_CurrentMillisecond();
+    ndbout << "Created index " << indexName << ", " << after - before << " msec" << endl;
+  }
+}
+  
+static void insertTable(Ndb &myNdb, unsigned int noOfTuples, unsigned int noOfOperations, bool oneTrans, bool twoKey, bool longKey)
+{
+  Uint64 tbefore, tafter, before, after;
+  NdbConnection  *myTrans;  
+  NdbOperation   *myOp;   
+  char name[] = "Kalle0000000";
+  
+  tbefore = NdbTick_CurrentMillisecond();
+  if (oneTrans) myTrans = myNdb.startTransaction();
+  for (unsigned int i = 0; i<noOfTuples; i++) {
+    if (!oneTrans) myTrans = myNdb.startTransaction();
+    for(unsigned int j = 1; 
+	((j<=noOfOperations)&&(i<noOfTuples)); 
+	(++j<=noOfOperations)?i++:i) { 
+      if (myTrans == NULL) 
+	error_handler4(__LINE__, myNdb.getNdbError());
+      
+      myOp = myTrans->getNdbOperation("PERSON"); 
+      if (myOp == NULL) 
+	error_handler4(__LINE__, myTrans->getNdbError());
+      
+      myOp->insertTuple();
+      sprintf(name, "Kalle%.7i", i);
+      if (longKey)
+	memcpy(longName, name, strlen(name)); 
+      if (myOp->equal("NAME", (longKey)?longName:name) == -1) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }      
+      if (twoKey)
+	if (myOp->equal("KEY2", i) == -1) {
+	  error_handler4(__LINE__, myTrans->getNdbError());
+	  myNdb.closeTransaction(myTrans);
+	  break;
+	}      
+      if (myOp->setValue("PNUM1", 17) == -1) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }      
+      if (myOp->setValue("PNUM2", 18)) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }      
+      if (myOp->setValue("PNUM3", 19)) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }      
+      if (myOp->setValue("PNUM4", 20)) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }      
+      if (myOp->setValue("AGE", ((i % 2) == 0)?66:99) == -1) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }      
+      if (myOp->setValue("STRING_AGE", ((i % 2) == 0)?sixtysix:ninetynine) == -1) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }      
+    }
+    if (noOfOperations == 1)
+      printf("Trying to insert person %s\n", name);
+    else
+      printf("Trying to insert %u persons\n", noOfOperations);
+    before = NdbTick_CurrentMillisecond();
+    if (myTrans->execute( (oneTrans) ? NoCommit : Commit ) == -1)
+      {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }
+    after = NdbTick_CurrentMillisecond();
+    if (noOfOperations == 1)
+      printf("Inserted person %s, %u msec\n", name, (Uint32) after - before);
+    else
+      printf("Inserted %u persons, %u msec\n", noOfOperations, (Uint32) after - before);
+    if (!oneTrans) myNdb.closeTransaction(myTrans);
+  }
+  if (oneTrans) {
+    if (myTrans->execute( Commit ) == -1) {
+      error_handler4(__LINE__, myTrans->getNdbError());
+    }
+    myNdb.closeTransaction(myTrans);
+  }
+  tafter = NdbTick_CurrentMillisecond();
+
+  ndbout << "Inserted "<< noOfTuples << " tuples in " << ((oneTrans) ? 1 : noOfTuples) << " transaction(s), " << tafter - tbefore << " msec" << endl;        
+}
+ 
+static void updateTable(Ndb &myNdb, unsigned int noOfTuples, unsigned int noOfOperations, bool oneTrans, bool twoKey, bool longKey)
+{
+  Uint64 tbefore, tafter, before, after;
+  NdbConnection  *myTrans;  
+  NdbOperation   *myOp;   
+  char name[] = "Kalle0000000";
+  
+  tbefore = NdbTick_CurrentMillisecond();
+  if (oneTrans) myTrans = myNdb.startTransaction();
+  for (unsigned int i = 0; i<noOfTuples; i++) {
+    if (!oneTrans) myTrans = myNdb.startTransaction();
+    for(unsigned int j = 1; 
+	((j<=noOfOperations)&&(i<noOfTuples)); 
+	(++j<=noOfOperations)?i++:i) { 
+      if (myTrans == NULL) 
+	error_handler4(__LINE__, myNdb.getNdbError());
+      
+      myOp = myTrans->getNdbOperation("PERSON"); 
+      if (myOp == NULL) 
+	error_handler4(__LINE__, myTrans->getNdbError());
+      
+      myOp->updateTuple();
+      sprintf(name, "Kalle%.7i", i);
+      if (longKey)
+	memcpy(longName, name, strlen(name)); 
+      if (myOp->equal("NAME", (longKey)?longName:name) == -1) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }      
+      if (twoKey)
+	if (myOp->equal("KEY2", i) == -1) {
+	  error_handler4(__LINE__, myTrans->getNdbError());
+	  myNdb.closeTransaction(myTrans);
+	  break;
+	}      
+      if (myOp->setValue("PNUM1", 77) == -1) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }      
+      if (myOp->setValue("PNUM2", 88)) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }      
+      if (myOp->setValue("PNUM4", 99)) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }      
+      if (myOp->setValue("AGE", 100) == -1) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }      
+      if (myOp->setValue("STRING_AGE", hundred) == -1) {
+	error_handler4(__LINE__, myTrans->getNdbError());
+	myNdb.closeTransaction(myTrans);
+	break;
+      }
+    }
+    if (noOfOperations == 1)
+      printf("Trying to update person %s\n", name);
+    else
+      printf("Trying to update %u persons\n", noOfOperations);
+      before = NdbTick_CurrentMillisecond();
+      if (myTrans->execute( (oneTrans) ? NoCommit : Commit ) == -1)
+	{
+	  error_handler4(__LINE__, myTrans->getNdbError());
+	  myNdb.closeTransaction(myTrans);
+	  break;
+	}
+      after = NdbTick_CurrentMillisecond();
+      if (noOfOperations == 1)
+	printf("Updated person %s, %u msec\n", name, (Uint32) after - before);
+      else
+	printf("Update %u persons, %u msec\n", noOfOperations, (Uint32) after - before);
+      if (!oneTrans) myNdb.closeTransaction(myTrans);
+  }     
+  if (oneTrans) {
+    if (myTrans->execute( Commit ) == -1) {
+      error_handler4(__LINE__, myTrans->getNdbError());
+    }
+    myNdb.closeTransaction(myTrans);
+  }
+  tafter = NdbTick_CurrentMillisecond();
+  
+  ndbout << "Updated "<< noOfTuples << " tuples in " << ((oneTrans) ? 1 : noOfTuples) << " transaction(s), " << tafter - tbefore << " msec" << endl;        
+}
+
+static void deleteTable(Ndb &myNdb, unsigned int noOfTuples, unsigned int noOfOperations, bool oneTrans, bool twoKey, bool longKey)
+{
+  Uint64 tbefore, tafter, before, after;
+  NdbConnection  *myTrans;  
+  NdbOperation   *myOp;   
+  char name[] = "Kalle0000000";
+  
+  tbefore = NdbTick_CurrentMillisecond();
+  if (oneTrans) myTrans = myNdb.startTransaction();
+  for (unsigned int i = 0; i<noOfTuples; i++) {
+    if (!oneTrans) myTrans = myNdb.startTransaction();
+    for(unsigned int j = 1; 
+	((j<=noOfOperations)&&(i<noOfTuples)); 
+	(++j<=noOfOperations)?i++:i) { 
+      if (myTrans == NULL) 
+        error_handler4(__LINE__, myNdb.getNdbError());
+      
+      myOp = myTrans->getNdbOperation("PERSON"); 
+      if (myOp == NULL) 
+        error_handler4(__LINE__, myTrans->getNdbError());
+      
+      myOp->deleteTuple();
+      sprintf(name, "Kalle%.7i", i);
+      if (longKey)
+        memcpy(longName, name, strlen(name)); 
+      if (myOp->equal("NAME", (longKey)?longName:name) == -1) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }      
+      if (twoKey)
+        if (myOp->equal("KEY2", i) == -1) {
+          error_handler4(__LINE__, myTrans->getNdbError());
+          myNdb.closeTransaction(myTrans);
+          break;
+        }      
+    }
+    if (noOfOperations == 1)
+      printf("Trying to delete person %s\n", name);
+    else
+      printf("Trying to delete %u persons\n", noOfOperations);
+    before = NdbTick_CurrentMillisecond();
+    if (myTrans->execute( (oneTrans) ? NoCommit : Commit ) == -1)
+      {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }
+    after = NdbTick_CurrentMillisecond();
+    if (noOfOperations == 1)
+      printf("Deleted person %s, %u msec\n", name, (Uint32) after - before);
+    else
+      printf("Deleted %u persons, %u msec\n", noOfOperations, (Uint32) after - before);
+    
+    if (!oneTrans) myNdb.closeTransaction(myTrans);
+  }
+  if (oneTrans) {
+    if (myTrans->execute( Commit ) == -1) {
+      error_handler4(__LINE__, myTrans->getNdbError());
+    }
+    myNdb.closeTransaction(myTrans);
+  }
+  tafter = NdbTick_CurrentMillisecond();
+
+  ndbout << "Deleted "<< noOfTuples << " tuples in " << ((oneTrans) ? 1 : noOfTuples) << " transaction(s), " << tafter - tbefore << " msec" << endl;        
+}
+
+static void readTable(Ndb &myNdb, unsigned int noOfTuples, unsigned int noOfOperations, bool oneTrans, bool twoKey, bool longKey)
+{
+  Uint64 tbefore, tafter, before, after;
+  NdbConnection  *myTrans;  
+  NdbOperation   *myOp;   
+  char name[] = "Kalle0000000";
+  NdbRecAttr* myRecAttrArr[MAX_NO_PARALLEL_OPERATIONS];
+  
+  tbefore = NdbTick_CurrentMillisecond();
+  if (oneTrans) myTrans = myNdb.startTransaction();
+  for (unsigned int i = 0; i<noOfTuples; i++) {
+    if (!oneTrans) myTrans = myNdb.startTransaction();
+    for(unsigned int j = 1; 
+	((j<=noOfOperations)&&(i<noOfTuples)); 
+	(++j<=noOfOperations)?i++:i) { 
+      if (myTrans == NULL) 
+        error_handler4(__LINE__, myNdb.getNdbError());
+      
+      myOp = myTrans->getNdbOperation("PERSON"); 
+      if (myOp == NULL) 
+        error_handler4(__LINE__, myTrans->getNdbError());
+      
+      myOp->readTuple();
+      sprintf(name, "Kalle%.7i", i);
+      if (longKey)
+        memcpy(longName, name, strlen(name)); 
+      if (myOp->equal("NAME", (longKey)?longName:name) == -1) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }         
+      if (twoKey)
+        if (myOp->equal("KEY2", i) == -1) {
+          error_handler4(__LINE__, myTrans->getNdbError());
+          myNdb.closeTransaction(myTrans);
+          break;
+        }      
+      myRecAttrArr[j-1] = myOp->getValue("PNUM2", NULL);
+    }
+    if (noOfOperations == 1)
+      printf("Trying to read person %s\n", name);
+    else
+      printf("Trying to read %u persons\n", noOfOperations);
+    before = NdbTick_CurrentMillisecond();
+    if (myTrans->execute( (oneTrans) ? NoCommit : Commit ) == -1)
+      {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }
+    after = NdbTick_CurrentMillisecond();
+    if (noOfOperations == 1)
+      printf("Read person %s, %u msec\n", name, (Uint32) after - before);
+    else
+      printf("Read %u persons, %u msec\n", noOfOperations, (Uint32) after - before);
+    for(unsigned int j = 0; j<noOfOperations; j++)
+      printf("PNUM2 = %u\n", myRecAttrArr[j]->u_32_value());
+    if (!oneTrans) myNdb.closeTransaction(myTrans);
+  }
+  if (oneTrans) {
+    if (myTrans->execute( Commit ) == -1) {
+      error_handler4(__LINE__, myTrans->getNdbError());
+    }
+    myNdb.closeTransaction(myTrans);
+  }
+  tafter = NdbTick_CurrentMillisecond();
+
+  ndbout << "Read "<< noOfTuples << " tuples in " << ((oneTrans) ? 1 : noOfTuples) << " transaction(s), " << tafter - tbefore << " msec" << endl;        
+}
+
+static void readIndex(Ndb &myNdb, unsigned int noOfTuples, unsigned int noOfOperations, bool includePrimary, bool oneTrans, bool longKey)
+{
+  Uint64 tbefore, tafter, before, after;
+  NdbConnection  *myTrans;  
+  NdbIndexOperation   *myOp; 
+  char indexName[] = "PNUMINDEX0000";
+  char name[] = "Kalle0000000";
+  NdbRecAttr* myRecAttrArr[MAX_NO_PARALLEL_OPERATIONS];
+  
+  tbefore = NdbTick_CurrentMillisecond();
+  if (oneTrans) myTrans = myNdb.startTransaction();
+  for (unsigned int i = 0; i<noOfTuples; i++) {
+    if (!oneTrans) myTrans = myNdb.startTransaction();
+    for(unsigned int j = 1; 
+	((j<=noOfOperations)&&(i<noOfTuples)); 
+	(++j<=noOfOperations)?i++:i) { 
+      if (myTrans == NULL) 
+        error_handler4(__LINE__, myNdb.getNdbError());
+      
+      myOp = myTrans->getNdbIndexOperation(indexName, "PERSON"); 
+      if (myOp == NULL) 
+        error_handler4(__LINE__, myTrans->getNdbError());
+      
+      myOp->readTuple();
+      if (includePrimary) {
+        sprintf(name, "Kalle%.7i", i);
+        if (longKey)
+          memcpy(longName, name, strlen(name)); 
+        if (myOp->equal("NAME", (longKey)?longName:name) == -1) {
+          error_handler4(__LINE__, myTrans->getNdbError());
+          myNdb.closeTransaction(myTrans);
+          break;
+        }         
+      } 
+      if (myOp->equal("PNUM1", 17) == -1) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }          
+      if (myOp->equal("PNUM3", 19) == -1) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }          
+      myRecAttrArr[j-1] = myOp->getValue("PNUM2", NULL);
+    }
+    if (noOfOperations == 1)
+      printf("Trying to read person %s\n", name);
+    else
+      printf("Trying to read %u persons\n", noOfOperations);
+    before = NdbTick_CurrentMillisecond();
+    if (myTrans->execute( (oneTrans) ? NoCommit : Commit ) == -1)
+      {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }
+    after = NdbTick_CurrentMillisecond();
+    if (noOfOperations == 1)
+      printf("Read person %s, %u msec\n", name, (Uint32) after - before);
+    else
+      printf("Read %u persons, %u msec\n", noOfOperations, (Uint32) after - before);
+    for(unsigned int j = 0; j<noOfOperations; j++)
+      printf("PNUM2 = %u\n", myRecAttrArr[j]->u_32_value());
+    if (!oneTrans) myNdb.closeTransaction(myTrans);
+  }
+  if (oneTrans) {
+    if (myTrans->execute( Commit ) == -1) {
+      error_handler4(__LINE__, myTrans->getNdbError());
+    }
+    myNdb.closeTransaction(myTrans);
+  }
+  tafter = NdbTick_CurrentMillisecond();
+
+  ndbout << "Read "<< noOfTuples << " tuples in " << ((oneTrans) ? 1 : noOfTuples) << " transaction(s), " << tafter - tbefore << " msec" << endl;        
+}
+
+static void updateIndex(Ndb &myNdb, unsigned int noOfTuples, unsigned int noOfOperations, bool includePrimary, bool oneTrans, bool longKey)
+{
+  Uint64 tbefore, tafter, before, after;
+  NdbConnection  *myTrans;  
+  NdbIndexOperation   *myOp;   
+  char indexName[] = "PNUMINDEX0000";
+  char name[] = "Kalle0000000";
+  
+  tbefore = NdbTick_CurrentMillisecond();
+  if (oneTrans) myTrans = myNdb.startTransaction();
+  for (unsigned int i = 0; i<noOfTuples; i++) {
+    if (!oneTrans) myTrans = myNdb.startTransaction();
+    for(unsigned int j = 1; 
+	((j<=noOfOperations)&&(i<noOfTuples)); 
+	(++j<=noOfOperations)?i++:i) { 
+      if (myTrans == NULL) 
+        error_handler4(__LINE__, myNdb.getNdbError());
+      
+      myOp = myTrans->getNdbIndexOperation(indexName, "PERSON"); 
+      if (myOp == NULL) 
+        error_handler4(__LINE__, myTrans->getNdbError());
+      
+      myOp->updateTuple();
+      if (includePrimary) {
+        sprintf(name, "Kalle%.7i", i);
+        if (longKey)
+          memcpy(longName, name, strlen(name)); 
+        if (myOp->equal("NAME", (longKey)?longName:name) == -1) {
+          error_handler4(__LINE__, myTrans->getNdbError());
+          myNdb.closeTransaction(myTrans);
+          break;
+        }         
+      } 
+      if (myOp->equal("PNUM1", 17) == -1) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      } 
+      if (myOp->equal("PNUM3", 19) == -1) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }          
+      // Update index itself, should be possible
+      if (myOp->setValue("PNUM1", 77) == -1) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }      
+      if (myOp->setValue("PNUM2", 88)) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }      
+      if (myOp->setValue("PNUM4", 99)) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }      
+      if (myOp->setValue("AGE", 100) == -1) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }      
+      if (myOp->setValue("STRING_AGE", hundred) == -1) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }      
+    }
+    if (noOfOperations == 1)
+      printf("Trying to update person %s\n", name);
+    else
+      printf("Trying to update %u persons\n", noOfOperations);
+    before = NdbTick_CurrentMillisecond();
+    if (myTrans->execute( (oneTrans) ? NoCommit : Commit ) == -1)
+      {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }
+    after = NdbTick_CurrentMillisecond();
+    if (noOfOperations == 1)
+      printf("Updated person %s, %u msec\n", name, (Uint32) after - before);
+    else
+      printf("Updated %u persons, %u msec\n", noOfOperations, (Uint32) after - before);
+    if (!oneTrans) myNdb.closeTransaction(myTrans);
+  }
+  if (oneTrans) {
+    if (myTrans->execute( Commit ) == -1) {
+      error_handler4(__LINE__, myTrans->getNdbError());
+    }
+    myNdb.closeTransaction(myTrans);
+  }
+  tafter = NdbTick_CurrentMillisecond();
+  
+  ndbout << "Updated "<< noOfTuples << " tuples in " << ((oneTrans) ? 1 : noOfTuples) << " transaction(s), " << tafter - tbefore << " msec" << endl;        
+}
+
+static void deleteIndex(Ndb &myNdb, unsigned int noOfTuples, unsigned int noOfOperations, bool includePrimary, bool oneTrans, bool longKey)
+{
+  Uint64 tbefore, tafter, before, after;
+  NdbConnection  *myTrans;  
+  NdbIndexOperation   *myOp;   
+  char indexName[] = "PNUMINDEX0000";
+  char name[] = "Kalle0000000";
+  
+  tbefore = NdbTick_CurrentMillisecond();
+  if (oneTrans) myTrans = myNdb.startTransaction();
+  for (unsigned int i = 0; i<noOfTuples; i++) {
+    for(unsigned int j = 1; 
+	((j<=noOfOperations)&&(i<noOfTuples)); 
+	(++j<=noOfOperations)?i++:i) { 
+      if (!oneTrans) myTrans = myNdb.startTransaction();
+      if (myTrans == NULL) 
+        error_handler4(__LINE__, myNdb.getNdbError());
+      
+      myOp = myTrans->getNdbIndexOperation(indexName, "PERSON"); 
+      if (myOp == NULL) 
+        error_handler4(__LINE__, myTrans->getNdbError());
+      
+      myOp->deleteTuple();
+      if (includePrimary) {
+        sprintf(name, "Kalle%.7i", i);
+        if (longKey)
+          memcpy(longName, name, strlen(name)); 
+        if (myOp->equal("NAME", (longKey)?longName:name) == -1) {
+          error_handler4(__LINE__, myTrans->getNdbError());
+          myNdb.closeTransaction(myTrans);
+          break;
+        }         
+      } 
+      if (myOp->equal("PNUM1", 17) == -1) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+      myNdb.closeTransaction(myTrans);
+      break;
+      }          
+      if (myOp->equal("PNUM3", 19) == -1) {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }       
+    }
+    if (noOfOperations == 1)
+      printf("Trying to delete person %s\n", name);
+    else
+      printf("Trying to delete %u persons\n", noOfOperations);
+    before = NdbTick_CurrentMillisecond();
+    if (myTrans->execute( (oneTrans) ? NoCommit : Commit ) == -1)
+      {
+        error_handler4(__LINE__, myTrans->getNdbError());
+        myNdb.closeTransaction(myTrans);
+        break;
+      }
+    after = NdbTick_CurrentMillisecond();
+    if (noOfOperations == 1)
+      printf("Deleted person %s, %u msec\n", name, (Uint32) after - before);
+    else
+      printf("Deleted %u persons, %u msec\n", noOfOperations, (Uint32) after - before);
+    if (!oneTrans) myNdb.closeTransaction(myTrans);
+  }
+  if (oneTrans) {
+    if (myTrans->execute( Commit ) == -1) {
+      error_handler4(__LINE__, myTrans->getNdbError());
+    }
+    myNdb.closeTransaction(myTrans);
+  }
+  tafter = NdbTick_CurrentMillisecond();
+
+  ndbout << "Deleted "<< noOfTuples << " tuples in " << ((oneTrans) ? 1 : noOfTuples) << " transaction(s), " << tafter - tbefore << " msec" << endl;        
+}
+
+static void dropIndex(Ndb &myNdb, unsigned int noOfIndexes)
+{
+  for(unsigned int indexNum = 0; indexNum < noOfIndexes; indexNum++) {
+    char indexName[255];
+    sprintf(indexName, "PNUMINDEX%.4u", indexNum);
+    const Uint64 before = NdbTick_CurrentMillisecond();
+    const int retVal = myNdb.getDictionary()->dropIndex(indexName, "PERSON");
+    const Uint64 after = NdbTick_CurrentMillisecond();
+    
+    if(retVal == 0){
+      ndbout << "Dropped index " << indexName << ", " 
+	     << after - before << " msec" << endl;
+    } else {
+      ndbout << "Failed to drop index " << indexName << endl;
+      ndbout << myNdb.getDictionary()->getNdbError() << endl;
+    }
+  }
+}
+
+NDB_COMMAND(indexTest, "indexTest", "indexTest", "indexTest", 65535)
+{
+  bool createTableOp, createIndexOp, dropIndexOp, insertOp, updateOp, deleteOp, readOp, readIndexOp, updateIndexOp, deleteIndexOp, twoKey, longKey;
+  unsigned int noOfTuples = 1;
+  unsigned int noOfOperations = 1;
+  unsigned int noOfIndexes = 1;
+  int i = 1;
+  Ndb myNdb( "TEST_DB" );
+  int check;
+  bool storeInACC = false;
+  bool includePrimary = false;
+  bool oneTransaction = false;
+
+  createTableOp = createIndexOp = dropIndexOp = insertOp = updateOp = deleteOp = readOp = readIndexOp = updateIndexOp = deleteIndexOp = twoKey = longKey = false;
+  // Read arguments
+  if (argc > 1)
+    while (argc > 1)
+      {
+	if (strcmp(argv[i], "-T") == 0)
+	  {
+	    createTableOp = true;
+	    argc -= 1;
+	    i++;
+	  }
+	else if (strcmp(argv[i], "-c") == 0)
+	  {
+	    createIndexOp = true;
+	    argc -= 1;
+	    i++;
+	  }
+	else if (strcmp(argv[i], "-X") == 0)
+	  {
+	    dropIndexOp = true;
+	    argc -= 1;
+	    i++;
+	  }
+	else if (strcmp(argv[i], "-I") == 0)
+	  {
+	    insertOp = true;
+	    argc -= 1;
+	    i++;
+	  }
+	else if (strcmp(argv[i], "-D") == 0)
+	  {
+	    deleteOp = true;
+	    argc -= 1;
+	    i++;
+	  }
+	else if (strcmp(argv[i], "-U") == 0)
+	  {
+	    updateOp = true;
+	    argc -= 1;
+	    i++;
+	  }
+	else if (strcmp(argv[i], "-R") == 0)
+	  {
+	    readOp = true;
+	    argc -= 1;
+	    i++;
+	  }
+	else if (strcmp(argv[i], "-r") == 0)
+	  {
+	    readIndexOp = true;
+	    argc -= 1;
+	    i++;
+	  }
+	else if (strcmp(argv[i], "-u") == 0)
+	  {
+	    updateIndexOp = true;
+	    argc -= 1;
+	    i++;
+	  }
+	else if (strcmp(argv[i], "-d") == 0)
+	  {
+	    deleteIndexOp = true;
+	    argc -= 1;
+	    i++;
+	  }
+	else if (strcmp(argv[i], "-s") == 0)
+	  {
+	    storeInACC = true;
+	    argc -= 1;
+	    i++;
+	  }
+	else if (strcmp(argv[i], "-p") == 0)
+	  {
+	    includePrimary = true;
+	    argc -= 1;
+	    i++;
+	  }
+	else if (strcmp(argv[i], "-L") == 0)
+	  {
+	    longKey = true;
+	    argc -= 1;
+	    i++;
+	  }
+ 	else if (strcmp(argv[i], "-1") == 0)
+	  {
+	    oneTransaction = true;
+	    argc -= 1;
+	    i++;
+	  }       
+ 	else if (strcmp(argv[i], "-2") == 0)
+	  {
+	    twoKey = true;
+	    argc -= 1;
+	    i++;
+	  }       
+        else if (strstr(argv[i], "-n") != 0)
+          {
+            noOfTuples = atoi(argv[i]+2);
+            argc -= 1;
+            i++;
+          }
+        else if (strstr(argv[i], "-o") != 0)
+          {
+            noOfOperations = MIN(MAX_NO_PARALLEL_OPERATIONS, atoi(argv[i]+2));
+            argc -= 1;
+            i++;
+          }
+        else if (strstr(argv[i], "-m") != 0)
+          {
+            noOfIndexes = atoi(argv[i]+2);
+            argc -= 1;
+            i++;
+          }
+	else if (strstr(argv[i], "-h") != 0)
+          {
+	    printf("Synopsis:\n");
+	    printf("index\n");
+	    printf("\t-T create table\n");
+            printf("\t-L include a long attribute in key or index\n");
+            printf("\t-2 define primary key with two attributes\n");
+            printf("\t-c create index\n");
+	    printf("\t-p make index unique (include primary key attribute)\n");
+            printf("\t-r read using index\n");
+	    printf("\t-u update using index\n");
+	    printf("\t-d delete using index\n");
+	    printf("\t-n<no operations> do n operations (for -I -r -u -d -R -U -D)\n");
+	    printf("\t-o<no parallel operations> (for -I -r -u -d -R -U -D)\n");
+	    printf("\t-m<no indexes>\n");
+            argc -= 1;
+            i++;
+	  }
+	else {
+	  char errStr[256];
+
+	  printf(errStr, "Illegal argument: %s", argv[i]);
+	  exit(-1);
+	}
+      }
+  else
+    {
+      createTableOp = createIndexOp = dropIndexOp = insertOp = updateOp = deleteOp = true;
+    }
+  if (longKey) {
+    longName = (char *)  malloc(1024);
+    for (int i = 0; i < 1023; i++)
+      longName[i] = 'x'; 
+    longName[1023] = '\0';
+  }
+  sixtysix = (char *)  malloc(256);
+  for (int i = 0; i < 255; i++)
+    sixtysix[i] = ' '; 
+  sixtysix[255] = '\0';
+  strncpy(sixtysix, "sixtysix", strlen("sixtysix"));
+  ninetynine = (char *)  malloc(256);
+  for (int i = 0; i < 255; i++)
+    ninetynine[i] = ' '; 
+  ninetynine[255] = '\0';
+  strncpy(ninetynine, "ninetynine", strlen("ninetynine"));
+  hundred = (char *)  malloc(256);
+  for (int i = 0; i < 255; i++)
+    hundred[i] = ' '; 
+  hundred[255] = '\0';
+  strncpy(hundred, "hundred", strlen("hundred"));
+  myNdb.init();
+  // Wait for Ndb to become ready
+  if (myNdb.waitUntilReady(30) == 0)
+  {
+    if (createTableOp)
+      createTable(myNdb, storeInACC, twoKey, longKey);
+
+    if (createIndexOp)
+      createIndex(myNdb, includePrimary, noOfIndexes);
+
+    if (insertOp)
+      insertTable(myNdb, noOfTuples, noOfOperations, oneTransaction, twoKey, longKey);
+
+    if (updateOp)
+      updateTable(myNdb, noOfTuples, noOfOperations, oneTransaction, twoKey, longKey);
+
+    if (deleteOp)
+      deleteTable(myNdb, noOfTuples, noOfOperations, oneTransaction, twoKey, longKey);
+
+    if (readOp)
+      readTable(myNdb, noOfTuples, noOfOperations, oneTransaction, twoKey, longKey);
+
+    if (readIndexOp)
+      readIndex(myNdb, noOfTuples, noOfOperations, includePrimary, oneTransaction, longKey);
+
+    if (updateIndexOp)
+      updateIndex(myNdb, noOfTuples, noOfOperations, includePrimary, oneTransaction, longKey);
+
+    if (deleteIndexOp)
+      deleteIndex(myNdb, noOfTuples, noOfOperations, includePrimary, oneTransaction, longKey);
+
+    if (dropIndexOp)
+      dropIndex(myNdb, noOfIndexes);
+  }
+  
+  if (testPassed)
+    {
+      // Test passed
+      ndbout << "OK - Test passed" << endl;
+    }
+  else
+    {
+      // Test failed
+      ndbout << "FAIL - Test failed" << endl;
+      exit(-1);
+    }
+  return 0;
+}
+
+