From 8d1171742ce6196875b45f1b9c1462c72101f902 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 26 Nov 2004 10:00:33 +0100 Subject: ndb - bugfix testScanPerf ndb/test/ndbapi/testScanPerf.cpp: 1) Fix so that values are read even when using -q 2) Divide by correct number --- ndb/test/ndbapi/testScanPerf.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ndb/test/ndbapi/testScanPerf.cpp b/ndb/test/ndbapi/testScanPerf.cpp index ee2a92e88a9..45f0468bc70 100644 --- a/ndb/test/ndbapi/testScanPerf.cpp +++ b/ndb/test/ndbapi/testScanPerf.cpp @@ -222,6 +222,7 @@ run_scan(){ int sum_time= 0; int sample_rows = 0; + int tot_rows = 0; NDB_TICKS sample_start = NdbTick_CurrentMillisecond(); Uint32 tot = g_paramters[P_ROWS].value; @@ -296,7 +297,7 @@ run_scan(){ break; } } - if(g_paramters[P_RESET].value == 1) + if(g_paramters[P_RESET].value == 2) goto execute; } assert(pOp); @@ -330,6 +331,9 @@ run_scan(){ } assert(check == 0); + if(g_paramters[P_RESET].value == 1) + g_paramters[P_RESET].value = 2; + for(int i = 0; igetNoOfColumns(); i++){ pOp->getValue(i); } @@ -364,6 +368,7 @@ execute: int time_passed= (int)(stop - start1); sample_rows += rows; sum_time+= time_passed; + tot_rows+= rows; if(sample_rows >= tot) { @@ -375,8 +380,8 @@ execute: sample_start = stop; } } - - g_err.println("Avg time: %d ms = %u rows/sec", sum_time/iter, - (1000*tot*iter)/sum_time); + + g_err.println("Avg time: %d ms = %u rows/sec", sum_time/tot_rows, + (1000*tot_rows)/sum_time); return 0; } -- cgit v1.2.1