Merge mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1-fix


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged

3 files changed, 68 insertions, 30 deletions

diff --git a/ndb/test/ndbapi/testReadPerf.cpp b/ndb/test/ndbapi/testReadPerf.cpp
index 380a809ad00..3adcb5a2d9b 100644
--- a/ndb/test/ndbapi/testReadPerf.cpp
+++ b/ndb/test/ndbapi/testReadPerf.cpp
@@ -391,8 +391,15 @@ run_read(){
 
 void
 print_result(){
+  int tmp = 1;
+  tmp *= g_paramters[P_RANGE].value;
+  tmp *= g_paramters[P_LOOPS].value;
+
+  int t, t2;
   for(int i = 0; i<P_OP_TYPES; i++){
-    g_err.println("%s avg: %u us/row", g_ops[i],
-		  (1000*g_times[i])/(g_paramters[P_RANGE].value*g_paramters[P_LOOPS].value));
+    g_err << g_ops[i] << " avg: "
+	  << (int)((1000*g_times[i])/tmp)
+	  << " us/row (" 
+	  << (1000 * tmp)/g_times[i] << " rows / sec)" << endl;
   }
 }
diff --git a/ndb/test/ndbapi/testScan.cpp b/ndb/test/ndbapi/testScan.cpp
index 0cd30dfefde..51913e8fbf9 100644
--- a/ndb/test/ndbapi/testScan.cpp
+++ b/ndb/test/ndbapi/testScan.cpp
@@ -242,8 +242,9 @@ int runScanReadCommitted(NDBT_Context* ctx, NDBT_Step* step){
   HugoTransactions hugoTrans(*ctx->getTab());
   while (i<loops && !ctx->isTestStopped()) {
     g_info << i << ": ";
-    if (hugoTrans.scanReadCommittedRecords(GETNDB(step), records, 
-					   abort, parallelism) != 0){
+    if (hugoTrans.scanReadRecords(GETNDB(step), records, 
+				  abort, parallelism, 
+				  NdbOperation::LM_CommittedRead) != 0){
       return NDBT_FAILED;
     }
     i++;
@@ -639,7 +640,7 @@ int runCheckGetValue(NDBT_Context* ctx, NDBT_Step* step){
     g_info << (unsigned)i << endl;
     if(utilTrans.scanReadRecords(GETNDB(step), 
 				 parallelism,
-				 false,
+				 NdbOperation::LM_Read,
 				 records,
 				 alist.attriblist[i]->numAttribs,
 				 alist.attriblist[i]->attribs) != 0){
@@ -647,7 +648,7 @@ int runCheckGetValue(NDBT_Context* ctx, NDBT_Step* step){
     }
     if(utilTrans.scanReadRecords(GETNDB(step), 
 				 parallelism,
-				 true,
+				 NdbOperation::LM_Read,
 				 records,
 				 alist.attriblist[i]->numAttribs,
 				 alist.attriblist[i]->attribs) != 0){
diff --git a/ndb/test/ndbapi/testScanPerf.cpp b/ndb/test/ndbapi/testScanPerf.cpp
index 003fc67179f..ee2a92e88a9 100644
--- a/ndb/test/ndbapi/testScanPerf.cpp
+++ b/ndb/test/ndbapi/testScanPerf.cpp
@@ -39,8 +39,9 @@ struct Parameter {
 #define P_LOOPS   8
 #define P_CREATE  9
 #define P_LOAD   10
+#define P_RESET  11
 
-#define P_MAX 11
+#define P_MAX 12
 
 static 
 Parameter 
@@ -55,7 +56,8 @@ g_paramters[] = {
   { "size",  1000000, 1, ~0 },
   { "iterations",  3, 1, ~0 },
   { "create_drop", 1, 0, 1 },
-  { "data",        1, 0, 1 }
+  { "data",        1, 0, 1 },
+  { "q-reset bounds", 0, 1, 0 }
 };
 
 static Ndb* g_ndb = 0;
@@ -219,21 +221,29 @@ run_scan(){
   NDB_TICKS start1, stop;
   int sum_time= 0;
 
+  int sample_rows = 0;
+  NDB_TICKS sample_start = NdbTick_CurrentMillisecond();
+
   Uint32 tot = g_paramters[P_ROWS].value;
 
+  if(g_paramters[P_BOUND].value == 2 || g_paramters[P_FILT].value == 2)
+    iter *= g_paramters[P_ROWS].value;
+
+  NdbScanOperation * pOp = 0;
+  NdbIndexScanOperation * pIOp = 0;
+  NdbConnection * pTrans = 0;
+  NdbResultSet * rs = 0;
+  int check = 0;
+
   for(int i = 0; i<iter; i++){
     start1 = NdbTick_CurrentMillisecond();
-    NdbConnection * pTrans = g_ndb->startTransaction();
+    pTrans = pTrans ? pTrans : g_ndb->startTransaction();
     if(!pTrans){
       g_err << "Failed to start transaction" << endl;
       err(g_ndb->getNdbError());
       return -1;
     }
     
-    NdbScanOperation * pOp;
-    NdbIndexScanOperation * pIOp;
-
-    NdbResultSet * rs;
     int par = g_paramters[P_PARRA].value;
     int bat = g_paramters[P_BATCH].value;
     NdbScanOperation::LockMode lm;
@@ -256,9 +266,17 @@ run_scan(){
       assert(pOp);
       rs = pOp->readTuples(lm, bat, par);
     } else {
-      pOp = pIOp = pTrans->getNdbIndexScanOperation(g_indexname, g_tablename);
-      bool ord = g_paramters[P_ACCESS].value == 2;
-      rs = pIOp->readTuples(lm, bat, par, ord);
+      if(g_paramters[P_RESET].value == 0 || pIOp == 0)
+      {
+	pOp= pIOp= pTrans->getNdbIndexScanOperation(g_indexname, g_tablename);
+	bool ord = g_paramters[P_ACCESS].value == 2;
+	rs = pIOp->readTuples(lm, bat, par, ord);
+      }
+      else
+      {
+	pIOp->reset_bounds();
+      }
+
       switch(g_paramters[P_BOUND].value){
       case 0: // All
 	break;
@@ -268,20 +286,22 @@ run_scan(){
       case 2: { // 1 row
       default:  
 	assert(g_table->getNoOfPrimaryKeys() == 1); // only impl. so far
-	abort();
-#if 0
 	int tot = g_paramters[P_ROWS].value;
 	int row = rand() % tot;
+#if 0
 	fix_eq_bound(pIOp, row);
+#else
+	pIOp->setBound((Uint32)0, NdbIndexScanOperation::BoundEQ, &row);
 #endif
 	break;
       }
       }
+      if(g_paramters[P_RESET].value == 1)
+	goto execute;
     }
     assert(pOp);
     assert(rs);
     
-    int check = 0;
     switch(g_paramters[P_FILT].value){
     case 0: // All
       check = pOp->interpret_exit_ok();
@@ -313,7 +333,7 @@ run_scan(){
     for(int i = 0; i<g_table->getNoOfColumns(); i++){
       pOp->getValue(i);
     }
-
+execute:
     int rows = 0;
     check = pTrans->execute(NoCommit);
     assert(check == 0);
@@ -334,19 +354,29 @@ run_scan(){
       return -1;
     }
     assert(check == 1);
-    g_info << "Found " << rows << " rows" << endl;
-
-    pTrans->close();
-
+    if(g_paramters[P_RESET].value == 0)
+    {
+      pTrans->close();
+      pTrans = 0;
+    }
     stop = NdbTick_CurrentMillisecond();
+    
     int time_passed= (int)(stop - start1);
-    g_err.println("Time: %d ms = %u rows/sec", time_passed,
-                  (1000*tot)/time_passed);
+    sample_rows += rows;
     sum_time+= time_passed;
+    
+    if(sample_rows >= tot)
+    {
+      int sample_time = (int)(stop - sample_start);
+      g_info << "Found " << sample_rows << " rows" << endl;
+      g_err.println("Time: %d ms = %u rows/sec", sample_time,
+		    (1000*sample_rows)/sample_time);
+      sample_rows = 0;
+      sample_start = stop;
+    }
   }
-  sum_time= sum_time / iter;
-  
-  g_err.println("Avg time: %d ms = %u rows/sec", sum_time,
-                (1000*tot)/sum_time);
+
+  g_err.println("Avg time: %d ms = %u rows/sec", sum_time/iter,
+                (1000*tot*iter)/sum_time);
   return 0;
 }