Merge lp:~vkolesnikov/pbxt/pbxt-lock-tables-read-local into lp:pbxt

[Vladimir Kolesnikov]

[Vladimir Kolesnikov (vkolesnikov)]

all tests now pass!

=== modified file 'ChangeLog'
--- ChangeLog	2009-12-18 11:12:37 +0000
+++ ChangeLog	2009-12-22 20:21:17 +0000
@@ -3,6 +3,10 @@
 
 ------- 1.0.10 RC4 - 2009-12-18
 
+RN296: Updated "LOCK TABLES ... READ LOCAL" behavior to be more restrictive and compatible with InnoDB 
+
+RN296: Fixed bug #499026: START TRANSACTION WITH CONSISTENT SNAPSHOT does not work for PBXT
+
 RN295: PBXT tests now all run with MySQL 5.1.41.
 
 RN294: Fixed bug #483714: a broken table can prevent other tables from opening

=== modified file 'src/ha_pbxt.cc'
--- src/ha_pbxt.cc	2009-12-07 11:15:02 +0000
+++ src/ha_pbxt.cc	2009-12-22 20:21:17 +0000
@@ -113,6 +113,7 @@
 static int		pbxt_recover(handlerton *hton, XID *xid_list, uint len);
 static int		pbxt_commit_by_xid(handlerton *hton, XID *xid);
 static int		pbxt_rollback_by_xid(handlerton *hton, XID *xid);
+static int		pbxt_start_consistent_snapshot(handlerton *hton, THD *thd);
 #endif
 static void		ha_aquire_exclusive_use(XTThreadPtr self, XTSharePtr share, ha_pbxt *mine);
 static void		ha_release_exclusive_use(XTThreadPtr self, XTSharePtr share);
@@ -1146,6 +1147,7 @@
 		pbxt_hton->show_status = pbxt_show_status;
 		pbxt_hton->flags = HTON_NO_FLAGS; /* HTON_CAN_RECREATE - Without this flags TRUNCATE uses delete_all_rows() */
 		pbxt_hton->slot = (uint)-1; /* assign invald value, so we know when it's inited later */
+		pbxt_hton->start_consistent_snapshot = pbxt_start_consistent_snapshot;
 #if defined(MYSQL_SUPPORTS_BACKUP) && defined(XT_ENABLE_ONLINE_BACKUP)
 		pbxt_hton->get_backup_engine = pbxt_backup_engine;
 #endif
@@ -1424,6 +1426,28 @@
  *    internally.
  */
 
