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

[CP][to #37396440] fix dynamic sql question mark count

Browse Source
This commit is contained in:
obdev
2022-11-09 08:10:33 +00:00
committed by wangzelin.wzl
parent 8e02660bcd
commit 4dd45dfcff
8 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/plan_cache/ob_prepare_stmt_struct.cpp
View File

@ -289,7 +289,6 @@ ObPsStmtInfo::ObPsStmtInfo(ObIAllocator *inner_allocator)
is_expired_evicted_(false),
allocator_(inner_allocator),
external_allocator_(inner_allocator),
is_dynamic_sql_(false),
num_of_returning_into_(-1),
no_param_sql_(),
is_sensitive_sql_(false),
@ -319,7 +318,6 @@ ObPsStmtInfo::ObPsStmtInfo(ObIAllocator *inner_allocator,
is_expired_evicted_(false),
allocator_(inner_allocator),
external_allocator_(external_allocator),
is_dynamic_sql_(false),
num_of_returning_into_(-1),
no_param_sql_(),
is_sensitive_sql_(false),
@ -450,7 +448,6 @@ int ObPsStmtInfo::deep_copy(const ObPsStmtInfo &other)
ps_stmt_checksum_ = other.ps_stmt_checksum_;
db_id_ = other.db_id_;
question_mark_count_ = other.question_mark_count_;
is_dynamic_sql_ = other.is_dynamic_sql_;
num_of_returning_into_ = other.num_of_returning_into_;
is_sensitive_sql_ = other.is_sensitive_sql_;
can_direct_use_param_ = other.can_direct_use_param();

4
src/sql/plan_cache/ob_prepare_stmt_struct.h
View File

@ -160,8 +160,7 @@ public:
inline void set_can_direct_use_param(bool v) { can_direct_use_param_ = v; }
inline void set_ps_stmt_checksum(uint64_t ps_checksum) { ps_stmt_checksum_ = ps_checksum; }
inline uint64_t get_ps_stmt_checksum() const { return ps_stmt_checksum_; }
inline void set_is_dynamic_sql(const bool is_dynamic_sql) { is_dynamic_sql_ = is_dynamic_sql; }
inline bool get_is_dynamic_sql() const { return is_dynamic_sql_; }
inline void set_num_of_returning_into(int32_t num_of_returning_into)
{ num_of_returning_into_ = num_of_returning_into; }
inline int32_t get_num_of_returning_into() const { return num_of_returning_into_; }
@ -246,7 +245,6 @@ private:
common::ObIAllocator *allocator_;
//指向ObPsPlancache中的inner_allocator_, 用于释放整个ObPsStmtItem的内存
common::ObIAllocator *external_allocator_;
bool is_dynamic_sql_;
int32_t num_of_returning_into_;
common::ObString no_param_sql_;
bool is_sensitive_sql_;

3
src/sql/plan_cache/ob_ps_cache.cpp
View File

@ -559,9 +559,6 @@ int ObPsCache::fill_ps_stmt_info(const ObResultSet &result,
}
if (OB_SUCC(ret)) {
int64_t info_size = 0;
if (!sql_ctx->is_dbms_sql_) {
ps_stmt_info.set_is_dynamic_sql(sql_ctx->is_dynamic_sql_);
}
if (OB_FAIL(ps_stmt_info.get_convert_size(info_size))) {
LOG_WARN("fail to get convert size", K(ret));
} else {