MDEV-11329: MariaRocks: rocksdb.add_index_inplace fails

spetrunia · spetrunia · commit 7b708ee3ed29 · 2016-12-04T09:28:51.000Z
- Make ha_rocksdb::check_if_supported_inplace_alter() take into
  account the Alter_inplace_info::ALTER_PARTITIONED flag

- Adjust the testcase to work in MariaDB
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
@@ -9656,7 +9656,8 @@ my_core::enum_alter_inplace_result ha_rocksdb::check_if_supported_inplace_alter(
   if (ha_alter_info->handler_flags &
       ~(my_core::Alter_inplace_info::DROP_INDEX |
         my_core::Alter_inplace_info::DROP_UNIQUE_INDEX |
-        my_core::Alter_inplace_info::ADD_INDEX))
+        my_core::Alter_inplace_info::ADD_INDEX |
+        my_core::Alter_inplace_info::ALTER_PARTITIONED))
   {
     DBUG_RETURN(my_core::HA_ALTER_INPLACE_NOT_SUPPORTED);
   }
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace.result
@@ -252,7 +252,7 @@ DROP INDEX kij ON t1;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL DEFAULT '0',
+  `i` int(11) NOT NULL,
   `j` int(11) DEFAULT NULL,
   `k` int(11) DEFAULT NULL,
   PRIMARY KEY (`i`),
@@ -282,10 +282,10 @@ INSERT INTO t1 (a, b) VALUES (2, 6);
 INSERT INTO t1 (a, b) VALUES (3, 7);
 # crash_during_online_index_creation
 flush logs;
-SET SESSION debug="+d,crash_during_online_index_creation";
+SET SESSION debug_dbug="+d,crash_during_online_index_creation";
 ALTER TABLE t1 ADD INDEX kb(b), ALGORITHM=INPLACE;
 ERROR HY000: Lost connection to MySQL server during query
-SET SESSION debug="-d,crash_during_online_index_creation";
+SET SESSION debug_dbug="-d,crash_during_online_index_creation";
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -301,14 +301,14 @@ DROP TABLE t1;
 CREATE TABLE t1 (i INT, j INT, k INT, PRIMARY KEY (i), KEY(j)) ENGINE = ROCKSDB PARTITION BY KEY(i) PARTITIONS 4;
 # crash_during_index_creation_partition
 flush logs;
-SET SESSION debug="+d,crash_during_index_creation_partition";
+SET SESSION debug_dbug="+d,crash_during_index_creation_partition";
 ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE;
 ERROR HY000: Lost connection to MySQL server during query
-SET SESSION debug="-d,crash_during_index_creation_partition";
+SET SESSION debug_dbug="-d,crash_during_index_creation_partition";
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL DEFAULT '0',
+  `i` int(11) NOT NULL,
   `j` int(11) DEFAULT NULL,
   `k` int(11) DEFAULT NULL,
   PRIMARY KEY (`i`),
@@ -336,17 +336,17 @@ DROP TABLE t1;
 CREATE TABLE t1 (i INT, j INT, k INT, PRIMARY KEY (i), KEY(j)) ENGINE = ROCKSDB PARTITION BY KEY(i) PARTITIONS 4;
 # crash_during_index_creation_partition
 flush logs;
-SET SESSION debug="+d,myrocks_simulate_index_create_rollback";
+SET SESSION debug_dbug="+d,myrocks_simulate_index_create_rollback";
 # expected assertion failure from sql layer here for alter rollback
 call mtr.add_suppression("Assertion `0' failed.");
 call mtr.add_suppression("Attempting backtrace. You can use the following information to find out");
 ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE;
 ERROR HY000: Lost connection to MySQL server during query
-SET SESSION debug="-d,myrocks_simulate_index_create_rollback";
+SET SESSION debug_dbug="-d,myrocks_simulate_index_create_rollback";
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL DEFAULT '0',
+  `i` int(11) NOT NULL,
   `j` int(11) DEFAULT NULL,
   `k` int(11) DEFAULT NULL,
   PRIMARY KEY (`i`),
@@ -358,7 +358,7 @@ ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL DEFAULT '0',
+  `i` int(11) NOT NULL,
   `j` int(11) DEFAULT NULL,
   `k` int(11) DEFAULT NULL,
   PRIMARY KEY (`i`),
