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

Fix insert use incorrect plan bug

Browse Source
This commit is contained in:
2149
2023-08-04 03:18:27 +00:00
committed by ob-robot
parent 1bd325cc15
commit 82e3f02450
8 changed files with 62 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/plan_cache/ob_plan_set.cpp
View File

@ -235,7 +235,7 @@ int ObPlanSet::match_param_info(const ObParamInfo &param_info,
// insert into t values (:0)
// two sql have the same key `insert into t values (?)`
// but they have complete different plans
if (param_info.flag_.need_to_check_type_
if ((param_info.flag_.need_to_check_type_ || need_match_all_params_)
|| (is_sql_planset && lib::is_oracle_mode() &&
(param_info.type_ == ObTinyIntType || param.get_type() == ObTinyIntType))) {
if (lib::is_oracle_mode() &&
@ -497,7 +497,8 @@ int ObPlanSet::match_params_info(const Ob2DArray<ObParamInfo,
} else {
int64_t N = infos.count();
for (int64_t i = 0; is_same && i < N; ++i) {
if (true == is_same && params_info_.at(i).flag_.need_to_check_type_) {
if (true == is_same
&& (params_info_.at(i).flag_.need_to_check_type_ || need_match_all_params_)) {
if (infos.at(i).type_ != params_info_.at(i).type_
|| infos.at(i).scale_ != params_info_.at(i).scale_
|| infos.at(i).col_type_ != params_info_.at(i).col_type_
@ -658,6 +659,7 @@ int ObPlanSet::init_new_set(const ObPlanCacheCtx &pc_ctx,
SQL_PC_LOG(WARN, "fail to push back param info", K(ret));
}
}
need_match_all_params_ = sql_ctx.need_match_all_params_;
// add user session vars if necessary
CK( OB_NOT_NULL(sql_ctx.session_info_) );

3
src/sql/plan_cache/ob_plan_set.h
View File

@ -115,6 +115,7 @@ public:
all_plan_const_param_constraints_(alloc_),
all_pre_calc_constraints_(),
all_priv_constraints_(),
need_match_all_params_(false),
multi_stmt_rowkey_pos_(alloc_),
pre_cal_expr_handler_(NULL),
res_map_rule_id_(common::OB_INVALID_ID),
@ -234,6 +235,8 @@ protected:
EqualParamConstraint all_equal_param_constraints_;
PreCalcExprConstraint all_pre_calc_constraints_;
PrivConstraint all_priv_constraints_;
//if true, check the datatypes of all params
bool need_match_all_params_;
// maintain the rowkey position for multi_stmt
common::ObFixedArray<int64_t, common::ObIAllocator> multi_stmt_rowkey_pos_;
// pre calculable expression list handler.