database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Code Activity

Trivial updates to get a few rocksdb.* testcases to pass

Browse Source
This commit is contained in:
Sergei Petrunia
2017-07-29 11:06:22 +00:00
parent f2952485a1
commit a89d01fb60
15 changed files with 76 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
storage/rocksdb/mysql-test/rocksdb/include/restart_mysqld_with_option.inc Normal file
View File

@@ -0,0 +1,31 @@
if ($rpl_inited)
{
if (!$allow_rpl_inited)
{
--die ERROR IN TEST: This script does not support replication
}
}
# Write file to make mysql-test-run.pl expect the "crash", but don't start
# it until it's told to
--let $_server_id= `SELECT @@server_id`
--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
--exec echo "wait" > $_expect_file_name
# Send shutdown to the connected server and give
# it 10 seconds to die before zapping it
shutdown_server 10;
# Write file to make mysql-test-run.pl start up the server again
--exec echo "restart:$_mysqld_option" > $_expect_file_name
# Turn on reconnect
--enable_reconnect
# Call script that will poll the server waiting for it to be back online again
--source include/wait_until_connected_again.inc
# Turn off reconnect again
--disable_reconnect

2
storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result
View File

@@ -241,7 +241,7 @@ a b
2 b 2 b
EXPLAIN SELECT * FROM t1 WHERE a = 2; EXPLAIN SELECT * FROM t1 WHERE a = 2;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 const a a 5 const 1 NULL 1 SIMPLE t1 const a a 5 const 1
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a INT, b CHAR(8)) ENGINE=rocksdb; CREATE TABLE t1 (a INT, b CHAR(8)) ENGINE=rocksdb;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;

10
storage/rocksdb/mysql-test/rocksdb/r/corrupted_data_reads_debug.result
View File

