diff --git a/src/storage/blocksstable/index_block/ob_index_block_aggregator.cpp b/src/storage/blocksstable/index_block/ob_index_block_aggregator.cpp index f7a97a440..007fcfdb4 100644 --- a/src/storage/blocksstable/index_block/ob_index_block_aggregator.cpp +++ b/src/storage/blocksstable/index_block/ob_index_block_aggregator.cpp @@ -631,7 +631,7 @@ int ObIndexBlockAggregator::init(const ObDataStoreDesc &store_desc, ObIAllocator ret = OB_INIT_TWICE; LOG_WARN("Already inited", K(ret)); } else { - need_data_aggregate_ = store_desc.get_agg_meta_array().count() != 0 && store_desc.is_major_merge_type(); + need_data_aggregate_ = store_desc.get_agg_meta_array().count() != 0 && store_desc.is_major_or_meta_merge_type(); if (!need_data_aggregate_) { } else if (OB_FAIL(aggregated_row_.init(allocator, store_desc.get_agg_meta_array().count()))) { LOG_WARN("Fail to init aggregated row", K(ret)); diff --git a/src/storage/blocksstable/index_block/ob_index_block_row_struct.cpp b/src/storage/blocksstable/index_block/ob_index_block_row_struct.cpp index 9f4bd1d00..1014c2f02 100644 --- a/src/storage/blocksstable/index_block/ob_index_block_row_struct.cpp +++ b/src/storage/blocksstable/index_block/ob_index_block_row_struct.cpp @@ -262,7 +262,7 @@ int ObIndexBlockRowBuilder::append_header_and_meta(const ObIndexBlockRowDesc &de header_->is_data_block_ = desc.is_data_block_; header_->is_leaf_block_ = desc.is_macro_node_; header_->is_macro_node_ = desc.is_macro_node_; - header_->is_major_node_ = desc.data_store_desc_->is_major_merge_type(); + header_->is_major_node_ = desc.data_store_desc_->is_major_or_meta_merge_type(); header_->has_string_out_row_ = desc.has_string_out_row_; header_->all_lob_in_row_ = !desc.has_lob_out_row_; header_->is_pre_aggregated_ = nullptr != desc.aggregated_row_; diff --git a/src/storage/blocksstable/ob_macro_block_writer.cpp b/src/storage/blocksstable/ob_macro_block_writer.cpp index f2662fe92..5a6923f19 100644 --- a/src/storage/blocksstable/ob_macro_block_writer.cpp +++ b/src/storage/blocksstable/ob_macro_block_writer.cpp @@ -1817,7 +1817,7 @@ int ObMacroBlockWriter::init_pre_agg_util(const ObDataStoreDesc &data_store_desc int ret = OB_SUCCESS; const ObIArray &full_agg_metas = data_store_desc.get_agg_meta_array(); const bool need_pre_aggregation = - data_store_desc.is_major_merge_type() + data_store_desc.is_major_or_meta_merge_type() && nullptr != data_store_desc.sstable_index_builder_ && full_agg_metas.count() > 0; if (!need_pre_aggregation) {