bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3276) WL#5569

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped

 3276 Andrei Elkin	2011-05-06
      wl#5569 MTS
      
      improving benchmarking test.

    modified:
      mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test
      mysql-test/extra/rpl_tests/rpl_parallel_load.test
      mysql-test/suite/rpl/t/rpl_parallel-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test'
--- a/mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test	2011-04-02 11:32:02 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test	2011-05-06 18:33:32 +0000
@@ -6,11 +6,13 @@
 # load volume parameter
 #
 
-let $iter= 128;
+let $iter= 16;
 let $tables= 4;
-let $wk_queries= 16;
-let $nk_queries= 0;
-let $pre_inserted_rows= 400;
+let $wk_i_queries= 4;
+let $wk_m_queries= 0;
+let $nk_i_queries= 0;
+let $nk_m_queries= 0;
+let $pre_inserted_rows= 200;
 
 connection slave;
 
@@ -83,6 +85,8 @@ while($i)
   {
    eval insert into test$i.ti_wk_$m values(null,  $i, uuid());
    eval insert into test$i.ti_nk_$m values(null,  $i, uuid());
+   eval insert into test$i.tm_wk_$m values(null,  $i, uuid());
+   eval insert into test$i.tm_nk_$m values(null,  $i, uuid());
 
    dec $k;
   }
@@ -163,19 +167,44 @@ while ($iter)
 	begin;
    	   ###eval insert into tm_nk values($iter, $i1, repeat('a', round(rand()*10)));
 
-    	   let $q= $wk_queries;
+    	   let $q= $wk_m_queries;
 	   while ($q)
 	   {
 	       let $m= `select 1 + floor(rand() * $tables)`;
+	       eval update      test$i.tm_wk_$m set c= uuid();
+	       eval insert into test$i.tm_wk_$m values(null,  $i, uuid());
+
+	       dec $q;
+	   }
+
+    	   let $q= $wk_i_queries;
+	   while ($q)
+	   {
+	       let $m= `select 1 + floor(rand() * $tables)`;
+	       eval update      test$i.ti_wk_$m set c= uuid();
+	       
 	       eval insert into test$i.ti_wk_$m values(null,  $i, uuid());
 
 	       dec $q;
 	   }
+            
+	   # NK
+
+    	   let $q= $nk_m_queries;
+	   while ($q)
+	   {
+	       let $m= `select 1 + floor(rand() * $tables)`;
+	       eval update test$i.tm_nk_$m set c= uuid();
+	       eval insert into test$i.tm_nk_$m values(null,  $i, uuid());
+
+	       dec $q;
+	   }
 
-    	   let $q= $nk_queries;
+    	   let $q= $nk_i_queries;
 	   while ($q)
 	   {
 	       let $m= `select 1 + floor(rand() * $tables)`;
+	       eval update test$i.ti_nk_$m set c= uuid();
 	       eval insert into test$i.ti_nk_$m values(null,  $i, uuid());
 
 	       dec $q;

=== modified file 'mysql-test/extra/rpl_tests/rpl_parallel_load.test'
--- a/mysql-test/extra/rpl_tests/rpl_parallel_load.test	2011-04-06 12:51:58 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_parallel_load.test	2011-05-06 18:33:32 +0000
@@ -6,7 +6,7 @@
 # load volume parameter
 #
 
-let $iter = 250;
+let $iter = 50;
 
 # windows run on PB2 is too slow to time out
 disable_query_log;

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_parallel-slave.opt	2011-04-05 16:26:37 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel-slave.opt	2011-05-06 18:33:32 +0000
@@ -1 +1 @@
---mts-slave-parallel-workers=4 --log-warnings=0 --slave-transaction-retries=0
+ --log-warnings=0 --slave-transaction-retries=0

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel.test	2011-04-03 10:07:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel.test	2011-05-06 18:33:32 +0000
@@ -33,6 +33,7 @@
 # In the end there will be mysql-test/delta.{parallel,sequential}.log files.
 #
 
+let $rpl_skip_reset_master_and_slave= 1;
 --source include/master-slave.inc
 
 connection master;


Attachment: [text/bzr-bundle] bzr/[e-mail]