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

fix virtual sql plan bug

Browse Source
This commit is contained in:
zzg19950727
2023-04-20 11:45:25 +00:00
committed by ob-robot
parent 0e0ebed267
commit d69d4e3231
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/observer/mysql/ob_query_retry_ctrl.cpp
View File

@ -314,6 +314,7 @@ public:
int64_t global_sys_version_start = v.curr_query_sys_global_schema_version_;
// (c1) 需要考虑远端机器的Schema比本地落后，远端机器抛出Schema错误的情景
// 当远端抛出Schema错误的时候，强行将所有Schema错误转化成OB_ERR_WAIT_REMOTE_SCHEMA_REFRESH
// 权限不足也会触发该重试规则，因为远端schema刷新不及时可能误报权限不足，此时是需要重试的
// (c4) 弱一致性读场景，会校验schema版本是否大于等于数据的schema版本，
// 如果schema版本旧，则要求重试；
// 目的是保证：始终采用新schema解析老数据

21
src/observer/virtual_table/ob_all_virtual_sql_plan.cpp
View File

@ -424,10 +424,7 @@ int ObAllVirtualSqlPlan::extract_tenant_and_plan_id(const common::ObIArray<commo
} else if (start_key_obj_ptr[KEY_TENANT_ID_IDX].is_min_value() &&
end_key_obj_ptr[KEY_TENANT_ID_IDX].is_max_value()) {
is_always_true = true;
if (!is_sys_tenant(effective_tenant_id_)) {
ret = OB_ERR_NO_PRIVILEGE;
SERVER_LOG(WARN, "only sys tenant can read all tenant plan", K(ret));
} else if (OB_FAIL(dump_all_tenant_plans())) {
if (OB_FAIL(dump_all_tenant_plans())) {
SERVER_LOG(WARN, "failed to dump all tenant plans", K(ret));
}
} else if (start_key_obj_ptr[KEY_TENANT_ID_IDX].is_max_value() &&
@ -449,8 +446,7 @@ int ObAllVirtualSqlPlan::extract_tenant_and_plan_id(const common::ObIArray<commo
int64_t tenant_id = start_key_obj_ptr[KEY_TENANT_ID_IDX].get_int();
if (tenant_id != effective_tenant_id_ &&
!is_sys_tenant(effective_tenant_id_)) {
ret = OB_ERR_NO_PRIVILEGE;
SERVER_LOG(WARN, "only sys tenant can read other tenant plan", K(ret));
//do nothing
} else if (start_key_obj_ptr[KEY_PLAN_ID_IDX].is_min_value() &&
end_key_obj_ptr[KEY_PLAN_ID_IDX].is_max_value()) {
if (OB_FAIL(dump_tenant_plans(tenant_id))) {
@ -491,10 +487,15 @@ int ObAllVirtualSqlPlan::dump_all_tenant_plans()
{
int ret = OB_SUCCESS;
// get all tenant ids
omt::TenantIdList id_list(16, NULL, ObNewModIds::OB_COMMON_ARRAY);
GCTX.omt_->get_tenant_ids(id_list);
for (int64_t i = 0; OB_SUCC(ret) && i < id_list.size(); i++) {
if (OB_FAIL(dump_tenant_plans(id_list.at(i)))) {
ObSEArray<uint64_t, 4> all_tenant_ids;
if (OB_FAIL(GCTX.omt_->get_mtl_tenant_ids(all_tenant_ids))) {
SERVER_LOG(WARN, "failed to get all tenant ids", K(ret));
}
for (int64_t i = 0; OB_SUCC(ret) && i < all_tenant_ids.count(); i++) {
if (all_tenant_ids.at(i) != effective_tenant_id_ &&
!is_sys_tenant(effective_tenant_id_)) {
//do nothing
} else if (OB_FAIL(dump_tenant_plans(all_tenant_ids.at(i)))) {
SERVER_LOG(WARN, "failed to dump tenant` plan", K(ret), K(i));
}
}