diff --git a/src/storage/blocksstable/ob_macro_block_writer.cpp b/src/storage/blocksstable/ob_macro_block_writer.cpp index 570530f4cf..ffd0623610 100644 --- a/src/storage/blocksstable/ob_macro_block_writer.cpp +++ b/src/storage/blocksstable/ob_macro_block_writer.cpp @@ -512,7 +512,6 @@ int ObMacroBlockWriter::open( } else if (OB_FAIL(init_pre_agg_util(data_store_desc))) { STORAGE_LOG(WARN, "Failed to init pre aggregate utilities", K(ret)); } else { - //TODO use 4.1.0.0 for version judgment const bool is_use_adaptive = !data_store_desc_->is_major_merge_type() || data_store_desc_->get_major_working_cluster_version() >= DATA_VERSION_4_1_0_0; if (OB_FAIL(micro_block_adaptive_splitter_.init(data_store_desc.get_macro_store_size(), 0/*min_micro_row_count*/, is_use_adaptive))) { diff --git a/src/storage/column_store/ob_co_merge_ctx.cpp b/src/storage/column_store/ob_co_merge_ctx.cpp index 1574df63cc..fdf355d352 100644 --- a/src/storage/column_store/ob_co_merge_ctx.cpp +++ b/src/storage/column_store/ob_co_merge_ctx.cpp @@ -495,8 +495,9 @@ int ObCOTabletMergeCtx::inner_add_cg_sstables(const ObSSTable *&new_sstable) LOG_WARN("find no base co table", K(ret), KPC(this)); } else if (OB_FAIL(base_co_table->get_meta(meta_handle))) { LOG_WARN("failed to get sstable meta handle", K(ret), KPC(base_co_table)); - } else if (base_co_table->is_all_cg_base() && OB_FAIL(validate_column_checksums(meta_handle.get_sstable_meta().get_col_checksum(), - meta_handle.get_sstable_meta().get_col_checksum_cnt(), cg_schemas))) { + } else if (base_co_table->is_all_cg_base() && compaction::is_major_merge_type(static_param_.get_merge_type()) + && OB_FAIL(validate_column_checksums(meta_handle.get_sstable_meta().get_col_checksum(), + meta_handle.get_sstable_meta().get_col_checksum_cnt(), cg_schemas))) { LOG_ERROR("failed to validate column checksums", K(ret), KPC(base_co_table)); if (OB_CHECKSUM_ERROR == ret) { (void) get_ls()->get_tablet_svr()->update_tablet_report_status(tablet_id, true/*found_cksum_error*/);