@@ -20,7 +20,7 @@ set @tmp1=@@rocksdb_verify_row_debug_checksums;
set rocksdb_verify_row_debug_checksums=1; set rocksdb_verify_row_debug_checksums=1;
set session debug_dbug= "+d,myrocks_simulate_bad_row_read1"; set session debug_dbug= "+d,myrocks_simulate_bad_row_read1";
select * from t1 where pk=1; select * from t1 where pk=1;
ERROR HY000: Got error 199 'Found data corruption.' from ROCKSDB ERROR HY000: Got error 200 'Found data corruption.' from ROCKSDB
set session debug_dbug= "-d,myrocks_simulate_bad_row_read1"; set session debug_dbug= "-d,myrocks_simulate_bad_row_read1";
set rocksdb_verify_row_debug_checksums=@tmp1; set rocksdb_verify_row_debug_checksums=@tmp1;
select * from t1 where pk=1; select * from t1 where pk=1;
@@ -28,11 +28,11 @@ pk col1
1 1 1 1
set session debug_dbug= "+d,myrocks_simulate_bad_row_read2"; set session debug_dbug= "+d,myrocks_simulate_bad_row_read2";
select * from t1 where pk=1; select * from t1 where pk=1;
ERROR HY000: Got error 199 'Found data corruption.' from ROCKSDB ERROR HY000: Got error 200 'Found data corruption.' from ROCKSDB
set session debug_dbug= "-d,myrocks_simulate_bad_row_read2"; set session debug_dbug= "-d,myrocks_simulate_bad_row_read2";
set session debug_dbug= "+d,myrocks_simulate_bad_row_read3"; set session debug_dbug= "+d,myrocks_simulate_bad_row_read3";
select * from t1 where pk=1; select * from t1 where pk=1;
ERROR HY000: Got error 199 'Found data corruption.' from ROCKSDB ERROR HY000: Got error 200 'Found data corruption.' from ROCKSDB
set session debug_dbug= "-d,myrocks_simulate_bad_row_read3"; set session debug_dbug= "-d,myrocks_simulate_bad_row_read3";
insert into t1 values(4,'0123456789'); insert into t1 values(4,'0123456789');
select * from t1; select * from t1;
@@ -56,7 +56,7 @@ pk col1
ABCD 1 ABCD 1
set session debug_dbug= "+d,myrocks_simulate_bad_pk_read1"; set session debug_dbug= "+d,myrocks_simulate_bad_pk_read1";
select * from t2; select * from t2;
ERROR HY000: Got error 199 'Found data corruption.' from ROCKSDB ERROR HY000: Got error 200 'Found data corruption.' from ROCKSDB
set session debug_dbug= "-d,myrocks_simulate_bad_pk_read1"; set session debug_dbug= "-d,myrocks_simulate_bad_pk_read1";
drop table t2; drop table t2;
create table t2 ( create table t2 (
@@ -69,6 +69,6 @@ pk col1
ABCD 1 ABCD 1
set session debug_dbug= "+d,myrocks_simulate_bad_pk_read1"; set session debug_dbug= "+d,myrocks_simulate_bad_pk_read1";
select * from t2; select * from t2;
ERROR HY000: Got error 199 'Found data corruption.' from ROCKSDB ERROR HY000: Got error 200 'Found data corruption.' from ROCKSDB
set session debug_dbug= "-d,myrocks_simulate_bad_pk_read1"; set session debug_dbug= "-d,myrocks_simulate_bad_pk_read1";
drop table t2; drop table t2;

8
storage/rocksdb/mysql-test/rocksdb/r/foreign_key.result
View File

@@ -1,16 +1,16 @@
DROP TABLE IF EXISTS t1, t2; DROP TABLE IF EXISTS t1, t2;
CREATE TABLE t1 (b INT PRIMARY KEY); CREATE TABLE t1 (b INT PRIMARY KEY);
CREATE TABLE t2 (a INT NOT NULL, b INT NOT NULL, FOREIGN KEY (b) REFERENCES t1(b)); CREATE TABLE t2 (a INT NOT NULL, b INT NOT NULL, FOREIGN KEY (b) REFERENCES t1(b));
ERROR 42000: This version of MySQL doesn't yet support 'FOREIGN KEY for the RocksDB storage engine' ERROR 42000: This version of MariaDB doesn't yet support 'FOREIGN KEY for the RocksDB storage engine'
CREATE TABLE t2 (a INT NOT NULL, bforeign INT NOT NULL); CREATE TABLE t2 (a INT NOT NULL, bforeign INT NOT NULL);
DROP TABLE t2; DROP TABLE t2;
CREATE TABLE t2 (a INT NOT NULL, foreignkey INT NOT NULL); CREATE TABLE t2 (a INT NOT NULL, foreignkey INT NOT NULL);
DROP TABLE t2; DROP TABLE t2;
CREATE TABLE t2 (a INT NOT NULL, bforeign INT not null, FOREIGN KEY (bforeign) REFERENCES t1(b)); CREATE TABLE t2 (a INT NOT NULL, bforeign INT not null, FOREIGN KEY (bforeign) REFERENCES t1(b));
ERROR 42000: This version of MySQL doesn't yet support 'FOREIGN KEY for the RocksDB storage engine' ERROR 42000: This version of MariaDB doesn't yet support 'FOREIGN KEY for the RocksDB storage engine'
CREATE TABLE t2 (a INT NOT NULL, b INT NOT NULL); CREATE TABLE t2 (a INT NOT NULL, b INT NOT NULL);
ALTER TABLE t2 ADD FOREIGN KEY (b) REFERENCES t1(b); ALTER TABLE t2 ADD FOREIGN KEY (b) REFERENCES t1(b);
ERROR 42000: This version of MySQL doesn't yet support 'FOREIGN KEY for the RocksDB storage engine' ERROR 42000: This version of MariaDB doesn't yet support 'FOREIGN KEY for the RocksDB storage engine'
DROP TABLE t2; DROP TABLE t2;
CREATE TABLE t2 (a INT NOT NULL); CREATE TABLE t2 (a INT NOT NULL);
ALTER TABLE t2 ADD bforeign INT NOT NULL; ALTER TABLE t2 ADD bforeign INT NOT NULL;
@@ -20,6 +20,6 @@ ALTER TABLE t2 ADD foreignkey INT NOT NULL;
DROP TABLE t2; DROP TABLE t2;
CREATE TABLE t2 (a INT NOT NULL); CREATE TABLE t2 (a INT NOT NULL);
ALTER TABLE t2 ADD bforeign INT NOT NULL, ADD FOREIGN KEY (bforeign) REFERENCES t1(b); ALTER TABLE t2 ADD bforeign INT NOT NULL, ADD FOREIGN KEY (bforeign) REFERENCES t1(b);
ERROR 42000: This version of MySQL doesn't yet support 'FOREIGN KEY for the RocksDB storage engine' ERROR 42000: This version of MariaDB doesn't yet support 'FOREIGN KEY for the RocksDB storage engine'
DROP TABLE t2; DROP TABLE t2;
DROP TABLE t1; DROP TABLE t1;

2
storage/rocksdb/mysql-test/rocksdb/r/index_merge_rocksdb.result
View File

@@ -31,7 +31,7 @@ test.t1 analyze status OK
set global rocksdb_force_flush_memtable_now=1; set global rocksdb_force_flush_memtable_now=1;
explain select * from t1 where key1 = 1; explain select * from t1 where key1 = 1;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref key1 key1 5 const # NULL 1 SIMPLE t1 ref key1 key1 5 const #
explain select key1,key2 from t1 where key1 = 1 or key2 = 1; explain select key1,key2 from t1 where key1 = 1 or key2 = 1;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index_merge key1,key2 key1,key2 5,5 NULL # Using union(key1,key2); Using where 1 SIMPLE t1 index_merge key1,key2 key1,key2 5,5 NULL # Using union(key1,key2); Using where

2
storage/rocksdb/mysql-test/rocksdb/r/rocksdb_parts.result
View File

@@ -94,7 +94,7 @@ drop table t1, t2;
CREATE TABLE t1 (c1 INT NOT NULL, c2 CHAR(5)) PARTITION BY HASH(c1) PARTITIONS 4; CREATE TABLE t1 (c1 INT NOT NULL, c2 CHAR(5)) PARTITION BY HASH(c1) PARTITIONS 4;
INSERT INTO t1 VALUES(1,'a'); INSERT INTO t1 VALUES(1,'a');
RENAME TABLE t1 TO db3.t3; RENAME TABLE t1 TO db3.t3;
ERROR HY000: Error on rename of './test/t1' to './db3/t3' (errno: -1 - Unknown error -1) ERROR HY000: Error on rename of './test/t1' to './db3/t3' (errno: -1 "Internal error < 0 (Not system error)")
SELECT * FROM t1; SELECT * FROM t1;
c1 c2 c1 c2
1 a 1 a

16
storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result
View File

@@ -171,11 +171,14 @@ SELECT * FROM t1;
a b a b
998 5 998 5
DROP TABLE t1; DROP TABLE t1;
connect con1,localhost,root,,;
connect con2,localhost,root,,;
CREATE TABLE t1 ( CREATE TABLE t1 (
a int PRIMARY KEY a int PRIMARY KEY
) ENGINE=rocksdb ) ENGINE=rocksdb
COMMENT='ttl_duration=5;'; COMMENT='ttl_duration=5;';
INSERT INTO t1 values (1); INSERT INTO t1 values (1);
connection con1;
# Creating Snapshot (start transaction) # Creating Snapshot (start transaction)
BEGIN; BEGIN;
SELECT * FROM t1; SELECT * FROM t1;
@@ -185,11 +188,13 @@ SELECT * FROM t1;
a a
1 1
# Switching to connection 2 # Switching to connection 2
connection con2;
set global rocksdb_force_flush_memtable_now=1; set global rocksdb_force_flush_memtable_now=1;
set global rocksdb_compact_cf='default'; set global rocksdb_compact_cf='default';
SELECT * FROM t1; SELECT * FROM t1;
a a
# Switching to connection 1 # Switching to connection 1
connection con1;
SELECT * FROM t1; SELECT * FROM t1;
a a
1 1
@@ -201,6 +206,10 @@ COMMIT;
SELECT * FROM t1; SELECT * FROM t1;
a a
DROP TABLE t1; DROP TABLE t1;
disconnect con1;
disconnect con2;
connect con1,localhost,root,,;
connect con2,localhost,root,,;
set global rocksdb_force_flush_memtable_now=1; set global rocksdb_force_flush_memtable_now=1;
set global rocksdb_compact_cf='default'; set global rocksdb_compact_cf='default';
CREATE TABLE t1 ( CREATE TABLE t1 (
@@ -208,11 +217,13 @@ a int PRIMARY KEY
) ENGINE=rocksdb ) ENGINE=rocksdb
COMMENT='ttl_duration=1;'; COMMENT='ttl_duration=1;';
# On Connection 1 # On Connection 1
connection con1;
# Creating Snapshot (start transaction) # Creating Snapshot (start transaction)
BEGIN; BEGIN;
SELECT * FROM t1; SELECT * FROM t1;
a a
# On Connection 2 # On Connection 2
connection con2;
set global rocksdb_debug_ttl_rec_ts = -2; set global rocksdb_debug_ttl_rec_ts = -2;
INSERT INTO t1 values (1); INSERT INTO t1 values (1);
INSERT INTO t1 values (3); INSERT INTO t1 values (3);
@@ -222,9 +233,11 @@ set global rocksdb_debug_ttl_rec_ts = 0;
set global rocksdb_force_flush_memtable_now=1; set global rocksdb_force_flush_memtable_now=1;
set global rocksdb_compact_cf='default'; set global rocksdb_compact_cf='default';
# On Connection 1 # On Connection 1
connection con1;
SELECT * FROM t1; SELECT * FROM t1;
a a
# On Connection 2 # On Connection 2
connection con2;
SELECT * FROM t1; SELECT * FROM t1;
a a
set global rocksdb_enable_ttl_read_filtering=0; set global rocksdb_enable_ttl_read_filtering=0;
@@ -235,4 +248,7 @@ a
5 5
7 7
set global rocksdb_enable_ttl_read_filtering=1; set global rocksdb_enable_ttl_read_filtering=1;
disconnect con2;
disconnect con1;
connection default;
DROP TABLE t1; DROP TABLE t1;

12
storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_with_partitions.result
View File

@@ -144,16 +144,16 @@ set global rocksdb_debug_ttl_rec_ts = 0;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL DEFAULT '0', `c1` int(11) NOT NULL,
`c2` int(11) NOT NULL DEFAULT '0', `c2` int(11) NOT NULL,
`name` varchar(25) NOT NULL, `name` varchar(25) NOT NULL,
`event` date DEFAULT NULL, `event` date DEFAULT NULL,
PRIMARY KEY (`c2`,`c1`) COMMENT 'custom_p0_cfname=foo;custom_p1_cfname=bar;custom_p2_cfname=baz;' PRIMARY KEY (`c2`,`c1`) COMMENT 'custom_p0_cfname=foo;custom_p1_cfname=bar;custom_p2_cfname=baz;'
) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COMMENT='custom_p0_ttl_duration=9999;custom_p2_ttl_duration=5;' ) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COMMENT='custom_p0_ttl_duration=9999;custom_p2_ttl_duration=5;'
/*!50100 PARTITION BY LIST (c1) PARTITION BY LIST (`c1`)
(PARTITION custom_p0 VALUES IN (1,2,3) ENGINE = ROCKSDB, (PARTITION `custom_p0` VALUES IN (1,2,3) ENGINE = ROCKSDB,
PARTITION custom_p1 VALUES IN (4,5,6) ENGINE = ROCKSDB, PARTITION `custom_p1` VALUES IN (4,5,6) ENGINE = ROCKSDB,
PARTITION custom_p2 VALUES IN (7,8,9) ENGINE = ROCKSDB) */ PARTITION `custom_p2` VALUES IN (7,8,9) ENGINE = ROCKSDB)
set global rocksdb_debug_ttl_snapshot_ts = 100; set global rocksdb_debug_ttl_snapshot_ts = 100;
set global rocksdb_force_flush_memtable_now=1; set global rocksdb_force_flush_memtable_now=1;
set @@global.rocksdb_compact_cf = 'baz'; set @@global.rocksdb_compact_cf = 'baz';