@@ -371,8 +371,11 @@ SELECT COUNT(*) FROM t1;
 COUNT(*)
 100
 DROP TABLE t1;
+set @tmp_rocksdb_strict_collation_check= @@rocksdb_strict_collation_check;
+set global rocksdb_strict_collation_check=1;
 CREATE TABLE t1 (a INT, b TEXT);
 ALTER TABLE t1 ADD KEY kb(b(10));
 ERROR HY000: Unsupported collation on string indexed column test.t1.b Use binary collation (binary, latin1_bin, utf8_bin).
 ALTER TABLE t1 ADD PRIMARY KEY(a);
 DROP TABLE t1;
+set global rocksdb_strict_collation_check= @tmp_rocksdb_strict_collation_check;
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace.cnf b/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace.cnf
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace.test b/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace.test
@@ -1,5 +1,6 @@
 --source include/have_rocksdb.inc
 --source include/have_debug.inc
+--source include/have_partition.inc
 
 --disable_warnings
 drop table if exists t1;
@@ -181,14 +182,14 @@ INSERT INTO t1 (a, b) VALUES (3, 7);
 flush logs;
 
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-SET SESSION debug="+d,crash_during_online_index_creation";
+SET SESSION debug_dbug="+d,crash_during_online_index_creation";
 --error 2013
 ALTER TABLE t1 ADD INDEX kb(b), ALGORITHM=INPLACE;
 
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 
-SET SESSION debug="-d,crash_during_online_index_creation";
+SET SESSION debug_dbug="-d,crash_during_online_index_creation";
 
 SHOW CREATE TABLE t1;
 CHECK TABLE t1;
@@ -214,14 +215,14 @@ while ($i <= $max) {
 flush logs;
 
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-SET SESSION debug="+d,crash_during_index_creation_partition";
+SET SESSION debug_dbug="+d,crash_during_index_creation_partition";
 --error 2013
 ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE;
 
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 
-SET SESSION debug="-d,crash_during_index_creation_partition";
+SET SESSION debug_dbug="-d,crash_during_index_creation_partition";
 
 SHOW CREATE TABLE t1;
 
@@ -253,7 +254,7 @@ while ($i <= $max) {
 flush logs;
 
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-SET SESSION debug="+d,myrocks_simulate_index_create_rollback";
+SET SESSION debug_dbug="+d,myrocks_simulate_index_create_rollback";
 
 --echo # expected assertion failure from sql layer here for alter rollback
 call mtr.add_suppression("Assertion `0' failed.");
@@ -266,7 +267,7 @@ ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE;
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 
-SET SESSION debug="-d,myrocks_simulate_index_create_rollback";
+SET SESSION debug_dbug="-d,myrocks_simulate_index_create_rollback";
 
 SHOW CREATE TABLE t1;
 
@@ -280,11 +281,14 @@ SELECT COUNT(*) FROM t1;
 DROP TABLE t1;
 
 # test failure in prepare phase (due to collation)
+set @tmp_rocksdb_strict_collation_check= @@rocksdb_strict_collation_check;
+set global rocksdb_strict_collation_check=1;
 CREATE TABLE t1 (a INT, b TEXT);
 
 --error 1105
 ALTER TABLE t1 ADD KEY kb(b(10));
 ALTER TABLE t1 ADD PRIMARY KEY(a);
 DROP TABLE t1;
 
+set global rocksdb_strict_collation_check= @tmp_rocksdb_strict_collation_check;
 

Original file line number	Diff line number	Diff line change
`@@ -9656,7 +9656,8 @@ my_core::enum_alter_inplace_result ha_rocksdb::check_if_supported_inplace_alter(`
`9656`	`9656`	`if (ha_alter_info->handler_flags &`
`9657`	`9657`	`~(my_core::Alter_inplace_info::DROP_INDEX \|`
`9658`	`9658`	`my_core::Alter_inplace_info::DROP_UNIQUE_INDEX \|`
`9659`		`- my_core::Alter_inplace_info::ADD_INDEX))`
	`9659`	`+ my_core::Alter_inplace_info::ADD_INDEX \|`
	`9660`	`+ my_core::Alter_inplace_info::ALTER_PARTITIONED))`
`9660`	`9661`	`{`
`9661`	`9662`	`DBUG_RETURN(my_core::HA_ALTER_INPLACE_NOT_SUPPORTED);`
`9662`	`9663`	`}`