fix mysqltest row_col_switch_rowkey && fix obtest test_co_merge_with_cg_merge_error && fix history minor bug

This commit is contained in:
Tsunaou
2024-04-08 12:38:07 +00:00
committed by ob-robot
parent 4718c98e28
commit 3e8454c918

View File

@ -1249,8 +1249,9 @@ int ObPartitionMergePolicy::generate_parallel_minor_interval(
ObSEArray<ObGetMergeTablesResult, 2> 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))) {