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

fix some master bugs

Browse Source
This commit is contained in:
wangt1xiuyi
2023-06-08 12:42:29 +00:00
committed by ob-robot
parent 36a2aa60b1
commit 9d3a53603a
16 changed files with 194 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/sql/optimizer/ob_access_path_estimation.cpp
View File

@ -341,9 +341,13 @@ int ObAccessPathEstimation::process_storage_estimation(ObOptimizerContext &ctx,
ret = OB_ERR_UNEXPECTED;
LOG_WARN("task is null", K(ret));
} else if (OB_FAIL(do_storage_estimation(ctx, *tasks.at(i)))) {
LOG_WARN("failed to process storage estimation", K(ret));
need_fallback = true;
ret = OB_SUCCESS;
if (is_retry_ret(ret)) {
//retry code throw error, and retry
} else {
LOG_WARN("failed to process storage estimation", K(ret));
need_fallback = true;
ret = OB_SUCCESS;
}
break;
} else if (!tasks.at(i)->check_result_reliable()) {
need_fallback = true;
@ -1114,8 +1118,12 @@ int ObAccessPathEstimation::storage_estimate_full_table_rowcount(ObOptimizerCont
} else if (OB_FAIL(arg.index_params_.push_back(path_arg))) {
LOG_WARN("failed to add primary key estimation arg", K(ret));
} else if (OB_FAIL(do_storage_estimation(ctx, task))) {
LOG_WARN("failed to do storage estimation", K(ret));
ret = OB_SUCCESS;
if (is_retry_ret(ret)) {
//retry code throw error, and retry
} else {
LOG_WARN("failed to do storage estimation", K(ret));
ret = OB_SUCCESS;
}
} else if (OB_UNLIKELY(res.index_param_res_.count() != 1)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("storage estimation result size is unexpected", K(ret));
@ -1814,5 +1822,15 @@ int ObAccessPathEstimation::update_column_metas_by_ds_col_stat(const int64_t row
return ret;
}
bool ObAccessPathEstimation::is_retry_ret(int ret)
{
return ret == OB_NOT_MASTER ||
ret == OB_RS_NOT_MASTER ||
ret == OB_TENANT_NOT_IN_SERVER ||
ret == OB_NO_READABLE_REPLICA ||
ret == OB_LS_NOT_EXIST ||
ret == OB_TABLET_NOT_EXIST;
}
} // end of sql
} // end of oceanbase