Merge branch 'column_store'

Co-authored-by: wangt1xiuyi <13547954130@163.com>
Co-authored-by: yangqise7en <877793735@qq.com>
Co-authored-by: Zach41 <zach_41@163.com>
This commit is contained in:
chaser-ch
2023-10-31 15:39:20 +00:00
committed by ob-robot
parent 4057fbc4ae
commit 566e920620
1375 changed files with 239147 additions and 56014 deletions

View File

@ -56,7 +56,8 @@ OB_SERIALIZE_MEMBER(ObDASScanCtDef,
external_file_access_info_,
external_files_,
external_file_format_str_,
trans_info_expr_);
trans_info_expr_,
group_by_column_ids_);
OB_DEF_SERIALIZE(ObDASScanRtDef)
{
@ -248,7 +249,7 @@ int ObDASScanOp::init_scan_param()
scan_param_.tenant_schema_version_ = scan_rtdef_->tenant_schema_version_;
scan_param_.limit_param_ = scan_rtdef_->limit_param_;
scan_param_.need_scn_ = scan_rtdef_->need_scn_;
scan_param_.pd_storage_flag_ = scan_ctdef_->pd_expr_spec_.pd_storage_flag_;
scan_param_.pd_storage_flag_ = scan_ctdef_->pd_expr_spec_.pd_storage_flag_.pd_flag_;
scan_param_.fb_snapshot_ = scan_rtdef_->fb_snapshot_;
scan_param_.fb_read_tx_uncommitted_ = scan_rtdef_->fb_read_tx_uncommitted_;
if (scan_rtdef_->is_for_foreign_check_) {
@ -477,6 +478,11 @@ void ObDASScanOp::reset_access_datums_ptr()
ObEvalInfo &info = (*e)->get_eval_info(*scan_rtdef_->eval_ctx_);
info.point_to_frame_ = true;
}
FOREACH_CNT(e, scan_ctdef_->pd_expr_spec_.pd_storage_aggregate_output_) {
(*e)->locate_datums_for_update(*scan_rtdef_->eval_ctx_, scan_rtdef_->eval_ctx_->max_batch_size_);
ObEvalInfo &info = (*e)->get_eval_info(*scan_rtdef_->eval_ctx_);
info.point_to_frame_ = true;
}
if (OB_NOT_NULL(scan_ctdef_->trans_info_expr_)) {
ObExpr *trans_expr = scan_ctdef_->trans_info_expr_;
trans_expr->locate_datums_for_update(*scan_rtdef_->eval_ctx_, scan_rtdef_->eval_ctx_->max_batch_size_);
@ -1246,7 +1252,7 @@ OB_INLINE int ObLocalIndexLookupOp::init_scan_param()
scan_param_.tenant_schema_version_ = lookup_rtdef_->tenant_schema_version_;
scan_param_.limit_param_ = lookup_rtdef_->limit_param_;
scan_param_.need_scn_ = lookup_rtdef_->need_scn_;
scan_param_.pd_storage_flag_ = lookup_ctdef_->pd_expr_spec_.pd_storage_flag_;
scan_param_.pd_storage_flag_ = lookup_ctdef_->pd_expr_spec_.pd_storage_flag_.pd_flag_;
scan_param_.fb_snapshot_ = lookup_rtdef_->fb_snapshot_;
scan_param_.fb_read_tx_uncommitted_ = lookup_rtdef_->fb_read_tx_uncommitted_;
scan_param_.ls_id_ = ls_id_;