1
storage/rocksdb/mysql-test/rocksdb/t/bulk_load_rev_cf.test
View File

@@ -1,4 +1,5 @@
--source include/have_rocksdb.inc --source include/have_rocksdb.inc
--source include/have_partition.inc
--let pk_cf=rev:cf1 --let pk_cf=rev:cf1
--let data_order_desc=0 --let data_order_desc=0

1
storage/rocksdb/mysql-test/rocksdb/t/bulk_load_rev_cf_and_data.test
View File

@@ -1,4 +1,5 @@
--source include/have_rocksdb.inc --source include/have_rocksdb.inc
--source include/have_partition.inc
--let pk_cf=rev:cf1 --let pk_cf=rev:cf1
--let data_order_desc=1 --let data_order_desc=1

1
storage/rocksdb/mysql-test/rocksdb/t/bulk_load_rev_data.test
View File

@@ -1,4 +1,5 @@
--source include/have_rocksdb.inc --source include/have_rocksdb.inc
--source include/have_partition.inc
--let pk_cf=cf1 --let pk_cf=cf1
--let data_order_desc=1 --let data_order_desc=1

3
storage/rocksdb/mysql-test/rocksdb/t/disabled.def
View File

@@ -70,3 +70,6 @@ col_opt_null : : MDEV-12474 - Fails in fulltest
col_opt_unsigned : MDEV-12474 - Fails in fulltest col_opt_unsigned : MDEV-12474 - Fails in fulltest
col_opt_zerofill : MDEV-12474 - Fails in fulltest col_opt_zerofill : MDEV-12474 - Fails in fulltest
type_float : MDEV-12474 - Fails in fulltest type_float : MDEV-12474 - Fails in fulltest
native_procedure : Not supported in MariaDB

