From 472747cb4acc7f5a4d30cc872880fc68ab22e8aa Mon Sep 17 00:00:00 2001 From: leipeng Date: Sat, 5 Oct 2024 11:53:39 +0800 Subject: [PATCH 1/2] Fix doubled UnregisterCompaction() call --- db/db_impl/db_impl_compaction_flush.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/db/db_impl/db_impl_compaction_flush.cc b/db/db_impl/db_impl_compaction_flush.cc index 1db619f86f6..04672191d34 100644 --- a/db/db_impl/db_impl_compaction_flush.cc +++ b/db/db_impl/db_impl_compaction_flush.cc @@ -1907,9 +1907,6 @@ Status DBImpl::ReFitLevel(ColumnFamilyData* cfd, int level, int target_level) { cfd->compaction_picker()->UnregisterCompaction(c.get()); c.reset(); - cfd->compaction_picker()->UnregisterCompaction(c.get()); - c.reset(); - InstallSuperVersionAndScheduleWork(cfd, &sv_context, mutable_cf_options); ROCKS_LOG_DEBUG(immutable_db_options_.info_log, "[%s] LogAndApply: %s\n", From 7a8a0cb5f57cbebf19e3cfe2c3f0d8fd473c91c3 Mon Sep 17 00:00:00 2001 From: leipeng Date: Sat, 5 Oct 2024 12:22:33 +0800 Subject: [PATCH 2/2] other 2 merge issues --- tools/dump/db_dump_tool.cc | 2 -- .../compaction_filters/remove_emptyvalue_compactionfilter.cc | 2 -- 2 files changed, 4 deletions(-) diff --git a/tools/dump/db_dump_tool.cc b/tools/dump/db_dump_tool.cc index 901efc8f888..e234c9a733d 100644 --- a/tools/dump/db_dump_tool.cc +++ b/tools/dump/db_dump_tool.cc @@ -4,8 +4,6 @@ // (found in the LICENSE.Apache file in the root directory). -#include "rocksdb/db_dump_tool.h" - #include "rocksdb/db_dump_tool.h" #include diff --git a/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc b/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc index 0a0c585f889..c61ce022042 100644 --- a/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc +++ b/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc @@ -4,8 +4,6 @@ // (found in the LICENSE.Apache file in the root directory). -#include "utilities/compaction_filters/remove_emptyvalue_compactionfilter.h" - #include "utilities/compaction_filters/remove_emptyvalue_compactionfilter.h" #include