Skip to content

Commit

Permalink
MariaRocks port: Make rocksdb_sys_vars suite pass
Browse files Browse the repository at this point in the history 
- Fix include paths, add suite.opt
- Add a test for @@rocksdb_supported_compression_types
Now all tests pass, except rocksdb_sysvars.rocksdb_rpl_skip_tx_api_basic
  • Loading branch information
@spetrunia
spetrunia committed Dec 31, 2016
1 parent d379963 commit d1af31b
Show file tree
Hide file tree
Showing 101 changed files with 258 additions and 97 deletions.
25 changes: 25 additions & 0 deletions storage/rocksdb/mysql-test/rocksdb_sys_vars/include/correctboolvalue.inc
View file
@@ -0,0 +1,25 @@
##
# $input the value of a boolean type
# $output the value of int type
##
--let $int_value=$value
if ($value==on)
{
--let $int_value=1
}

if ($value==off)
{
--let $int_value=0
}

# MySQL allows 'true' and 'false' on bool values
if ($value==true)
{
--let $int_value=1
}

if ($value==false)
{
--let $int_value=0
}
123 changes: 123 additions & 0 deletions storage/rocksdb/mysql-test/rocksdb_sys_vars/include/rocksdb_sys_var.inc
View file
@@ -0,0 +1,123 @@
##
# $sys_var name of the variable
# $read_only - true if read-only
# $session - true if this is session, false if global-only
# $suppress_default_value - if true, don't check the default value
# valid_values table should contain valid values
# invalid_values
##

--eval SET @start_global_value = @@global.$sys_var
if (!$suppress_default_value)
{
SELECT @start_global_value;
if ($session)
{
--eval SET @start_session_value = @@session.$sys_var
SELECT @start_session_value;
}
}

if (!$read_only)
{
--echo '# Setting to valid values in global scope#'

--let $i=1
--let $value=query_get_value(select value from valid_values, value, $i)
while ($value != 'No such row')
{
--echo "Trying to set variable @@global.$sys_var to $value"
--eval SET @@global.$sys_var = $value
--eval SELECT @@global.$sys_var
--let $v=`SELECT @@global.$sys_var`
--source include/correctboolvalue.inc
if (!$sticky)
{
if ($v != $int_value)
{
--echo Set @@global.$sys_var to $value but it remained set to $v
--die Wrong variable value
}
}

--echo "Setting the global scope variable back to default"
--eval SET @@global.$sys_var = DEFAULT
--eval SELECT @@global.$sys_var

--inc $i
--let $value=query_get_value(select value from valid_values, value, $i)
}

if ($session)
{
--echo '# Setting to valid values in session scope#'

--let $i=1
--let $value=query_get_value(select value from valid_values, value, $i)
while ($value != 'No such row')
{
--echo "Trying to set variable @@session.$sys_var to $value"
--eval SET @@session.$sys_var = $value
--eval SELECT @@session.$sys_var
--let $v=`SELECT @@session.$sys_var`
--source include/correctboolvalue.inc
if (!$sticky)
{
if ($v != $int_value)
{
--echo Set @@session.$sys_var to $value but it remained set to $v
--die Wrong variable value
}
}
--echo "Setting the session scope variable back to default"
--eval SET @@session.$sys_var = DEFAULT
--eval SELECT @@session.$sys_var

--inc $i
--let $value=query_get_value(select value from valid_values, value, $i)
}
}
if (!$session)
{
--echo "Trying to set variable @@session.$sys_var to 444. It should fail because it is not session."
--Error ER_GLOBAL_VARIABLE
--eval SET @@session.$sys_var = 444
}

--echo '# Testing with invalid values in global scope #'
####################################################################
# Change the value of query_prealloc_size to an invalid value #
####################################################################
--let $i=1
--let $value=query_get_value(select value from invalid_values, value, $i)
while ($value != 'No such row')
{
--echo "Trying to set variable @@global.$sys_var to $value"
--Error ER_WRONG_VALUE_FOR_VAR, ER_WRONG_TYPE_FOR_VAR
--eval SET @@global.$sys_var = $value
--eval SELECT @@global.$sys_var
--inc $i
--let $value=query_get_value(select value from invalid_values, value, $i)
}
}

