mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
ndb - bugfix testScanPerf
This commit is contained in:
@@ -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; i<g_table->getNoOfColumns(); 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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user