Range Locking: READ COMMITTED doesnt take range locks but should still lock secondary keys

Author: spetrunia

mysql-test/suite/rocksdb/r/range_locking.result

@@ -562,3 +562,32 @@ rollback;
 drop table t1;
 disconnect con1;
 connection default;
+#
+# Range Locking and READ-COMMITTED, another test
+#
+create table t1 (
+pk int,
+a int,
+b int,
+primary key (pk),
+key(a)
+) engine=rocksdb;
+insert into t1 values
+(1, 100, 1000),
+(2, 200, 2000),
+(3, 300, 3000);
+set transaction isolation level repeatable read;
+begin;
+update t1 set b = b + 1 where a > 200;
+connect  con1,localhost,root,,;
+connection con1;
+set transaction isolation level read committed;
+begin;
+insert into t1 values (4, 150, 1500);
+insert into t1 values (5, 250, 1500);
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on index: test.t1.a
+rollback;
+disconnect con1;
+connection default;
+rollback;
+drop table t1;

mysql-test/suite/rocksdb/r/range_locking_rev_cf.result

@@ -522,3 +522,32 @@ rollback;
 drop table t1;
 disconnect con1;
 connection default;
+#
+# Range Locking and READ-COMMITTED, another test
+#
+create table t1 (
+pk int,
+a int,
+b int,
+primary key (pk),
+key(a)
+) engine=rocksdb;
+insert into t1 values
+(1, 100, 1000),
+(2, 200, 2000),
+(3, 300, 3000);
+set transaction isolation level repeatable read;
+begin;
+update t1 set b = b + 1 where a > 200;
+connect  con1,localhost,root,,;
+connection con1;
+set transaction isolation level read committed;
+begin;
+insert into t1 values (4, 150, 1500);
+insert into t1 values (5, 250, 1500);
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on index: test.t1.a
+rollback;
+disconnect con1;
+connection default;
+rollback;
+drop table t1;

mysql-test/suite/rocksdb/t/range_locking.inc

@@ -575,3 +575,37 @@ drop table t1;
 disconnect con1;
 connection default;
 
+--echo #
+--echo # Range Locking and READ-COMMITTED, another test
+--echo #
+create table t1 (
+  pk int,
+  a int,
+  b int,
+  primary key (pk),
+  key(a)
+) engine=rocksdb;
+
+insert into t1 values
+(1, 100, 1000),
+(2, 200, 2000),
+(3, 300, 3000);
+
+set transaction isolation level repeatable read;
+begin;
+update t1 set b = b + 1 where a > 200;
+
+connect (con1,localhost,root,,);
+connection con1;
+set transaction isolation level read committed;
+begin;
+insert into t1 values (4, 150, 1500);
+--error ER_LOCK_WAIT_TIMEOUT
+insert into t1 values (5, 250, 1500);
+
+rollback;
+
+disconnect con1;
+connection default;
+rollback;
+drop table t1;

storage/rocksdb/ha_rocksdb.cc

@@ -11429,7 +11429,7 @@ int ha_rocksdb::update_write_sk(const TABLE *const table_arg,
         reinterpret_cast<const char *>(m_sk_packed_tuple_old), old_packed_size);
 
     /* Range locking: lock the index tuple being deleted */
-    if (m_use_range_locking) {
+    if (rocksdb_use_range_locking) {
       auto s= row_info.tx->lock_singlepoint_range(kd.get_cf(), old_key_slice);
       if (!s.ok()) {
         return (row_info.tx->set_status_error(table->in_use, s, kd,
@@ -11483,7 +11483,7 @@ int ha_rocksdb::update_write_sk(const TABLE *const table_arg,
     rc = bulk_load_key(row_info.tx, kd, new_key_slice, new_value_slice, true);
   } else {
     /* Range locking: lock the index tuple being inserted */
-    if (m_use_range_locking) {
+    if (rocksdb_use_range_locking) {
       auto s= row_info.tx->lock_singlepoint_range(kd.get_cf(), new_key_slice);
       if (!s.ok()) {
         return (row_info.tx->set_status_error(table->in_use, s, kd,
@@ -11926,7 +11926,7 @@ int ha_rocksdb::delete_row(const uchar *const buf) {
         For point locking, Deleting on secondary key doesn't need any locks.
         Range locking must get a lock.
       */
-      if (m_use_range_locking) {
+      if (rocksdb_use_range_locking) {
         auto s= tx->lock_singlepoint_range(kd.get_cf(), secondary_key_slice);
         if (!s.ok()) {
           DBUG_RETURN(tx->set_status_error(table->in_use, s, kd, m_tbl_def,