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

Fix some plan cache bug

Browse Source
This commit is contained in:
obdev
2023-07-25 06:42:57 +00:00
committed by ob-robot
parent 79e6e3852c
commit 0065e91dda
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/engine/expr/ob_expr_subquery_ref.h
View File

@ -68,7 +68,7 @@ public:
public:
ExtraInfo(common::ObIAllocator &alloc, ObExprOperatorType type)
: ObIExprExtraInfo(alloc, type),
is_cursor_(false), row_desc_(alloc) {}
is_cursor_(false), scalar_result_type_(alloc), row_desc_(alloc) {}
virtual ~ExtraInfo() { row_desc_.destroy(); }
void reset();
int assign(const ExtraInfo &other);

4
src/sql/ob_sql.cpp
View File

@ -1063,7 +1063,7 @@ int ObSql::do_real_prepare(const ObString &sql,
&& !(ObStmt::is_dml_write_stmt(stmt_type) && // returning into from oci not supported
static_cast<ObDelUpdStmt*>(basic_stmt)->get_returning_into_exprs().count() > 0)
&& enable_udr
&& OB_FAIL(ObUDRUtils::match_udr_item(sql, session, allocator, item_guard))) {
&& OB_FAIL(ObUDRUtils::match_udr_item(sql, session, ectx, allocator, item_guard))) {
if (!ObSQLUtils::check_need_disconnect_parser_err(ret)) {
ectx.set_need_disconnect(false);
}
@ -1083,7 +1083,7 @@ int ObSql::do_real_prepare(const ObString &sql,
param_store,
session.get_local_collation_connection()))) {
LOG_WARN("parameterize syntax tree failed", K(ret));
if (OB_INVALID_ARGUMENT == ret) {
if (OB_INVALID_ARGUMENT == ret || OB_NOT_SUPPORTED == ret) {
pc_ctx.ps_need_parameterized_ = false;
ret = OB_SUCCESS;
}

10
src/sql/udr/ob_udr_utils.cpp
View File

@ -21,6 +21,7 @@ namespace sql
int ObUDRUtils::match_udr_item(const ObString &pattern,
const ObSQLSessionInfo &session_info,
ObExecContext &ectx,
ObIAllocator &allocator,
ObUDRItemMgr::UDRItemRefGuard &guard,
PatternConstConsList *cst_cons_list)
@ -50,6 +51,9 @@ int ObUDRUtils::match_udr_item(const ObString &pattern,
LOG_TRACE("succ to match rewrite rule item", KPC(guard.get_ref_obj()));
}
}
if (OB_FAIL(ret) && !ObSQLUtils::check_need_disconnect_parser_err(ret)) {
ectx.set_need_disconnect(false);
}
return ret;
}
@ -251,7 +255,7 @@ int ObUDRUtils::match_udr_and_refill_ctx(const ObString &pattern,
if (enable_udr && !(pc_ctx.is_inner_sql() || PC_PL_MODE == pc_ctx.mode_)) {
ObIAllocator &allocator = result.get_mem_pool();
PatternConstConsList cst_cons_list;
if (OB_FAIL(match_udr_item(pattern, session, allocator, item_guard, &cst_cons_list))) {
if (OB_FAIL(match_udr_item(pattern, session, ectx, allocator, item_guard, &cst_cons_list))) {
LOG_WARN("failed to match user defined rewrite rule", K(ret));
} else if (!cst_cons_list.empty()
&& OB_FAIL(cons_udr_const_cons_list(cst_cons_list, pc_ctx))) {
@ -268,10 +272,6 @@ int ObUDRUtils::match_udr_and_refill_ctx(const ObString &pattern,
is_match_udr = true;
LOG_TRACE("succ to match user-defined rule", K(ret));
}
if (OB_SUCCESS != ret
&& !ObSQLUtils::check_need_disconnect_parser_err(ret)) {
ectx.set_need_disconnect(false);
}
}
return ret;
}

1
src/sql/udr/ob_udr_utils.h
View File

@ -29,6 +29,7 @@ public:
ObUDRItemMgr::UDRItemRefGuard &item_guard);
static int match_udr_item(const ObString &pattern,
const ObSQLSessionInfo &session_info,
ObExecContext &ectx,
ObIAllocator &allocator,
ObUDRItemMgr::UDRItemRefGuard &guard,
PatternConstConsList *cst_cons_list = nullptr);