+static int pbxt_start_consistent_snapshot(handlerton *hton, THD *thd)
+{
+	int err          = 0;
+	XTThreadPtr self = ha_set_current_thread(thd, &err);
+
+	if (!self->st_database && pbxt_database) {
+		xt_ha_open_database_of_table(self, (XTPathStrPtr) NULL);
+	}
+
+	if (xt_xn_begin(self)) {
+		trans_register_ha(thd, TRUE, hton);	
+	} else {
+		err = xt_ha_pbxt_thread_error_for_mysql(thd, self, FALSE);
+	}
+
+	/*
+	 * As of MySQL 5.1.41 the return value is not checked, so the server might assume 
+	 * everything is fine even it isn't. InnoDB returns 0 on success.
+	 */
+	return err;
+}
+
 /*
  * Commit the PBXT transaction of the given thread.
  * thd is the MySQL thread structure.
@@ -4910,6 +4934,18 @@
  */
 THR_LOCK_DATA **ha_pbxt::store_lock(THD *thd, THR_LOCK_DATA **to, enum thr_lock_type lock_type)
 {
+	/*
+	 * TL_READ means concurrent INSERTs are allowed. This is a problem as in this mode
+	 * PBXT is not compatible with MyISAM which allows INSERTs but isolates them from
+	 * current "transaction" (started by LOCK TABLES, ended by UNLOCK TABLES). PBXT 
+	 * used to allow INSERTs and made them visible to the locker (on commit). 
+	 * While MySQL manual doesn't state anything regarding row visibility limitations 
+	 * we choose to convert local locks into normal read locks for better compatibility 
+	 * with MyISAM.
+	 */
+	if (lock_type == TL_READ)
+		lock_type = TL_READ_NO_INSERT;
+
 	if (lock_type != TL_IGNORE && pb_lock.type == TL_UNLOCK) {
 		/* Set to TRUE for operations that require a table lock: */
 		switch (thd_sql_command(thd)) {

=== modified file 'test/mysql-test/pbxt-test-run.pl'
--- test/mysql-test/pbxt-test-run.pl	2009-12-16 21:54:25 +0000
+++ test/mysql-test/pbxt-test-run.pl	2009-12-22 20:21:17 +0000
@@ -2482,7 +2482,9 @@
     # on windows, copy all files from std_data into var/std_data_ln
     mkpath("$opt_vardir/std_data_ln");
     mtr_copy_dir("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln");
-  }
+    mkpath("$opt_vardir/std_data");
+    mtr_copy_dir("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data");
+}
 
   # Remove old log files
   foreach my $name (glob("r/*.progress r/*.log r/*.warnings"))

=== modified file 'test/mysql-test/r/myisam.result'
--- test/mysql-test/r/myisam.result	2009-04-03 19:39:12 +0000
+++ test/mysql-test/r/myisam.result	2009-12-22 20:21:17 +0000
@@ -525,34 +525,6 @@
 c1
 a
 drop table t1;
-create table t1 (a int not null, primary key(a));
-create table t2 (a int not null, b int not null, primary key(a,b));
-insert into t1 values (1),(2),(3),(4),(5),(6);
-insert into t2 values (1,1),(2,1);
-lock tables t1 read local, t2 read local;
-select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
-a	a	b
-1	1	1
-2	2	1
-insert into t2 values(2,0);
-select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
-a	a	b
-1	1	1
-2	2	1
-drop table t1,t2;
-CREATE TABLE t1 (c1 varchar(250) NOT NULL);
-CREATE TABLE t2 (c1 varchar(250) NOT NULL, PRIMARY KEY (c1));
-INSERT INTO t1 VALUES ('test000001'), ('test000002'), ('test000003');
-INSERT INTO t2 VALUES ('test000002'), ('test000003'), ('test000004');
-LOCK TABLES t1 READ LOCAL, t2 READ LOCAL;
-SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
-WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
-t1c1	t2c1
-INSERT INTO t2 VALUES ('test000001'), ('test000005');
-SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
-WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
-t1c1	t2c1
-DROP TABLE t1,t2;
 CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`)) ENGINE=pbxt;
 Got one of the listed errors
 create table t1 (a int, b varchar(200), c text not null) checksum=1;
@@ -1724,63 +1696,6 @@
 create table t1 (v varchar(65535));
 ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
 set storage_engine=PBXT;
-set @save_concurrent_insert=@@concurrent_insert;
-set global concurrent_insert=1;
-create table t1 (a int);
-insert into t1 values (1),(2),(3),(4),(5);
-lock table t1 read local;
-insert into t1 values(6),(7);
-unlock tables;
-delete from t1 where a>=3 and a<=4;
-lock table t1 read local;
-set global concurrent_insert=2;
-insert into t1 values (8),(9);
-unlock tables;
-insert into t1 values (10),(11),(12);
-select * from t1 order by a;
-a
-1
-2
-5
-6
-7
-8
-9
-10
-11
-12
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-drop table t1;
-create table t1 (a int, b varchar(30) default "hello");
-insert into t1 (a) values (1),(2),(3),(4),(5);
-lock table t1 read local;
-insert into t1 (a) values(6),(7);
-unlock tables;
-delete from t1 where a>=3 and a<=4;
-lock table t1 read local;
-set global concurrent_insert=2;
-insert into t1 (a) values (8),(9);
-unlock tables;
-insert into t1 (a) values (10),(11),(12);
-select a from t1 order by a;
-a
-1
-2
-5
-6
-7
-8
-9
-10
-11
-12
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-drop table t1;
-set global concurrent_insert=@save_concurrent_insert;
 create table t1 (a int, key(a));
 insert into t1 values (1),(2),(3),(4),(NULL),(NULL),(NULL),(NULL);
 analyze table t1;

=== modified file 'test/mysql-test/t/myisam.test'
--- test/mysql-test/t/myisam.test	2009-06-02 17:55:55 +0000
+++ test/mysql-test/t/myisam.test	2009-12-22 20:21:17 +0000
@@ -490,40 +490,6 @@
 select c1 from t1 order by c1 limit 1;
 drop table t1;
 
-#
-# Bug #14400  Join could miss concurrently inserted row
-#
-# Partial key.
-create table t1 (a int not null, primary key(a));
-create table t2 (a int not null, b int not null, primary key(a,b));
-insert into t1 values (1),(2),(3),(4),(5),(6);
-insert into t2 values (1,1),(2,1);
-lock tables t1 read local, t2 read local;
-select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
-connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
-insert into t2 values(2,0);
-disconnect root;
-connection default;
-select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
-drop table t1,t2;
-#
-# Full key.
-CREATE TABLE t1 (c1 varchar(250) NOT NULL);
-CREATE TABLE t2 (c1 varchar(250) NOT NULL, PRIMARY KEY (c1));
-INSERT INTO t1 VALUES ('test000001'), ('test000002'), ('test000003');
-INSERT INTO t2 VALUES ('test000002'), ('test000003'), ('test000004');
-LOCK TABLES t1 READ LOCAL, t2 READ LOCAL;
-SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
-  WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
-connect (con1,localhost,root,,);
-connection con1;
-INSERT INTO t2 VALUES ('test000001'), ('test000005');
-disconnect con1;
-connection default;
-SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
-  WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
-DROP TABLE t1,t2;
-
 # End of 4.0 tests
 
 #
@@ -1053,63 +1019,6 @@
 
 eval set storage_engine=$default;
 
-#
-# Test concurrent insert
-# First with static record length
-#
-set @save_concurrent_insert=@@concurrent_insert;
-set global concurrent_insert=1;
-create table t1 (a int);
-insert into t1 values (1),(2),(3),(4),(5);
-lock table t1 read local;
-connect (con1,localhost,root,,);
-connection con1;
-# Insert in table without hole
-insert into t1 values(6),(7);
-connection default;
-unlock tables;
-delete from t1 where a>=3 and a<=4;
-lock table t1 read local;
-connection con1;
-set global concurrent_insert=2;
-# Insert in table with hole -> Should insert at end
-insert into t1 values (8),(9);
-connection default;
-unlock tables;
-# Insert into hole
-insert into t1 values (10),(11),(12);
-select * from t1 order by a; # PBXT requires order
-check table t1;
-drop table t1;
-disconnect con1;
-
-# Same test with dynamic record length
-create table t1 (a int, b varchar(30) default "hello");
-insert into t1 (a) values (1),(2),(3),(4),(5);
-lock table t1 read local;
-connect (con1,localhost,root,,);
-connection con1;
-# Insert in table without hole
-insert into t1 (a) values(6),(7);
-connection default;
-unlock tables;
-delete from t1 where a>=3 and a<=4;
-lock table t1 read local;
-connection con1;
-set global concurrent_insert=2;
-# Insert in table with hole -> Should insert at end
-insert into t1 (a) values (8),(9);
-connection default;
-unlock tables;
-# Insert into hole
-insert into t1 (a) values (10),(11),(12);
-select a from t1 order by a; # PBXT requires order
-check table t1;
-drop table t1;
-disconnect con1;
-set global concurrent_insert=@save_concurrent_insert;
-
-
 # BUG#9622 - ANALYZE TABLE and ALTER TABLE .. ENABLE INDEX produce
 # different statistics on the same table with NULL values.
 create table t1 (a int, key(a));