Merge branch 'master' into releases/tokudb-7.5

mysql-test/suite/tokudb/t/bf_create_select.test

@@ -65,8 +65,8 @@ while ($i < $maxq) {
 
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-# Check that the time with bulk fetch off is at least twice that whith bulk fetch on
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 2 * $time_elapsed_on`;
+# Check that the time with bulk fetch off is greater that with bulk fetch on
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo index $verdict $time_elapsed_on $time_elapsed_off; }
 if (!$verdict) { echo index $time_elapsed_on $time_elapsed_off; }
@@ -94,8 +94,8 @@ while ($i < $maxq) {
 
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-# Check that the time with bulk fetch off is at least twice that whith bulk fetch on
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 2 * $time_elapsed_on`;
+# Check that the time with bulk fetch off is greater that with bulk fetch on
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo range $verdict $time_elapsed_on $time_elapsed_off; }
 if (!$verdict) { echo range $time_elapsed_on $time_elapsed_off; }

mysql-test/suite/tokudb/t/bf_create_select_hash_part.test

@@ -65,8 +65,8 @@ while ($i < $maxq) {
 }
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-# check that bulk fetch on is at least 1.5 times faster than bulk fetch off
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 1.5 * $time_elapsed_on`;
+# check that bulk fetch on is greater than bulk fetch off
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo index $verdict $time_elapsed_off $time_elapsed_on; }
 if (!$verdict) { echo index $time_elapsed_off $time_elapsed_on; }
@@ -93,8 +93,8 @@ while ($i < $maxq) {
 }
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-# check that bulk fetch on is at least 1.5 times faster than bulk fetch off
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 1.5 * $time_elapsed_on`;
+# check that bulk fetch on is greater than bulk fetch off
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo range $verdict $time_elapsed_off $time_elapsed_on; }
 if (!$verdict) { echo range $time_elapsed_off $time_elapsed_on; }

mysql-test/suite/tokudb/t/bf_create_select_range_part.test

@@ -72,8 +72,8 @@ while ($i < $maxq) {
 }
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-# check that bulk fetch on is at least 2 times faster than bulk fetch off
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 2 * $time_elapsed_on`;
+# check that bulk fetch on is greater than bulk fetch off
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo index $verdict $time_elapsed_off $time_elapsed_on; }
 if (!$verdict) { echo index $time_elapsed_off $time_elapsed_on; }
@@ -100,8 +100,8 @@ while ($i < $maxq) {
 }
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-# check that bulk fetch on is at least 2 times faster than bulk fetch off
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 2 * $time_elapsed_on`;
+# check that bulk fetch on is greater than bulk fetch off
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo range $verdict $time_elapsed_off $time_elapsed_on; }
 if (!$verdict) { echo range $time_elapsed_off $time_elapsed_on; }

mysql-test/suite/tokudb/t/bf_create_temp_select.test

@@ -65,8 +65,8 @@ while ($i < $maxq) {
 
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-# Check that the time with bulk fetch off is at least twice that whith bulk fetch on
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 2 * $time_elapsed_on`;
+# Check that the time with bulk fetch off is greater that with bulk fetch on
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo index $verdict $time_elapsed_on $time_elapsed_off; }
 if (!$verdict) { echo index $time_elapsed_on $time_elapsed_off; }
@@ -94,8 +94,8 @@ while ($i < $maxq) {
 
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-# Check that the time with bulk fetch off is at least twice that whith bulk fetch on
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 2 * $time_elapsed_on`;
+# Check that the time with bulk fetch off is greater than with bulk fetch on
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo range $verdict $time_elapsed_on $time_elapsed_off; }
 if (!$verdict) { echo range $time_elapsed_on $time_elapsed_off; }

mysql-test/suite/tokudb/t/bf_delete.test

-# Verify that index scans for delete statements use bulk fetch and are
-# at least twice as fast
+# Verify that index scans for delete statements use bulk fetch are faster than when not using bulk fetch
 
 source include/have_tokudb.inc;
 source include/big_test.inc;
@@ -62,8 +61,8 @@ while ($i < $maxq) {
 }
 let $time_elapsed_bf_off = `select unix_timestamp() - $s`;
 
-# verify that a delete scan with bulk fetch ON is at least 2 times faster than with bulk fetch OFF
-let $verdict = `select $time_elapsed_bf_on > 0 && $time_elapsed_bf_off >= 2 * $time_elapsed_bf_on`;
+# verify that a delete scan with bulk fetch ON is greater than with bulk fetch OFF
+let $verdict = `select $time_elapsed_bf_on > 0 && $time_elapsed_bf_off > $time_elapsed_bf_on`;
 echo $verdict;
 if ($debug) { echo range $verdict $time_elapsed_bf_on $time_elapsed_bf_off; }
 if (!$verdict) { echo range $time_elapsed_bf_on $time_elapsed_bf_off; }

mysql-test/suite/tokudb/t/bf_insert_select.test

@@ -66,8 +66,8 @@ while ($i < $maxq) {
 }
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-# check that bulk fetch on is at least 2 times faster than bulk fetch off
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 2 * $time_elapsed_on`;
+# check that the time with bulk fetch on is greater than with bulk fetch off
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo index $verdict $time_elapsed_off $time_elapsed_on; }
 if (!$verdict) { echo index $time_elapsed_off $time_elapsed_on; }
@@ -92,7 +92,7 @@ while ($i < $maxq) {
 }
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 2 * $time_elapsed_on`;
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo range $verdict $time_elapsed_off $time_elapsed_on; }
 if (!$verdict) { echo range $time_elapsed_off $time_elapsed_on; }

