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

revert tenant config opt for sql module

Browse Source
This commit is contained in:
obdev
2023-03-08 04:14:03 +00:00
committed by ob-robot
parent e2ffa5a173
commit ebefd2bd67
10 changed files with 35 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,8 +241,12 @@ int ObUDRUtils::match_udr_and_refill_ctx(const ObString &pattern,
int ret = OB_SUCCESS;
is_match_udr = false;
ObSQLSessionInfo &session = result.get_session();
if (session.enable_user_defined_rewrite_rules()
&& !(pc_ctx.is_inner_sql() || PC_PL_MODE == pc_ctx.mode_)) {
omt::ObTenantConfigGuard tenant_config(TENANT_CONF(session.get_effective_tenant_id()));
if (!tenant_config.is_valid()) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("tenant config is invalid", K(ret));
} else if (tenant_config->enable_user_defined_rewrite_rules
&& !(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))) {