From 4e5ea5398a4beba5916feeb4dc9eeab8bf97177f Mon Sep 17 00:00:00 2001 From: leipeng Date: Mon, 29 Aug 2022 15:39:46 -0700 Subject: [PATCH] set m_read_opts.ignore_range_deletions properly (#1218) Upstream commit ID: https://github.com/facebook/mysql-5.6/commit/238afbb8c08140623a752d2dbd0a5a07a78ad027 PS-8494: Merge percona-202206 (https://jira.percona.com/browse/PS-8494) Summary: ignore_range_deletions should be set to true when range del is not enabled Pull Request resolved: https://github.com/facebook/mysql-5.6/pull/1218 Reviewed By: Pushapgl Differential Revision: D39115879 Pulled By: yoshinorim fbshipit-source-id: 40e7bcb86590c8f9be44dfa3f74277fb3f49a6d5 --- storage/rocksdb/ha_rocksdb.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index d5183b8942cf..70613e5dec91 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -4043,7 +4043,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 DEBUG_OFF @@ -4410,6 +4413,8 @@ class Rdb_transaction_impl : public Rdb_transaction { m_rocksdb_reuse_tx = nullptr; m_read_opts = rocksdb::ReadOptions(); + m_read_opts.ignore_range_deletions = + !rocksdb_enable_delete_range_for_drop_index; set_initial_savepoint(); @@ -4521,6 +4526,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; }