[Commits] 3ded690f323: Range Locking: get tests to pass: select_count_for_update, skip_Locked_nowait.

psergey sergey at mariadb.com
Mon Jul 19 13:55:41 EEST 2021


revision-id: 3ded690f3236c48665971a628dc419f523ffe0b9 (percona-202103-66-g3ded690f323)
parent(s): af2c310e95343e4455c1cc3dcf893651d27e6c06
author: Sergei Petrunia
committer: Sergei Petrunia
timestamp: 2021-07-19 13:55:18 +0300
message:

Range Locking: get tests to pass: select_count_for_update, skip_Locked_nowait.

---
 mysql-test/suite/rocksdb/r/select_count_for_update.result |  4 ++--
 mysql-test/suite/rocksdb/t/select_count_for_update.test   | 14 ++++++++++++++
 mysql-test/suite/rocksdb/t/skip_locked_nowait.test        |  3 +++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/mysql-test/suite/rocksdb/r/select_count_for_update.result b/mysql-test/suite/rocksdb/r/select_count_for_update.result
index 1107aa2f6cb..6672d43eb43 100644
--- a/mysql-test/suite/rocksdb/r/select_count_for_update.result
+++ b/mysql-test/suite/rocksdb/r/select_count_for_update.result
@@ -35,9 +35,9 @@ SELECT COUNT(*) FROM t1 FORCE INDEX (sk);
 COUNT(*)
 3
 SELECT COUNT(*) FROM t1 FORCE INDEX (sk) LOCK IN SHARE MODE;
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on index: test.t1.PRIMARY
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on index: $FAILING_INDEX
 SELECT COUNT(*) FROM t1 FORCE INDEX (sk) FOR UPDATE;
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on index: test.t1.PRIMARY
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on index: $FAILING_INDEX
 connection con1;
 COMMIT;
 SELECT COUNT(*) FROM t1 FORCE INDEX (sk);
diff --git a/mysql-test/suite/rocksdb/t/select_count_for_update.test b/mysql-test/suite/rocksdb/t/select_count_for_update.test
index 2c6f5d474a1..aa7059dfc7e 100644
--- a/mysql-test/suite/rocksdb/t/select_count_for_update.test
+++ b/mysql-test/suite/rocksdb/t/select_count_for_update.test
@@ -52,9 +52,23 @@ SET lock_wait_timeout = 1;
 SELECT COUNT(*) FROM t1 FORCE INDEX (sk);
 # ... but not with LOCK IN SHARE MODE / FOR UPDATE
 
+let $uses_range_locking=`select @@rocksdb_use_range_locking`;
+
+if ($uses_range_locking == "0") {
+--replace_regex /test.t1.PRIMARY/$FAILING_INDEX/
+} 
+if ($uses_range_locking == "1") {
+--replace_regex /test.t1.sk/$FAILING_INDEX/
+}
 --error ER_LOCK_WAIT_TIMEOUT
 SELECT COUNT(*) FROM t1 FORCE INDEX (sk) LOCK IN SHARE MODE;
 
+if ($uses_range_locking == "0") {
+--replace_regex /test.t1.PRIMARY/$FAILING_INDEX/
+} 
+if ($uses_range_locking == "1") {
+--replace_regex /test.t1.sk/$FAILING_INDEX/
+}
 --error ER_LOCK_WAIT_TIMEOUT
 SELECT COUNT(*) FROM t1 FORCE INDEX (sk) FOR UPDATE;
 
diff --git a/mysql-test/suite/rocksdb/t/skip_locked_nowait.test b/mysql-test/suite/rocksdb/t/skip_locked_nowait.test
index bfa36714816..3b8bcb033c0 100644
--- a/mysql-test/suite/rocksdb/t/skip_locked_nowait.test
+++ b/mysql-test/suite/rocksdb/t/skip_locked_nowait.test
@@ -2,5 +2,8 @@
 # wl#8919  Implement NOWAIT and SKIP LOCKED
 #
 
+# Range locking cannot support SKIP LOCKED? (TODO: but can support NOWAIT)
+--source suite/rocksdb/include/not_range_locking.inc
+
 --let $engine=ROCKSDB
 --source include/skip_locked_nowait.inc


More information about the commits mailing list