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

to issue<52325512>:check dep schema info after compiling store routine

Browse Source
This commit is contained in:
hanr881 2023-09-20 17:05:21 +00:00 committed by ob-robot
parent d2afa610a2
commit 2287f10061
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/pl/ob_pl_compile.cpp
View File

@ -32,6 +32,54 @@ using namespace schema;
using namespace sql;
namespace pl {
int ObPLCompiler::check_dep_schema(ObSchemaGetterGuard &schema_guard,
const DependenyTableStore &dep_schema_objs)
{
int ret = OB_SUCCESS;
uint64_t tenant_id = OB_INVALID_ID;
for (int64_t i = 0; OB_SUCC(ret) && i < dep_schema_objs.count(); ++i) {
tenant_id = MTL_ID();
if (TABLE_SCHEMA != dep_schema_objs.at(i).get_schema_type()) {
int64_t new_version = 0;
if (PACKAGE_SCHEMA == dep_schema_objs.at(i).get_schema_type()
|| UDT_SCHEMA == dep_schema_objs.at(i).get_schema_type()
|| ROUTINE_SCHEMA == dep_schema_objs.at(i).get_schema_type()) {
tenant_id = pl::get_tenant_id_by_object_id(dep_schema_objs.at(i).object_id_);
}
if (OB_FAIL(schema_guard.get_schema_version(dep_schema_objs.at(i).get_schema_type(),
tenant_id,
dep_schema_objs.at(i).object_id_,
new_version))) {
LOG_WARN("failed to get schema version",
K(ret), K(tenant_id), K(dep_schema_objs.at(i)));
} else if (OB_INVALID_VERSION == new_version ||
new_version != dep_schema_objs.at(i).version_) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("schema version is invalid", K(ret), K(dep_schema_objs.at(i)));
}
} else {
const ObSimpleTableSchemaV2 *table_schema = nullptr;
if (OB_FAIL(schema_guard.get_simple_table_schema(MTL_ID(),
dep_schema_objs.at(i).object_id_,
table_schema))) {
LOG_WARN("failed to get table schema",
K(ret), K(dep_schema_objs.at(i)));
} else if (nullptr == table_schema) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get an unexpected null table schema", K(ret));
} else if (table_schema->is_index_table()) {
// do nothing
} else if (table_schema->get_schema_version() != dep_schema_objs.at(i).version_) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("schema version is invalid", K(ret), K(dep_schema_objs.at(i)));
}
}
}
return ret;
}
int ObPLCompiler::init_anonymous_ast(
ObPLFunctionAST &func_ast,
ObIAllocator &allocator,
@ -225,6 +273,9 @@ int ObPLCompiler::compile(
func.set_sys_schema_version(sys_schema_version);
}
}
if (OB_SUCC(ret) && OB_FAIL(check_dep_schema(schema_guard_, func.get_dependency_table()))) {
LOG_WARN("fail to check schema version", K(ret));
}
} // end of HEAP_VAR
}
}
@ -434,6 +485,9 @@ int ObPLCompiler::compile(const uint64_t id, ObPLFunction &func)
func.set_ret_type(func_ast.get_ret_type());
}
}
if (OB_SUCC(ret) && OB_FAIL(check_dep_schema(schema_guard_, func.get_dependency_table()))) {
LOG_WARN("fail to check schema version", K(ret), K(tenant_id));
}
} // end of HEAP_VAR
}
@ -745,6 +799,7 @@ int ObPLCompiler::compile_package(const ObPackageInfo &package_info,
OX (package.set_can_cached(package_ast.get_can_cached()));
OX (package_ast.get_serially_reusable() ? package.set_serially_reusable() : void(NULL));
session_info_.set_for_trigger_package(saved_trigger_flag);
OZ (check_dep_schema(schema_guard_, package.get_dependency_table()));
OZ (update_schema_object_dep_info(package_ast.get_dependency_table(),
package_info.get_tenant_id(),
package_info.get_owner_id(),

2
src/pl/ob_pl_compile.h
View File

@ -68,6 +68,8 @@ public:
ObPLCompileUnit &compile_unit,
share::schema::ObSchemaGetterGuard &schema_guard);
static int compile_type_table(const ObPLUserTypeTable &ast_type_table, ObPLCompileUnit &unit);
static int check_dep_schema(ObSchemaGetterGuard &schema_guard,
const DependenyTableStore &dep_schema_objs);
static int init_anonymous_ast(ObPLFunctionAST &func_ast,
common::ObIAllocator &allocator,
sql::ObSQLSessionInfo &session_info,