From f0e444974ab6ff14aaa7a2ea4176250bc0e68296 Mon Sep 17 00:00:00 2001
From: ccf <15848426+goldendbccf123@user.noreply.gitee.com>
Date: Fri, 23 May 2025 16:32:17 +0800
Subject: [PATCH 1/2] New files:
 ttl_secondary_read_filtering_multiple_index.test,
 ttl_secondary_with_partitions-master.opt

---
 ...condary_read_filtering_multiple_index.test | 91 +++++++++++++++++++
 .../ttl_secondary_with_partitions-master.opt  |  1 +
 2 files changed, 92 insertions(+)
 create mode 100644 mysql-test/suite/rocksdb/t/ttl_secondary_read_filtering_multiple_index.test
 create mode 100644 mysql-test/suite/rocksdb/t/ttl_secondary_with_partitions-master.opt

diff --git a/mysql-test/suite/rocksdb/t/ttl_secondary_read_filtering_multiple_index.test b/mysql-test/suite/rocksdb/t/ttl_secondary_read_filtering_multiple_index.test
new file mode 100644
index 000000000..031aa7771
--- /dev/null
+++ b/mysql-test/suite/rocksdb/t/ttl_secondary_read_filtering_multiple_index.test
@@ -0,0 +1,91 @@
+--source include/have_debug.inc
+--source include/have_rocksdb.inc
+
+set @orig_rocksdb_debug_ttl_rec_ts = @@global.rocksdb_debug_ttl_rec_ts;
+
+# Multiple indexes, trigger compaction on sk and check consistency
+CREATE TABLE t1 (
+  a int NOT NULL,
+  b int NOT NULL,
+  c int NOT NULL,
+  PRIMARY KEY (a),
+  KEY kb (b) COMMENT 'cfname=kb',
+  KEY kc (c) COMMENT 'cfname=kc'
+) ENGINE=ROCKSDB
+COMMENT='ttl_duration=1';
+
+set global rocksdb_debug_ttl_rec_ts = -100;
+INSERT INTO t1 values (1, 1, 1);
+INSERT INTO t1 values (2, 2, 2);
+set global rocksdb_debug_ttl_rec_ts = 100;
+INSERT INTO t1 values (3, 3, 3);
+set global rocksdb_debug_ttl_rec_ts = 0;
+
+set global rocksdb_force_flush_memtable_now=1;
+set global rocksdb_compact_cf='kb';
+
+# Results should be consistent
+SELECT * FROM t1 FORCE INDEX (PRIMARY);
+SELECT * FROM t1 FORCE INDEX (kb);
+SELECT * FROM t1 FORCE INDEX (kc);
+
+DROP TABLE t1;
+
+# Trigger compaction on pk and check consistency
+CREATE TABLE t1 (
+  a int NOT NULL,
+  b int NOT NULL,
+  c int NOT NULL,
+  PRIMARY KEY (a),
+  KEY kb (b) COMMENT 'cfname=kb',
+  KEY kc (c) COMMENT 'cfname=kc'
+) ENGINE=ROCKSDB
+COMMENT='ttl_duration=1';
+
+set global rocksdb_debug_ttl_rec_ts = -100;
+INSERT INTO t1 values (1, 1, 1);
+INSERT INTO t1 values (2, 2, 2);
+set global rocksdb_debug_ttl_rec_ts = 100;
+INSERT INTO t1 values (3, 3, 3);
+set global rocksdb_debug_ttl_rec_ts = 0;
+
+set global rocksdb_force_flush_memtable_now=1;
+set global rocksdb_compact_cf='default';
+
+# Results should be consistent
+SELECT * FROM t1 FORCE INDEX (PRIMARY);
+SELECT * FROM t1 FORCE INDEX (kb);
+SELECT * FROM t1 FORCE INDEX (kc);
+
+DROP TABLE t1;
+
+# Trigger compaction on pk and sk and check consistency
+CREATE TABLE t1 (
+  a int NOT NULL,
+  b int NOT NULL,
+  c int NOT NULL,
+  PRIMARY KEY (a),
+  KEY kb (b) COMMENT 'cfname=kb',
+  KEY kc (c) COMMENT 'cfname=kc'
+) ENGINE=ROCKSDB
+COMMENT='ttl_duration=1';
+
+set global rocksdb_debug_ttl_rec_ts = -100;
+INSERT INTO t1 values (1, 1, 1);
+INSERT INTO t1 values (2, 2, 2);
+set global rocksdb_debug_ttl_rec_ts = 100;
+INSERT INTO t1 values (3, 3, 3);
+set global rocksdb_debug_ttl_rec_ts = 0;
+
+set global rocksdb_force_flush_memtable_now=1;
+set global rocksdb_compact_cf='default';
+set global rocksdb_compact_cf='kb';
+
+# Results should be consistent
+SELECT * FROM t1 FORCE INDEX (PRIMARY);
+SELECT * FROM t1 FORCE INDEX (kb);
+SELECT * FROM t1 FORCE INDEX (kc);
+
+DROP TABLE t1;
+
+set @@global.rocksdb_debug_ttl_rec_ts = @orig_rocksdb_debug_ttl_rec_ts ;
diff --git a/mysql-test/suite/rocksdb/t/ttl_secondary_with_partitions-master.opt b/mysql-test/suite/rocksdb/t/ttl_secondary_with_partitions-master.opt
new file mode 100644
index 000000000..e5c934d97
--- /dev/null
+++ b/mysql-test/suite/rocksdb/t/ttl_secondary_with_partitions-master.opt
@@ -0,0 +1 @@
+--loose-rocksdb_enable_ttl_read_filtering=0
-- 
Gitee


From b8b4d79576822d11048309b3233b99732a5f1254 Mon Sep 17 00:00:00 2001
From: ccf <15848426+goldendbccf123@user.noreply.gitee.com>
Date: Mon, 26 May 2025 15:11:35 +0800
Subject: [PATCH 2/2] New files: rpl_rocksdb_row_crash_safe-master.opt,
 rpl_rocksdb_row_crash_safe-slave.opt

---
 .../suite/rocksdb_rpl/t/rpl_rocksdb_row_crash_safe-master.opt    | 1 +
 .../suite/rocksdb_rpl/t/rpl_rocksdb_row_crash_safe-slave.opt     | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 mysql-test/suite/rocksdb_rpl/t/rpl_rocksdb_row_crash_safe-master.opt
 create mode 100644 mysql-test/suite/rocksdb_rpl/t/rpl_rocksdb_row_crash_safe-slave.opt

diff --git a/mysql-test/suite/rocksdb_rpl/t/rpl_rocksdb_row_crash_safe-master.opt b/mysql-test/suite/rocksdb_rpl/t/rpl_rocksdb_row_crash_safe-master.opt
new file mode 100644
index 000000000..e980c2de7
--- /dev/null
+++ b/mysql-test/suite/rocksdb_rpl/t/rpl_rocksdb_row_crash_safe-master.opt
@@ -0,0 +1 @@
+--transaction_isolation=READ-COMMITTED
diff --git a/mysql-test/suite/rocksdb_rpl/t/rpl_rocksdb_row_crash_safe-slave.opt b/mysql-test/suite/rocksdb_rpl/t/rpl_rocksdb_row_crash_safe-slave.opt
new file mode 100644
index 000000000..79e05d989
--- /dev/null
+++ b/mysql-test/suite/rocksdb_rpl/t/rpl_rocksdb_row_crash_safe-slave.opt
@@ -0,0 +1 @@
+--skip-slave-start --relay-log-recovery=1 --transaction_isolation=READ-COMMITTED
-- 
Gitee