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

Fix remote execution error 4016

Browse Source
This commit is contained in:
obdev
2022-12-06 07:40:12 +00:00
committed by ob-robot
parent 196359d85f
commit e01e420726
7 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/ob_sql.cpp
View File

@ -1685,6 +1685,7 @@ int ObSql::handle_remote_query(const ObRemoteSqlInfo &remote_sql_info,
pc_ctx->fp_result_.pc_key_.key_id_ = 0;
pc_ctx->fp_result_.pc_key_.name_ = trimed_stmt;
pc_ctx->normal_parse_const_cnt_ = remote_sql_info.ps_params_->count();
pc_ctx->is_original_ps_mode_ = remote_sql_info.is_original_ps_mode_;
pc_ctx->set_is_ps_execute_stage();
if (OB_FAIL(construct_param_store(*remote_sql_info.ps_params_, param_store))) {
LOG_WARN("construct param store failed", K(ret));
@ -2044,7 +2045,13 @@ int ObSql::generate_stmt(ParseResult &parse_result,
resolver_ctx.is_ddl_from_primary_ = context.is_ddl_from_primary_;
resolver_ctx.is_cursor_ = context.is_cursor_;
resolver_ctx.is_batch_stmt_ = context.multi_stmt_item_.is_batched_multi_stmt();
resolver_ctx.is_by_ordinal_ = parse_result.question_mark_ctx_.by_ordinal_;
if (NULL != pc_ctx && pc_ctx->is_remote_executor_) {
resolver_ctx.need_check_col_dup_
= !(context.is_prepare_protocol_ && parse_result.question_mark_ctx_.by_ordinal_ && pc_ctx->is_original_ps_mode_);
} else {
resolver_ctx.need_check_col_dup_
= !(context.is_prepare_protocol_ && parse_result.question_mark_ctx_.by_ordinal_);
}
resolver_ctx.external_param_info_.by_name_
= parse_result.question_mark_ctx_.by_name_ || NULL != context.secondary_namespace_; //static sql in PL must be by name
resolver_ctx.outline_parse_result_ = outline_parse_result;
@ -3577,6 +3584,7 @@ int ObSql::after_get_plan(ObPlanCacheCtx &pc_ctx,
param_store.pop_back();
}
pctx->get_remote_sql_info().use_ps_ = true;
pctx->get_remote_sql_info().is_original_ps_mode_ = true;
//从ps sql info中取出要执行的sql
pctx->get_remote_sql_info().remote_sql_ = pc_ctx.sql_ctx_.cur_sql_;
pctx->get_remote_sql_info().ps_params_ = &param_store;