if ($read_only)
{
--echo "Trying to set variable @@global.$sys_var to 444. It should fail because it is readonly."
--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
--eval SET @@global.$sys_var = 444
}

####################################
# Restore initial value #
####################################
if (!$read_only)
{
--eval SET @@global.$sys_var = @start_global_value
--eval SELECT @@global.$sys_var
if ($session)
{
--eval SET @@session.$sys_var = @start_session_value
--eval SELECT @@session.$sys_var
}
}
4 changes: 2 additions & 2 deletions storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_buf_size_basic.result
View file
Expand Up @@ -7,7 +7,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,
PRIMARY KEY (`i`),
KEY `kj` (`j`),
Expand All @@ -19,7 +19,7 @@ ALTER TABLE t1 ADD INDEX kj(j), ADD INDEX kij(i,j), ADD INDEX kji(j,i), ALGORITH
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,
PRIMARY KEY (`i`),
KEY `kj` (`j`),
Expand Down
4 changes: 2 additions & 2 deletions storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_combine_read_size_basic.result
View file
Expand Up @@ -7,7 +7,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,
PRIMARY KEY (`i`),
KEY `kj` (`j`),
Expand All @@ -19,7 +19,7 @@ ALTER TABLE t1 ADD INDEX kj(j), ADD INDEX kij(i,j), ADD INDEX kji(j,i), ALGORITH
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,
PRIMARY KEY (`i`),
KEY `kj` (`j`),
Expand Down
0 ...vars/r/rocksdb_rpl_skip_tx_api_basic.test → ...rs/r/rocksdb_rpl_skip_tx_api_basic.result
View file
File renamed without changes.
4 changes: 4 additions & 0 deletions ...ge/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_supported_compression_types_basic.result
View file
@@ -0,0 +1,4 @@
SET @start_global_value = @@global.ROCKSDB_SUPPORTED_COMPRESSION_TYPES;
"Trying to set variable @@global.ROCKSDB_SUPPORTED_COMPRESSION_TYPES to 444. It should fail because it is readonly."
SET @@global.ROCKSDB_SUPPORTED_COMPRESSION_TYPES = 444;
ERROR HY000: Variable 'rocksdb_supported_compression_types' is a read only variable
2 changes: 2 additions & 0 deletions storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.opt
View file
@@ -0,0 +1,2 @@
--ignore-db-dirs=.rocksdb

2 changes: 1 addition & 1 deletion .../rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_access_hint_on_compaction_start_basic.test
View file
Expand Up @@ -3,5 +3,5 @@
--let $sys_var=ROCKSDB_ACCESS_HINT_ON_COMPACTION_START
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_advise_random_on_open_basic.test
View file
Expand Up @@ -3,4 +3,4 @@
--let $sys_var=ROCKSDB_ADVISE_RANDOM_ON_OPEN
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc
2 changes: 1 addition & 1 deletion .../rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_concurrent_memtable_write_basic.test
View file
Expand Up @@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
--let $sys_var=ROCKSDB_ALLOW_CONCURRENT_MEMTABLE_WRITE
--let $read_only=0
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_mmap_reads_basic.test
View file
Expand Up @@ -3,4 +3,4 @@
--let $sys_var=ROCKSDB_ALLOW_MMAP_READS
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_mmap_writes_basic.test
View file
Expand Up @@ -3,4 +3,4 @@
--let $sys_var=ROCKSDB_ALLOW_MMAP_WRITES
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_allow_os_buffer_basic.test
View file
Expand Up @@ -3,4 +3,4 @@
--let $sys_var=ROCKSDB_ALLOW_OS_BUFFER
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_background_sync_basic.test
View file
Expand Up @@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
--let $sys_var=ROCKSDB_BACKGROUND_SYNC
--let $read_only=0
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_base_background_compactions_basic.test
View file
Expand Up @@ -3,5 +3,5 @@
--let $sys_var=ROCKSDB_BASE_BACKGROUND_COMPACTIONS
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_cache_size_basic.test
View file
Expand Up @@ -3,5 +3,5 @@
--let $sys_var=ROCKSDB_BLOCK_CACHE_SIZE
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_restart_interval_basic.test
View file
Expand Up @@ -3,4 +3,4 @@
--let $sys_var=ROCKSDB_BLOCK_RESTART_INTERVAL
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_size_basic.test
View file
Expand Up @@ -3,5 +3,5 @@
--let $sys_var=ROCKSDB_BLOCK_SIZE
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_block_size_deviation_basic.test
View file
Expand Up @@ -3,5 +3,5 @@
--let $sys_var=ROCKSDB_BLOCK_SIZE_DEVIATION
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bulk_load_basic.test
View file
Expand Up @@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
--let $sys_var=ROCKSDB_BULK_LOAD
--let $read_only=0
--let $session=1
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bulk_load_size_basic.test
View file
Expand Up @@ -10,7 +10,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
--let $sys_var=ROCKSDB_BULK_LOAD_SIZE
--let $read_only=0
--let $session=1
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_bytes_per_sync_basic.test
View file
Expand Up @@ -3,5 +3,5 @@
--let $sys_var=ROCKSDB_BYTES_PER_SYNC
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

