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

[FEAT MERGE] New upgrade framework for 4.x

Browse Source
This commit is contained in:
tino247
2022-12-29 11:40:25 +00:00
committed by ob-robot
parent b39b8c45f0
commit a6098ccbc6
106 changed files with 6140 additions and 3227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/observer/virtual_table/ob_agent_virtual_table.cpp
View File

@ -146,23 +146,20 @@ int ObAgentVirtualTable::init(
int ObAgentVirtualTable::do_open()
{
int ret = OB_SUCCESS;
ObSqlString sql;
if (OB_FAIL(ObAgentTableBase::do_open())) {
LOG_WARN("base agent table open failed", K(ret));
LOG_WARN("base agent table open failed", KR(ret));
} else if (OB_FAIL(construct_sql(base_tenant_id_, sql))) {
LOG_WARN("construct sql failed", KR(ret), K(base_tenant_id_));
} else if (OB_FAIL(GCTX.sql_proxy_->read(*sql_res_, base_tenant_id_, sql.ptr()))) {
LOG_WARN("execute sql failed", KR(ret), K(base_tenant_id_), K(sql));
} else if (OB_ISNULL(sql_res_->get_result())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("NULL sql executing result", KR(ret), K(base_tenant_id_), K(sql));
} else {
ObSqlString sql;
if (OB_FAIL(ret)) {
} else if (OB_FAIL(construct_sql(sql))) {
LOG_WARN("construct sql failed", K(ret));
} else if (OB_FAIL(GCTX.sql_proxy_->read(*sql_res_, base_tenant_id_, sql.ptr()))) {
LOG_WARN("execute sql failed", K(ret), K(base_tenant_id_), K(sql));
} else if (OB_ISNULL(sql_res_->get_result())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("NULL sql executing result", K(ret));
} else {
inner_sql_res_ = static_cast<ObInnerSQLResult *>(sql_res_->get_result());
if (general_tenant_id_ != OB_INVALID_TENANT_ID) {
inner_sql_res_->result_set().get_session().switch_tenant(general_tenant_id_);
}
inner_sql_res_ = static_cast<ObInnerSQLResult *>(sql_res_->get_result());
if (general_tenant_id_ != OB_INVALID_TENANT_ID) {
inner_sql_res_->result_set().get_session().switch_tenant(general_tenant_id_);
}
}