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

[bugfix]: avoid ret_code over-written.

Browse Source
This commit is contained in:
Monk-Liu 2024-02-19 07:15:29 +00:00 committed by ob-robot
parent 18c5bdb8f2
commit d35d341522
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/resolver/ddl/ob_create_table_resolver.cpp
View File

@ -2814,11 +2814,10 @@ int ObCreateTableResolver::resolve_table_charset_info(const ParseNode *node) {
ObString database_name;
uint64_t database_id = OB_INVALID_ID;
const ObDatabaseSchema *database_schema = NULL;
int tmp_ret = 0;
if (OB_SUCCESS != (tmp_ret = schema_checker_->get_database_id(tenant_id, database_name_, database_id))) {
SQL_RESV_LOG(WARN, "fail to get database_id.", K(tmp_ret), K(database_name_), K(tenant_id));
} else if (OB_SUCCESS != (tmp_ret = schema_checker_->get_database_schema(tenant_id, database_id, database_schema))) {
LOG_WARN("failed to get db schema", K(tmp_ret), K(database_id));
if (OB_FAIL(schema_checker_->get_database_id(tenant_id, database_name_, database_id))) {
SQL_RESV_LOG(WARN, "fail to get database_id.", K(ret), K(database_name_), K(tenant_id));
} else if (OB_FAIL(schema_checker_->get_database_schema(tenant_id, database_id, database_schema))) {
LOG_WARN("failed to get db schema", K(ret), K(database_id));
} else if (OB_ISNULL(database_schema)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error. db schema is null", K(ret), K(database_schema));

9
src/sql/resolver/ddl/ob_ddl_resolver.cpp
View File

@ -761,11 +761,10 @@ int ObDDLResolver::resolve_table_options(ParseNode *node, bool is_index_option)
ObString database_name;
uint64_t database_id = OB_INVALID_ID;
const ObDatabaseSchema *database_schema = NULL;
int tmp_ret = 0;
if (OB_SUCCESS != (tmp_ret = schema_checker_->get_database_id(tenant_id, database_name_, database_id))) {
SQL_RESV_LOG(WARN, "fail to get database_id.", K(tmp_ret), K(database_name_), K(tenant_id));
} else if (OB_SUCCESS != (tmp_ret = schema_checker_->get_database_schema(tenant_id, database_id, database_schema))) {
LOG_WARN("failed to get db schema", K(tmp_ret), K(database_id));
if (OB_FAIL(schema_checker_->get_database_id(tenant_id, database_name_, database_id))) {
SQL_RESV_LOG(WARN, "fail to get database_id.", K(ret), K(database_name_), K(tenant_id));
} else if (OB_FAIL(schema_checker_->get_database_schema(tenant_id, database_id, database_schema))) {
LOG_WARN("failed to get db schema", K(ret), K(database_id));
} else if (OB_ISNULL(database_schema)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error. db schema is null", K(ret), K(database_schema));