From fc8b7e2d54a78f6edf25f67b610430b7dc6b1c7c Mon Sep 17 00:00:00 2001 From: haitaoyang Date: Tue, 18 Jun 2024 03:57:43 +0000 Subject: [PATCH] Remove defend codes in group by pushdown --- src/storage/access/ob_pushdown_aggregate.cpp | 4 ++-- src/storage/access/ob_table_access_param.cpp | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/storage/access/ob_pushdown_aggregate.cpp b/src/storage/access/ob_pushdown_aggregate.cpp index cdd324eb32..55d8f485ef 100644 --- a/src/storage/access/ob_pushdown_aggregate.cpp +++ b/src/storage/access/ob_pushdown_aggregate.cpp @@ -3470,8 +3470,8 @@ int ObGroupByCell::init(const ObTableAccessParam ¶m, const ObTableAccessCont group_by_col_offset_ = param.iter_param_.group_by_cols_project_->at(0); for (int64_t i = 0; OB_SUCC(ret) && i < param.output_exprs_->count(); ++i) { if (T_PSEUDO_GROUP_ID == param.output_exprs_->at(i)->type_) { - ret = OB_INVALID_ARGUMENT; - LOG_WARN("Unexpected group idx expr", K(ret)); + LOG_TRACE("Group by pushdown in batch nlj", K(ret)); + continue; } else if (nullptr == param.output_sel_mask_ || param.output_sel_mask_->at(i)) { int32_t col_offset = param.iter_param_.out_cols_project_->at(i); int32_t col_index = param.iter_param_.read_info_->get_columns_index().at(col_offset); diff --git a/src/storage/access/ob_table_access_param.cpp b/src/storage/access/ob_table_access_param.cpp index 5269edd37b..5bf6ffcfca 100644 --- a/src/storage/access/ob_table_access_param.cpp +++ b/src/storage/access/ob_table_access_param.cpp @@ -284,11 +284,7 @@ int ObTableAccessParam::init( iter_param_.set_use_stmt_iter_pool(); } - if (OB_UNLIKELY(iter_param_.enable_pd_group_by() && scan_param.use_index_skip_scan())) { - ret = OB_INVALID_ARGUMENT; - STORAGE_LOG(WARN, "Invalid argument for group by pushdown, vectorize must be enabled and not skip scan", - K(ret), K(iter_param_.vectorized_enabled_), K(scan_param.use_index_skip_scan())); - } else if (!iter_param_.is_use_column_store() + if (!iter_param_.is_use_column_store() && iter_param_.enable_pd_blockscan() && iter_param_.enable_pd_filter() && iter_param_.enable_skip_index()