From 43cf756fc28b9481e2e0e1f8e6bb0bdf5f5dd389 Mon Sep 17 00:00:00 2001 From: leipeng Date: Sun, 28 Aug 2022 14:41:33 +0800 Subject: [PATCH 1/2] set m_read_opts.ignore_range_deletions properly ignore_range_deletions should be set to true when range del is not enabled --- storage/rocksdb/ha_rocksdb.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index a6b718ac16ae..22e88f691248 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -4232,7 +4232,10 @@ class Rdb_transaction { } explicit Rdb_transaction(THD *const thd) - : m_thd(thd), m_tbl_io_perf(nullptr) {} + : m_thd(thd), m_tbl_io_perf(nullptr) { + m_read_opts.ignore_range_deletions = + !rocksdb_enable_delete_range_for_drop_index; + } virtual ~Rdb_transaction() { #ifndef NDEBUG From b0030b352613bf32ac91f3fc89ed47ab3b57ab06 Mon Sep 17 00:00:00 2001 From: leipeng Date: Sun, 28 Aug 2022 20:26:36 +0800 Subject: [PATCH 2/2] set m_read_opts.ignore_range_deletions - fix missing changes --- storage/rocksdb/ha_rocksdb.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 22e88f691248..966f9f541ddb 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -4680,6 +4680,8 @@ class Rdb_transaction_impl : public Rdb_transaction { m_rocksdb_reuse_tx[table_type] = nullptr; m_read_opts = rocksdb::ReadOptions(); + m_read_opts.ignore_range_deletions = + !rocksdb_enable_delete_range_for_drop_index; set_initial_savepoint(); @@ -4803,6 +4805,8 @@ class Rdb_writebatch_impl : public Rdb_transaction { void reset() { m_batch->Clear(); m_read_opts = rocksdb::ReadOptions(); + m_read_opts.ignore_range_deletions = + !rocksdb_enable_delete_range_for_drop_index; m_ddl_transaction = false; }