Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issues 1200 and 1295, add rocksdb_compact_lzero_now global variable #1309

Open
wants to merge 1 commit into
base: fb-mysql-8.0.28
Choose a base branch
from
Open

Fix issues 1200 and 1295, add rocksdb_compact_lzero_now global variable #1309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mysql-test/suite/rocksdb/r/rocksdb.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,7 @@ rocksdb_column_default_value_as_expression ON
rocksdb_commit_in_the_middle OFF
rocksdb_commit_time_batch_for_recovery ON
rocksdb_compact_cf
rocksdb_compact_lzero_now OFF
rocksdb_compaction_readahead_size 0
rocksdb_compaction_sequential_deletes 0
rocksdb_compaction_sequential_deletes_count_sd OFF
Expand Down Expand Up @@ -984,7 +985,7 @@ rocksdb_flush_log_at_trx_commit 1
rocksdb_force_compute_memtable_stats ON
rocksdb_force_compute_memtable_stats_cachetime 0
rocksdb_force_flush_memtable_and_lzero_now OFF
rocksdb_force_flush_memtable_now ON
rocksdb_force_flush_memtable_now OFF
rocksdb_force_index_records_in_range 0
rocksdb_ignore_unknown_options ON
rocksdb_index_type kBinarySearch
Expand Down
83 changes: 83 additions & 0 deletions mysql-test/suite/rocksdb_sys_vars/r/rocksdb_compact_lzero_now_basic.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
CREATE TABLE valid_values (value varchar(255)) ENGINE=myisam;
INSERT INTO valid_values VALUES(1);
INSERT INTO valid_values VALUES('on');
INSERT INTO valid_values VALUES('true');
INSERT INTO valid_values VALUES(0);
INSERT INTO valid_values VALUES('off');
INSERT INTO valid_values VALUES('false');
CREATE TABLE invalid_values (value varchar(255)) ENGINE=myisam;
SET @start_global_value = @@global.ROCKSDB_COMPACT_LZERO_NOW;
SELECT @start_global_value;
@start_global_value
0
'# Setting to valid values in global scope#'
"Trying to set variable @@global.ROCKSDB_COMPACT_LZERO_NOW to 1"
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = 1;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = DEFAULT;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
"Trying to set variable @@global.ROCKSDB_COMPACT_LZERO_NOW to on"
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = on;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = DEFAULT;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
"Trying to set variable @@global.ROCKSDB_COMPACT_LZERO_NOW to true"
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = true;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = DEFAULT;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
"Trying to set variable @@global.ROCKSDB_COMPACT_LZERO_NOW to 0"
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = 0;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = DEFAULT;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
"Trying to set variable @@global.ROCKSDB_COMPACT_LZERO_NOW to off"
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = off;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = DEFAULT;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
"Trying to set variable @@global.ROCKSDB_COMPACT_LZERO_NOW to false"
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = false;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = DEFAULT;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
"Trying to set variable @@session.ROCKSDB_COMPACT_LZERO_NOW to 444. It should fail because it is not session."
SET @@session.ROCKSDB_COMPACT_LZERO_NOW = 444;
ERROR HY000: Variable 'rocksdb_compact_lzero_now' is a GLOBAL variable and should be set with SET GLOBAL
'# Testing with invalid values in global scope #'
SET @@global.ROCKSDB_COMPACT_LZERO_NOW = @start_global_value;
SELECT @@global.ROCKSDB_COMPACT_LZERO_NOW;
@@global.ROCKSDB_COMPACT_LZERO_NOW
0
DROP TABLE valid_values;
DROP TABLE invalid_values;
39 changes: 36 additions & 3 deletions mysql-test/suite/rocksdb_sys_vars/r/rocksdb_force_flush_memtable_and_lzero_now_basic.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
CREATE TABLE valid_values (value varchar(255)) ENGINE=myisam;
INSERT INTO valid_values VALUES(1);
INSERT INTO valid_values VALUES(0);
INSERT INTO valid_values VALUES('on');
INSERT INTO valid_values VALUES('true');
INSERT INTO valid_values VALUES(0);
INSERT INTO valid_values VALUES('off');
INSERT INTO valid_values VALUES('false');
CREATE TABLE invalid_values (value varchar(255)) ENGINE=myisam;
SET @start_global_value = @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW;
SELECT @start_global_value;
Expand All @@ -18,6 +21,26 @@ SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW = DEFAULT;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW
0
"Trying to set variable @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW to on"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW = on;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW = DEFAULT;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW
0
"Trying to set variable @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW to true"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW = true;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW = DEFAULT;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW
0
"Trying to set variable @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW to 0"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW = 0;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW;
Expand All @@ -28,8 +51,18 @@ SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW = DEFAULT;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW
0
"Trying to set variable @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW to on"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW = on;
"Trying to set variable @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW to off"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW = off;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW = DEFAULT;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW
0
"Trying to set variable @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW to false"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW = false;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_AND_LZERO_NOW
0
Expand Down
54 changes: 33 additions & 21 deletions mysql-test/suite/rocksdb_sys_vars/r/rocksdb_force_flush_memtable_now_basic.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,70 +2,82 @@ CREATE TABLE valid_values (value varchar(255)) ENGINE=myisam;
INSERT INTO valid_values VALUES(1);
INSERT INTO valid_values VALUES('on');
INSERT INTO valid_values VALUES('true');
INSERT INTO valid_values VALUES(0);
INSERT INTO valid_values VALUES('off');
INSERT INTO valid_values VALUES('false');
CREATE TABLE invalid_values (value varchar(255)) ENGINE=myisam;
INSERT INTO invalid_values VALUES(0);
INSERT INTO invalid_values VALUES('off');
INSERT INTO invalid_values VALUES('false');
SET @start_global_value = @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
SELECT @start_global_value;
@start_global_value
1
0
'# Setting to valid values in global scope#'
"Trying to set variable @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW to 1"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = 1;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
1
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = DEFAULT;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
1
0
"Trying to set variable @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW to on"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = on;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
1
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = DEFAULT;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
1
0
"Trying to set variable @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW to true"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = true;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
1
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = DEFAULT;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
1
"Trying to set variable @@session.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW to 444. It should fail because it is not session."
SET @@session.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = 444;
ERROR HY000: Variable 'rocksdb_force_flush_memtable_now' is a GLOBAL variable and should be set with SET GLOBAL
'# Testing with invalid values in global scope #'
0
"Trying to set variable @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW to 0"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = 0;
Got one of the listed errors
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
1
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = DEFAULT;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
0
"Trying to set variable @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW to off"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = off;
Got one of the listed errors
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
1
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = DEFAULT;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
0
"Trying to set variable @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW to false"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = false;
Got one of the listed errors
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
1
0
"Setting the global scope variable back to default"
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = DEFAULT;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
0
"Trying to set variable @@session.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW to 444. It should fail because it is not session."
SET @@session.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = 444;
ERROR HY000: Variable 'rocksdb_force_flush_memtable_now' is a GLOBAL variable and should be set with SET GLOBAL
'# Testing with invalid values in global scope #'
SET @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW = @start_global_value;
SELECT @@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW;
@@global.ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
1
0
DROP TABLE valid_values;
DROP TABLE invalid_values;
20 changes: 20 additions & 0 deletions mysql-test/suite/rocksdb_sys_vars/t/rocksdb_compact_lzero_now_basic.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--source include/have_rocksdb.inc