mysql-test/suite/tokudb/t/bf_insert_select_dup_key.test

@@ -70,8 +70,8 @@ while ($i < $maxq) {
 }
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-# check that bulk fetch on is at least 2 times faster than bulk fetch off
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 2 * $time_elapsed_on`;
+# check that bulk fetch on is greater than with bulk fetch off
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo index $verdict $time_elapsed_off $time_elapsed_on; }
 if (!$verdict) { echo index $time_elapsed_off $time_elapsed_on; }
@@ -96,8 +96,8 @@ while ($i < $maxq) {
 }
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-# check that bulk fetch on is at least 2 times faster than bulk fetch off
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 2 * $time_elapsed_on`;
+# check that bulk fetch on is greater than bulk fetch off
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo range $verdict $time_elapsed_off $time_elapsed_on; }
 if (!$verdict) { echo range $time_elapsed_off $time_elapsed_on; }

mysql-test/suite/tokudb/t/bf_replace_select.test

@@ -66,8 +66,8 @@ while ($i < $maxq) {
 }
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-# check that bulk fetch on is at least 2 times faster than bulk fetch off
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 2 * $time_elapsed_on`;
+# check that the time with bulk fetch on is greater than with bulk fetch off
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo index $verdict $time_elapsed_off $time_elapsed_on; }
 if (!$verdict) { echo index $time_elapsed_off $time_elapsed_on; }
@@ -92,7 +92,8 @@ while ($i < $maxq) {
 }
 let $time_elapsed_off = `select unix_timestamp() - $s`;
 
-let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off >= 2 * $time_elapsed_on`;
+# check that the time with bulk fetch on is greater than with bulk fetch off
+let $verdict = `select $time_elapsed_on > 0 && $time_elapsed_off > $time_elapsed_on`;
 echo $verdict;
 if ($debug) { echo range $verdict $time_elapsed_off $time_elapsed_on; }
 if (!$verdict) { echo range $time_elapsed_off $time_elapsed_on; }

mysql-test/suite/tokudb/t/bf_select_hash_part.test

@@ -65,8 +65,8 @@ let $time_bf_off = `select unix_timestamp() - $s`;
 
 if ($debug) { echo index scans took $time_bf_off.; }
 
-# check that the scan time with bulk fetch off is at least 1.5 times as long as with bulk fetch on
-let $verdict = `select $time_bf_on > 0 && $time_bf_off >= 1.5 * $time_bf_on`;
+# check that the scan time with bulk fetch off is greater than with bulk fetch on
+let $verdict = `select $time_bf_on > 0 && $time_bf_off > $time_bf_on`;
 echo $verdict;
 if ($debug) { echo index $verdict $time_bf_on $time_bf_off; }
 if (!$verdict) { echo index $time_bf_on $time_bf_off; }
@@ -93,8 +93,8 @@ let $time_bf_off = `select unix_timestamp() - $s`;
 
 if ($debug) { echo range scans took $time_bf_off.; }
 
-# check that the scan time with bulk fetch off is at least 1.5 times as long as with bulk fetch on
-let $verdict = `select $time_bf_on > 0 && $time_bf_off >= 1.5 * $time_bf_on`;
+# check that the scan time with bulk fetch off is greater than with bulk fetch on
+let $verdict = `select $time_bf_on > 0 && $time_bf_off > $time_bf_on`;
 echo $verdict;
 if ($debug) { echo range $verdict $time_bf_on $time_bf_off; }
 if (!$verdict) { echo range $time_bf_on $time_bf_off; }

mysql-test/suite/tokudb/t/bf_select_range_part.test

@@ -70,8 +70,8 @@ while ($i < $maxq) {
 }
 let $time_bf_off = `select unix_timestamp() - $s`;
 
-# check that the scan time with bulk fetch off is at least 1.5 times as long as with bulk fetch on
-let $verdict = `select $time_bf_on > 0 && $time_bf_off >= 1.5 * $time_bf_on`;
+# check that the scan time with bulk fetch off is greater than with bulk fetch on
+let $verdict = `select $time_bf_on > 0 && $time_bf_off > $time_bf_on`;
 echo $verdict;
 if ($debug) { echo index $verdict $time_bf_on $time_bf_off; }
 if (!$verdict) { echo index scan $time_bf_on $time_bf_off; }
@@ -94,8 +94,8 @@ while ($i < $maxq) {
 }
 let $time_bf_off = `select unix_timestamp() - $s`;
 
-# check that the scan time with bulk fetch off is at least 1.5 times as long as with bulk fetch on
-let $verdict = `select $time_bf_on > 0 && $time_bf_off >= 1.5 * $time_bf_on`;
+# check that the scan time with bulk fetch off is greater than with bulk fetch on
+let $verdict = `select $time_bf_on > 0 && $time_bf_off > $time_bf_on`;
 echo $verdict;
 if ($debug) { echo range $verdict $time_bf_on $time_bf_off; }
 if (!$verdict) { echo range $time_bf_on $time_bf_off; }