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

bugfix: comment on resolve sys view & synonym

Browse Source
This commit is contained in:
dontknow9179
2024-03-28 07:56:04 +00:00
committed by ob-robot
parent c13ff2080e
commit 8d6cbb1c1b
2 changed files with 70 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/sql/resolver/ddl/ob_set_comment_resolver.cpp
View File

@ -112,27 +112,13 @@ int ObSetCommentResolver::resolve(const ParseNode &parse_tree)
} else if (OB_FAIL(resolve_table_relation_node(parse_tree.children_[0], } else if (OB_FAIL(resolve_table_relation_node(parse_tree.children_[0],
table_name, table_name,
database_name))) { database_name))) {
SQL_RESV_LOG(WARN, "failed to resolve table name.", K(table_name), K(database_name), K(ret)); LOG_WARN("failed to resolve table name.", K(table_name), K(database_name), K(ret));
} else if (OB_FAIL(schema_checker_->check_table_exists( } else if (OB_FAIL(get_table_schema(parse_tree.children_[0]->children_[0],
tenant_id, tenant_id,
database_name, database_name,
table_name, table_name,
false /*index*/, table_schema))) {
false/*is_hidden*/, SQL_RESV_LOG(WARN, "failed to get table schema", K(table_name), K(database_name), K(ret));
is_exists))) {
SQL_RESV_LOG(WARN, "failed to check_table_exist",
K(ret), K(tenant_id), K(database_name), K(table_name));
} else if (!is_exists) {
ret = OB_TABLE_NOT_EXIST;
SQL_RESV_LOG(WARN, "failed to check_table_exist",
K(ret), K(tenant_id), K(database_name), K(table_name));
} else if (OB_FAIL(schema_checker_->get_table_schema(
tenant_id,
database_name,
table_name,
false/*not index table*/,
table_schema))) {
SQL_RESV_LOG(WARN, "failed to get table schema", K(ret), K(database_name), K(table_name));
} else if (OB_ISNULL(table_schema)) { } else if (OB_ISNULL(table_schema)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
SQL_RESV_LOG(WARN, "table schema is null", K(ret), K(database_name)); SQL_RESV_LOG(WARN, "table schema is null", K(ret), K(database_name));
@ -179,21 +165,19 @@ int ObSetCommentResolver::resolve(const ParseNode &parse_tree)
} }
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
} else if (OB_FAIL(schema_checker_->get_table_schema( } else if (OB_FAIL(get_table_schema(column_ref_node->children_[0],
tenant_id, tenant_id,
database_name, database_name,
table_name, table_name,
false/*not index table*/, table_schema))) {
table_schema))) { SQL_RESV_LOG(WARN, "failed to get table schema", K(table_name), K(database_name), K(ret));
SQL_RESV_LOG(WARN, "failed to get table schema", K(ret), K(database_name), K(table_name));
} else if (OB_ISNULL(table_schema)) { } else if (OB_ISNULL(table_schema)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
SQL_RESV_LOG(WARN, "table schema is null", K(ret), K(database_name)); SQL_RESV_LOG(WARN, "table schema is null", K(ret), K(database_name));
} else if (OB_FAIL(schema_checker_->check_column_exists( } else if (OB_FAIL(schema_checker_->check_column_exists(tenant_id,
tenant_id, table_schema->get_table_id(),
table_schema->get_table_id(), col_name,
col_name, is_exists))) {
is_exists))) {
SQL_RESV_LOG(WARN, "failed to check_column_exists", K(ret), K(table_schema), K(col_name)); SQL_RESV_LOG(WARN, "failed to check_column_exists", K(ret), K(table_schema), K(col_name));
} else if (!is_exists) { } else if (!is_exists) {
ret = OB_ERR_COLUMN_NOT_FOUND; ret = OB_ERR_COLUMN_NOT_FOUND;
@ -269,5 +253,53 @@ int ObSetCommentResolver::resolve(const ParseNode &parse_tree)
return ret; return ret;
} }
int ObSetCommentResolver::get_table_schema(const ParseNode *db_node,
const uint64_t tenant_id,
ObString &database_name,
ObString &table_name,
const ObTableSchema *&table_schema)
{
int ret = OB_SUCCESS;
int tmp_ret = OB_SUCCESS;
bool has_synonym = false;
ObString new_db_name;
ObString new_tbl_name;
if (OB_FAIL(schema_checker_->get_table_schema_with_synonym(tenant_id,
database_name,
table_name,
false/*not index table*/,
has_synonym,
new_db_name,
new_tbl_name,
table_schema))) {
if (OB_ERR_BAD_DATABASE == ret) {
ret = OB_TABLE_NOT_EXIST; // oracle cmpt
LOG_WARN("database not exist", K(ret), K(database_name), K(table_name));
} else if (OB_TABLE_NOT_EXIST != ret) {
LOG_WARN("failed to get table schema", K(ret), K(database_name), K(table_name));
} else if (NULL == db_node && ObSQLUtils::is_oracle_sys_view(table_name)) {
if (OB_SUCCESS != (tmp_ret = ob_write_string(*allocator_,
OB_ORA_SYS_SCHEMA_NAME,
database_name))) {
LOG_WARN("fail to write db name", K(ret), K(tmp_ret));
} else if (OB_FAIL(schema_checker_->get_table_schema_with_synonym(tenant_id,
database_name,
table_name,
false/*not index table*/,
has_synonym,
new_db_name,
new_tbl_name,
table_schema))) {
LOG_WARN("failed to get sys view schema", K(ret), K(database_name), K(table_name));
}
}
}
if (OB_SUCC(ret) && has_synonym) {
database_name = new_db_name;
table_name = new_tbl_name;
}
return ret;
}
} //namespace sql } //namespace sql
} //namespace oceanbase } //namespace oceanbase

5
src/sql/resolver/ddl/ob_set_comment_resolver.h
View File

@ -27,6 +27,11 @@ public:
virtual ~ObSetCommentResolver(); virtual ~ObSetCommentResolver();
virtual int resolve(const ParseNode &parse_tree); virtual int resolve(const ParseNode &parse_tree);
ObAlterTableStmt *get_alter_table_stmt() { return static_cast<ObAlterTableStmt*>(stmt_); }; ObAlterTableStmt *get_alter_table_stmt() { return static_cast<ObAlterTableStmt*>(stmt_); };
int get_table_schema(const ParseNode *db_node,
const uint64_t tenant_id,
ObString &database_name,
ObString &table_name,
const ObTableSchema *&table_schema);
private: private:
share::schema::ObTableSchema table_schema_; share::schema::ObTableSchema table_schema_;
common::ObCollationType collation_type_; common::ObCollationType collation_type_;