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

fix parameterize dml sql bug in statement_digest

Browse Source
This commit is contained in:
Larry955
2023-01-28 16:04:30 +08:00
committed by ob-robot
parent 2d19a9d8f5
commit 1cdf1dff1c
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/sql/engine/expr/ob_expr_statement_digest.cpp
View File

@ -19,6 +19,7 @@
#include "sql/session/ob_sql_session_info.h" #include "sql/session/ob_sql_session_info.h"
#include "sql/engine/expr/ob_datum_cast.h" #include "sql/engine/expr/ob_datum_cast.h"
#include "share/ob_encryption_util.h" #include "share/ob_encryption_util.h"
#include "sql/resolver/ob_resolver_utils.h"
using namespace oceanbase::common; using namespace oceanbase::common;
using namespace oceanbase::share; using namespace oceanbase::share;
@ -49,17 +50,24 @@ int calc_digest_text(ObIAllocator &allocator,
ObParser parser(allocator, session->get_sql_mode(), cs_type); ObParser parser(allocator, session->get_sql_mode(), cs_type);
ParseResult parse_result; ParseResult parse_result;
ParamStore tmp_params((ObWrapperAllocator(allocator))); ParamStore tmp_params((ObWrapperAllocator(allocator)));
stmt::StmtType stmt_type = stmt::T_NONE;
if (OB_FAIL(parser.parse(sql_str, parse_result))) { if (OB_FAIL(parser.parse(sql_str, parse_result))) {
LOG_WARN("fail to parse sql str", K(sql_str), K(ret)); LOG_WARN("fail to parse sql str", K(sql_str), K(ret));
} else if (OB_FAIL(ObSqlParameterization::parameterize_syntax_tree(allocator, } else if (OB_FAIL(ObResolverUtils::resolve_stmt_type(parse_result, stmt_type))) {
true, LOG_WARN("failed to resolve stmt type", K(ret));
pc_ctx, } else if (ObStmt::is_dml_stmt(stmt_type) && !ObStmt::is_show_stmt(stmt_type)) {
parse_result.result_tree_, if (OB_FAIL(ObSqlParameterization::parameterize_syntax_tree(allocator,
tmp_params, true,
cs_type))) { pc_ctx,
LOG_WARN("fail to parameterize syntax tree", K(sql_str), K(ret)); parse_result.result_tree_,
tmp_params,
cs_type))) {
LOG_WARN("fail to parameterize syntax tree", K(sql_str), K(ret));
} else {
digest_str = pc_ctx.sql_ctx_.spm_ctx_.bl_key_.constructed_sql_;
}
} else { } else {
digest_str = pc_ctx.sql_ctx_.spm_ctx_.bl_key_.constructed_sql_; digest_str = sql_str;
} }
} }
return ret; return ret;