1
storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_with_partitions.test
View File

@@ -1,5 +1,6 @@
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_rocksdb.inc --source include/have_rocksdb.inc
--source include/have_partition.inc
# #
# Create a table with multiple partitions, but in the comment don't specify # Create a table with multiple partitions, but in the comment don't specify

8
storage/rocksdb/mysql-test/rocksdb/t/varbinary_format.test
View File

@@ -34,11 +34,11 @@ DROP TABLE t1;
# Now create the same table in the old format to show that they can be read # Now create the same table in the old format to show that they can be read
# and handled correctly # and handled correctly
set session debug= '+d,MYROCKS_LEGACY_VARBINARY_FORMAT'; set session debug_dbug= '+d,MYROCKS_LEGACY_VARBINARY_FORMAT';
CREATE TABLE t1( CREATE TABLE t1(
vb VARBINARY(64) primary key vb VARBINARY(64) primary key
) ENGINE=rocksdb; ) ENGINE=rocksdb;
set session debug= '-d,MYROCKS_LEGACY_VARBINARY_FORMAT'; set session debug_dbug= '-d,MYROCKS_LEGACY_VARBINARY_FORMAT';
INSERT INTO t1 values(0x00); INSERT INTO t1 values(0x00);
INSERT INTO t1 values(0x0000); INSERT INTO t1 values(0x0000);
@@ -98,11 +98,11 @@ DROP TABLE t1;
# Now create the same table in the old format to show that they can be read # Now create the same table in the old format to show that they can be read
# and handled correctly # and handled correctly
set session debug= '+d,MYROCKS_LEGACY_VARBINARY_FORMAT'; set session debug_dbug= '+d,MYROCKS_LEGACY_VARBINARY_FORMAT';
CREATE TABLE t1( CREATE TABLE t1(
vc VARCHAR(64) collate 'binary' primary key vc VARCHAR(64) collate 'binary' primary key
) ENGINE=rocksdb; ) ENGINE=rocksdb;
set session debug= '-d,MYROCKS_LEGACY_VARBINARY_FORMAT'; set session debug_dbug= '-d,MYROCKS_LEGACY_VARBINARY_FORMAT';
INSERT INTO t1 values('a'); INSERT INTO t1 values('a');
INSERT INTO t1 values('aa'); INSERT INTO t1 values('aa');

1
storage/rocksdb/mysql-test/rocksdb/t/write_sync.test
View File

@@ -5,7 +5,6 @@ SET GLOBAL rocksdb_write_disable_wal=false;
SET GLOBAL rocksdb_write_ignore_missing_column_families=true; SET GLOBAL rocksdb_write_ignore_missing_column_families=true;
create table aaa (id int primary key, i int) engine rocksdb; create table aaa (id int primary key, i int) engine rocksdb;
set @save_rocksdb_flush_log_at_trx_commit= @@global.rocksdb_flush_log_at_trx_commit;
set @save_rocksdb_flush_log_at_trx_commit=@@global.rocksdb_flush_log_at_trx_commit; set @save_rocksdb_flush_log_at_trx_commit=@@global.rocksdb_flush_log_at_trx_commit;
SET GLOBAL rocksdb_flush_log_at_trx_commit=0; SET GLOBAL rocksdb_flush_log_at_trx_commit=0;
sleep 30; sleep 30;