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

[CP] [to #46963629] fix public synonym with package name

Browse Source
This commit is contained in:
obdev
2023-01-28 16:43:42 +08:00
committed by ob-robot
parent bf90b086cd
commit 6a5642ce80
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/sql/resolver/ob_resolver_utils.cpp
View File

@ -1490,25 +1490,42 @@ int ObResolverUtils::resolve_sp_access_name(ObSchemaChecker &schema_checker,
if (is_oracle_mode()) { //Oracle mode if (is_oracle_mode()) { //Oracle mode
uint64_t object_db_id = OB_INVALID_ID; uint64_t object_db_id = OB_INVALID_ID;
ObString object_name; ObString object_name;
bool exist = false;
//search package name in current database, then search in sys tenant space in case of sys package //search package name in current database, then search in sys tenant space in case of sys package
OZ (schema_checker.get_database_id(tenant_id, current_database, database_id)); OZ (schema_checker.get_database_id(tenant_id, current_database, database_id));
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
} else if (OB_FAIL(schema_checker.get_package_id( } else if (OB_FAIL(schema_checker.get_package_id(
tenant_id, database_id, package_or_db_name, COMPATIBLE_ORACLE_MODE, package_id))) { tenant_id, database_id, package_or_db_name, COMPATIBLE_ORACLE_MODE, package_id))) {
bool exist = false;
ObSynonymChecker synonym_checker; ObSynonymChecker synonym_checker;
ret = OB_SUCCESS; ret = OB_SUCCESS;
OZ (resolve_synonym_object_recursively( OZ (resolve_synonym_object_recursively(
schema_checker, synonym_checker, tenant_id, database_id, schema_checker, synonym_checker, tenant_id, database_id,
package_or_db_name, object_db_id, object_name, exist)); package_or_db_name, object_db_id, object_name, exist));
if (OB_SUCC(ret)) { if (OB_FAIL(ret)) {
if (exist) { } else if (exist) {
OZ (schema_checker.get_package_id( if (object_db_id != database_id) {
tenant_id, object_db_id, object_name, COMPATIBLE_ORACLE_MODE, package_id)); const ObDatabaseSchema *database_schema = NULL;
} else { if (OB_FAIL(schema_checker.get_database_schema(tenant_id, object_db_id, database_schema))) {
object_db_id = database_id; LOG_WARN("failed to get database schema",
object_name = package_or_db_name; K(ret), K(object_db_id), K(object_name), K(database_id));
} else if (OB_ISNULL(database_schema)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("database schema is null",
K(ret), K(object_db_id), K(object_name), K(database_id));
} else {
db_name = database_schema->get_database_name_str();
}
} }
if (OB_FAIL(ret)) {
} else if (OB_FAIL(schema_checker.get_package_id(
tenant_id, object_db_id, object_name, COMPATIBLE_ORACLE_MODE, package_id))) {
LOG_WARN("failed to get package id", K(ret), K(object_db_id), K(object_name));
} else {
package_name = object_name;
}
} else {
object_db_id = database_id;
object_name = package_or_db_name;
} }
} }
if (OB_FAIL(ret) || OB_INVALID_ID == package_id) { if (OB_FAIL(ret) || OB_INVALID_ID == package_id) {
@ -1552,7 +1569,7 @@ int ObResolverUtils::resolve_sp_access_name(ObSchemaChecker &schema_checker,
package_name = package_or_db_name; package_name = package_or_db_name;
db_name.assign_ptr(OB_SYS_DATABASE_NAME, static_cast<int32_t>(strlen(OB_SYS_DATABASE_NAME))); db_name.assign_ptr(OB_SYS_DATABASE_NAME, static_cast<int32_t>(strlen(OB_SYS_DATABASE_NAME)));
} }
} else { } else if (!exist) {
package_name = package_or_db_name; package_name = package_or_db_name;
db_name = current_database; db_name = current_database;
} }