CREATE TABLE valid_values (value varchar(255)) ENGINE=myisam;
INSERT INTO valid_values VALUES(1);
INSERT INTO valid_values VALUES('on');
INSERT INTO valid_values VALUES('true');
INSERT INTO valid_values VALUES(0);
INSERT INTO valid_values VALUES('off');
INSERT INTO valid_values VALUES('false');

CREATE TABLE invalid_values (value varchar(255)) ENGINE=myisam;

--let $sys_var=ROCKSDB_COMPACT_LZERO_NOW
--let $read_only=0
--let $session=0
--let $sticky=1
--source ../include/rocksdb_sys_var.inc

DROP TABLE valid_values;
DROP TABLE invalid_values;
5 changes: 4 additions & 1 deletion mysql-test/suite/rocksdb_sys_vars/t/rocksdb_force_flush_memtable_and_lzero_now_basic.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

CREATE TABLE valid_values (value varchar(255)) ENGINE=myisam;
INSERT INTO valid_values VALUES(1);
INSERT INTO valid_values VALUES(0);
INSERT INTO valid_values VALUES('on');
INSERT INTO valid_values VALUES('true');
INSERT INTO valid_values VALUES(0);
INSERT INTO valid_values VALUES('off');
INSERT INTO valid_values VALUES('false');

CREATE TABLE invalid_values (value varchar(255)) ENGINE=myisam;

Expand Down
6 changes: 3 additions & 3 deletions mysql-test/suite/rocksdb_sys_vars/t/rocksdb_force_flush_memtable_now_basic.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ CREATE TABLE valid_values (value varchar(255)) ENGINE=myisam;
INSERT INTO valid_values VALUES(1);
INSERT INTO valid_values VALUES('on');
INSERT INTO valid_values VALUES('true');
INSERT INTO valid_values VALUES(0);
INSERT INTO valid_values VALUES('off');
INSERT INTO valid_values VALUES('false');

CREATE TABLE invalid_values (value varchar(255)) ENGINE=myisam;
INSERT INTO invalid_values VALUES(0);
INSERT INTO invalid_values VALUES('off');
INSERT INTO invalid_values VALUES('false');

--let $sys_var=ROCKSDB_FORCE_FLUSH_MEMTABLE_NOW
--let $read_only=0
Expand Down
Loading