hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix 4103

Browse Source
This commit is contained in:
obdev
2024-02-09 22:39:03 +00:00
committed by ob-robot
parent fa3f89363b
commit 6277384ade
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/storage/blocksstable/ob_macro_block_writer.cpp
View File

@ -512,7 +512,6 @@ int ObMacroBlockWriter::open(
} else if (OB_FAIL(init_pre_agg_util(data_store_desc))) { } else if (OB_FAIL(init_pre_agg_util(data_store_desc))) {
STORAGE_LOG(WARN, "Failed to init pre aggregate utilities", K(ret)); STORAGE_LOG(WARN, "Failed to init pre aggregate utilities", K(ret));
} else { } else {
//TODO use 4.1.0.0 for version judgment
const bool is_use_adaptive = !data_store_desc_->is_major_merge_type() 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; || 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))) { if (OB_FAIL(micro_block_adaptive_splitter_.init(data_store_desc.get_macro_store_size(), 0/*min_micro_row_count*/, is_use_adaptive))) {

5
src/storage/column_store/ob_co_merge_ctx.cpp
View File

@ -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)); LOG_WARN("find no base co table", K(ret), KPC(this));
} else if (OB_FAIL(base_co_table->get_meta(meta_handle))) { } 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)); 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(), } else if (base_co_table->is_all_cg_base() && compaction::is_major_merge_type(static_param_.get_merge_type())
meta_handle.get_sstable_meta().get_col_checksum_cnt(), cg_schemas))) { && 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)); LOG_ERROR("failed to validate column checksums", K(ret), KPC(base_co_table));
if (OB_CHECKSUM_ERROR == ret) { if (OB_CHECKSUM_ERROR == ret) {
(void) get_ls()->get_tablet_svr()->update_tablet_report_status(tablet_id, true/*found_cksum_error*/); (void) get_ls()->get_tablet_svr()->update_tablet_report_status(tablet_id, true/*found_cksum_error*/);