Merge lp:~stewart/drizzle/slap-remove-autocommit-in-load-bug668143 into lp:drizzle/7.0

[Stewart Smith]

At the end of the first iteration in drizzleslap, if commit_count is set, it will run SET AUTOCOMMIT=0. This means that the next load of data for the next iteration gets run in 1 transaction.

On top of this, it is a transaction that is NOT committed.

i.e. the second iteration will be running against no data.

this patch fixes that.

[lp:~stewart/drizzle/slap-remove-autocommit-in-load-bug668143]

1880. By Stewart Smith on 2010-10-29

fix drizzleslap test results so that the autocommit isn't in the log of queries run

[Brian Aker (brianaker)]

Just looking at the patch, you only removed part of the feature, not the entire thing.

Looking at this, I think it might be better to just fix it to work, instead of pulling it out (which I know is counter to what I thought on IRC, but I hadn't looked at the code at that point).

[Brian Aker (brianaker)]

I'm looking at the test cases, and I see where we do test that commit is called.

So what query do you need to run to see that commit isn't happening? (--only-print will allow you to create a log BTW).

[Brian Aker (brianaker)]

--exec $DRIZZLE_SLAP --only-print --number-int-cols=2 --number-char-cols=3 --auto-generate-sql --auto-generate-sql-guid-primary --auto-generate-sql-load-type=update --auto-generate-sql-execute-number=5 --commit=1

The above when added to the test case shows commit being called for each update.

[Stewart Smith (stewart)]

the missing commit is for the connection that does CREATE TABLE and loads the data. COMMIT is being called correctly for all the connections/threads for load generation - it's just that on the second iteration of create table/load data, (without this patch) we run the load in a transaction that isn't committed.

[lp:~stewart/drizzle/slap-remove-autocommit-in-load-bug668143]

1881. By Stewart Smith on 2010-11-01

merge trunk

1882. By Stewart Smith on 2010-11-01

merge drizzleslap displaying connection ids in --only-print

1883. By Stewart Smith on 2010-11-01

update drizzleslap test results for fixing autocommit=0 being present in connection that loads data

1884. By Stewart Smith on 2010-11-01

merge drizzleslap client test

1885. By Stewart Smith on 2010-11-03

merge trunk and drizzleslap solaris compiler warning fixes

[Lee Bieber (kalebral-deactivatedaccount)]

Needs fixing, fails on distcheck - http://hudson.drizzle.org/job/drizzle-param-ubuntu10.04-64bit/58/console

review: Needs Fixing

[lp:~stewart/drizzle/slap-remove-autocommit-in-load-bug668143]

1886. By Stewart Smith on 2010-11-04

merge fixes

[Lee Bieber (kalebral-deactivatedaccount)]

Valgrind build fail on both 32bit and 64bit runs. drizzleslap test fails

review: Needs Fixing

[Brian Aker (brianaker)]

Here is the issues:
==14717== Syscall param rt_sigaction(act->sa_mask) points to uninitialised byte(s)
==14717==    at 0x6BF2C0E: __libc_sigaction (sigaction.c:67)
==14717==    by 0x4E33E41: drizzle_create (drizzle.c:73)
==14717==    by 0x41DD20: main (drizzletest.cc:5678)
==14717==  Address 0x7feffd888 is on thread 1's stack
==14717==

Why not use a boost thread ptr to store the value instead?

review: Needs Fixing

[Stewart Smith (stewart)]

how do I even possibly trip that up.... in drizzletest?

[Stewart Smith (stewart)]

I've been completely unable to reproduce this failure - even orisndriz08.

My guess is that something went awry on the machines during this run?

=== modified file 'client/drizzleslap.cc'
--- client/drizzleslap.cc	2010-11-04 01:18:44 +0000
+++ client/drizzleslap.cc	2010-11-04 22:58:43 +0000
@@ -767,15 +767,11 @@
     if (auto_generate_sql_autoincrement || auto_generate_sql_guid_primary)
       generate_primary_key_list(con, eptr);
 
-    if (commit_rate)
-      run_query(con, NULL, "SET AUTOCOMMIT=0", strlen("SET AUTOCOMMIT=0"));
-
     if (not pre_system.empty())
     {
       int ret= system(pre_system.c_str());
       assert(ret != -1);
     }
-       
 
     /*
       Pre statements are always run after all other logic so they can

=== modified file 'plugin/haildb/tests/r/drizzleslap.result'
--- plugin/haildb/tests/r/drizzleslap.result	2010-11-01 04:41:48 +0000
+++ plugin/haildb/tests/r/drizzleslap.result	2010-11-04 22:58:43 +0000
@@ -175,7 +175,6 @@
 /* CON: 0 */ create table t2(foo1 varchar(32), foo2 varchar(32));
 /* CON: 0 */ INSERT INTO t1 VALUES (1, 'This is a test');
 /* CON: 0 */ insert into t2 values ('test', 'test2');
-/* CON: 0 */ SET AUTOCOMMIT=0;
 /* CON: 0 */ SHOW TABLES;
 /* CON: 1 */ SET AUTOCOMMIT=0;
 /* CON: 1 */ select * from t1;
@@ -201,7 +200,6 @@
 /* CON: 0 */ create table t2(foo1 varchar(32), foo2 varchar(32));
 /* CON: 0 */ INSERT INTO t1 VALUES (1, 'This is a test');
 /* CON: 0 */ insert into t2 values ('test', 'test2');
-/* CON: 0 */ SET AUTOCOMMIT=0;
 /* CON: 0 */ SHOW TABLES;
 /* CON: 2 */ SET AUTOCOMMIT=0;
 /* CON: 2 */ select * from t1;

=== modified file 'tests/r/drizzleslap.result'
--- tests/r/drizzleslap.result	2010-11-01 04:41:48 +0000
+++ tests/r/drizzleslap.result	2010-11-04 22:58:43 +0000
@@ -175,7 +175,6 @@
 /* CON: 0 */ create table t2(foo1 varchar(32), foo2 varchar(32));
 /* CON: 0 */ INSERT INTO t1 VALUES (1, 'This is a test');
 /* CON: 0 */ insert into t2 values ('test', 'test2');
-/* CON: 0 */ SET AUTOCOMMIT=0;
 /* CON: 0 */ SHOW TABLES;
 /* CON: 1 */ SET AUTOCOMMIT=0;
 /* CON: 1 */ select * from t1;
@@ -201,7 +200,6 @@
 /* CON: 0 */ create table t2(foo1 varchar(32), foo2 varchar(32));
 /* CON: 0 */ INSERT INTO t1 VALUES (1, 'This is a test');
 /* CON: 0 */ insert into t2 values ('test', 'test2');
-/* CON: 0 */ SET AUTOCOMMIT=0;
 /* CON: 0 */ SHOW TABLES;
 /* CON: 2 */ SET AUTOCOMMIT=0;
 /* CON: 2 */ select * from t1;