From 3e8454c9185e5c729f95b055d2f78deb1df25a34 Mon Sep 17 00:00:00 2001 From: Tsunaou <895254752@qq.com> Date: Mon, 8 Apr 2024 12:38:07 +0000 Subject: [PATCH] fix mysqltest row_col_switch_rowkey && fix obtest test_co_merge_with_cg_merge_error && fix history minor bug --- src/storage/compaction/ob_partition_merge_policy.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/storage/compaction/ob_partition_merge_policy.cpp b/src/storage/compaction/ob_partition_merge_policy.cpp index 61dbec0dbf..c59ad3f6cd 100644 --- a/src/storage/compaction/ob_partition_merge_policy.cpp +++ b/src/storage/compaction/ob_partition_merge_policy.cpp @@ -1249,8 +1249,9 @@ int ObPartitionMergePolicy::generate_parallel_minor_interval( ObSEArray input_result_array; int64_t fixed_input_table_cnt = 0; - if (!compaction::is_minor_merge(merge_type)) { - ret = OB_NO_NEED_MERGE; + if (!compaction::is_minor_merge_type(merge_type)) { + ret = OB_INVALID_ARGUMENT; + LOG_WARN("invalid merge type", K(ret), "merge_type", merge_type_to_str(merge_type)); } else if (input_result.handle_.get_count() < minor_compact_trigger) { ret = OB_NO_NEED_MERGE; } else if (OB_FAIL(generate_input_result_array(input_result, minor_range_mgr, fixed_input_table_cnt, input_result_array))) {