4

Yukang-Lian · Dec 5, 2024 · 36efba9 · 36efba9
1 parent 9252dbd
commit 36efba9
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 63 deletions.
diff --git a/be/src/olap/cumulative_compaction_policy.cpp b/be/src/olap/cumulative_compaction_policy.cpp
@@ -286,9 +286,6 @@ int SizeBasedCumulativeCompactionPolicy::pick_input_rowsets(
     }
     DBUG_EXECUTE_IF("SizeBaseCumulativeCompactionPolicy.pick_input_rowsets.return_input_rowsets",
                     { return transient_size; })
-    DBUG_EXECUTE_IF(
-            "SizeBaseCumulativeCompactionPolicy.pick_input_rowsets.set_promotion_size_to_max",
-            { promotion_size = INT64_MAX; })
 
     if (total_size >= promotion_size) {
         return transient_size;

diff --git a/be/src/olap/tablet_manager.cpp b/be/src/olap/tablet_manager.cpp
@@ -24,7 +24,6 @@
 #include <gen_cpp/MasterService_types.h>
 #include <gen_cpp/Types_types.h>
 #include <gen_cpp/olap_file.pb.h>
-#include <glog/logging.h>
 #include <re2/re2.h>
 #include <unistd.h>
 
@@ -776,8 +775,6 @@ std::vector<TabletSharedPtr> TabletManager::find_best_tablets_to_compaction(
             last_failure_ms = tablet_ptr->last_base_compaction_failure_time();
         }
         if (now_ms - last_failure_ms <= 5000) {
-            DBUG_EXECUTE_IF("TabletManager::find_best_tablets_to_compaction.dcheck",
-                            { DCHECK(false) << "Too often to check compaction"; })
             VLOG_DEBUG << "Too often to check compaction, skip it. "
                        << "compaction_type=" << compaction_type_str
                        << ", last_failure_time_ms=" << last_failure_ms

diff --git a/regression-test/data/compaction/test_cumu_compaction_with_delete.out b/regression-test/data/compaction/test_cumu_compaction_with_delete.out
diff --git a/regression-test/suites/compaction/test_cumu_compaction_with_delete.groovy b/regression-test/suites/compaction/test_cumu_compaction_with_delete.groovy