2 changes: 1 addition & 1 deletion ...ge/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_cache_index_and_filter_blocks_basic.test
View file
Expand Up @@ -3,4 +3,4 @@
--let $sys_var=ROCKSDB_CACHE_INDEX_AND_FILTER_BLOCKS
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_checksums_pct_basic.test
View file
Expand Up @@ -11,7 +11,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
--let $sys_var=ROCKSDB_CHECKSUMS_PCT
--let $read_only=0
--let $session=1
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_collect_sst_properties_basic.test
View file
Expand Up @@ -3,6 +3,6 @@
--let $sys_var=ROCKSDB_COLLECT_SST_PROPERTIES
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc


2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_commit_in_the_middle_basic.test
View file
Expand Up @@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
--let $sys_var=ROCKSDB_COMMIT_IN_THE_MIDDLE
--let $read_only=0
--let $session=1
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compact_cf_basic.test
View file
Expand Up @@ -10,7 +10,7 @@ CREATE TABLE invalid_values (value varchar(255)) ENGINE=myisam;
--let $read_only=0
--let $session=0
--let $sticky=1
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_readahead_size_basic.test
View file
Expand Up @@ -17,7 +17,7 @@ SELECT @@global.rocksdb_compaction_readahead_size;
--let $sys_var=ROCKSDB_COMPACTION_READAHEAD_SIZE
--let $read_only=0
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
2 changes: 1 addition & 1 deletion ...ge/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_basic.test
View file
Expand Up @@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'2000001\'');
--let $sys_var=ROCKSDB_COMPACTION_SEQUENTIAL_DELETES
--let $read_only=0
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
2 changes: 1 addition & 1 deletion ...b/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_count_sd_basic.test
View file
Expand Up @@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'bbb\'');
--let $sys_var=ROCKSDB_COMPACTION_SEQUENTIAL_DELETES_COUNT_SD
--let $read_only=0
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
2 changes: 1 addition & 1 deletion .../mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_file_size_basic.test
View file
Expand Up @@ -10,7 +10,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
--let $sys_var=ROCKSDB_COMPACTION_SEQUENTIAL_DELETES_FILE_SIZE
--let $read_only=0
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
2 changes: 1 addition & 1 deletion ...sdb/mysql-test/rocksdb_sys_vars/t/rocksdb_compaction_sequential_deletes_window_basic.test
View file
Expand Up @@ -12,7 +12,7 @@ INSERT INTO invalid_values VALUES('\'2000001\'');
--let $sys_var=ROCKSDB_COMPACTION_SEQUENTIAL_DELETES_WINDOW
--let $read_only=0
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
2 changes: 1 addition & 1 deletion storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_create_if_missing_basic.test
View file
Expand Up @@ -10,7 +10,7 @@ INSERT INTO invalid_values VALUES('\'aaa\'');
--let $sys_var=ROCKSDB_CREATE_IF_MISSING
--let $read_only=1
--let $session=0
--source suite/sys_vars/inc/rocksdb_sys_var.inc
--source include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;

0 comments on commit d1af31b

Please sign in to comment.