Skip to content

fix(seekdb): Remove #ifdef __ANDROID__ guard around skip_level3_ccl #899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ep-12221 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(seekdb): Remove #ifdef __ANDROID__ guard around skip_level3_ccl #899

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions src/sql/ob_sql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3027,8 +3027,7 @@ int ObSql::generate_physical_plan(ParseResult &parse_result,
} else if (basic_stmt->is_dml_stmt()
|| basic_stmt->is_explain_stmt()
|| basic_stmt->is_help_stmt()) {
#ifdef __ANDROID__
// On Android: if the outline's max_concurrent is stricter than all DATABASE_AND_TABLE CCL
// If the outline's max_concurrent is stricter than all DATABASE_AND_TABLE CCL
// rules, skip level-3 CCL check (outline is the binding constraint).
bool skip_level3_ccl = false;
if (OB_NOT_NULL(pc_ctx) && basic_stmt->is_dml_stmt() && OB_NOT_NULL(sql_ctx.schema_guard_)) {
Expand Down Expand Up @@ -3072,12 +3071,9 @@ int ObSql::generate_physical_plan(ParseResult &parse_result,
skip_level3_ccl = all_above;
}
}
#endif
//ccl check level-3: after resolve sql
if (OB_NOT_NULL(pc_ctx)
#ifdef __ANDROID__
&& !skip_level3_ccl
#endif
&& OB_FAIL(ObSQLUtils::match_ccl_rule(
pc_ctx->allocator_, result.get_session(), sql_ctx, ObString(parse_result.input_sql_len_, parse_result.input_sql_),
mode == PC_PS_MODE, pc_ctx->fp_result_.parameterized_params_, pc_ctx->sql_ctx_.format_sql_id_, CclRuleContainsInfo::DATABASE_AND_TABLE, &parse_result, basic_stmt))) {
Expand Down Expand Up @@ -3982,7 +3978,6 @@ int ObSql::pc_get_plan(ObPlanCacheCtx &pc_ctx,
}

if (OB_SUCC(ret) && (PC_TEXT_MODE == pc_ctx.mode_ || PC_PS_MODE == pc_ctx.mode_)) {
#ifdef __ANDROID__
bool skip_level3_ccl = false;
share::schema::ObSchemaGetterGuard *sg = pc_ctx.sql_ctx_.schema_guard_;
if (OB_NOT_NULL(sg)) {
Expand Down Expand Up @@ -4032,9 +4027,8 @@ int ObSql::pc_get_plan(ObPlanCacheCtx &pc_ctx,
skip_level3_ccl = all_above;
}
}
if (!skip_level3_ccl)
#endif
if (OB_FAIL(ObSQLUtils::match_ccl_rule(&pc_ctx, *session, PC_PS_MODE == pc_ctx.mode_,
if (!skip_level3_ccl
&& OB_FAIL(ObSQLUtils::match_ccl_rule(&pc_ctx, *session, PC_PS_MODE == pc_ctx.mode_,
plan->get_dependency_table()))) {
LOG_WARN("fail to match ccl rule in plan cache", K(ret), K(pc_ctx.mode_),
K(pc_ctx.raw_sql_));
Expand Down
Loading