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

Fix UNINIT problem

Browse Source
This commit is contained in:
tino247
2024-01-16 10:48:21 +00:00
committed by ob-robot
parent 1e2209de2c
commit fdc2c51a70
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rootserver/ob_ddl_service.cpp
View File

@ -7875,7 +7875,7 @@ int ObDDLService::modify_generated_column_default_value(ObColumnSchemaV2 &genera
const ObTenantSchema *tenant_schema = NULL; const ObTenantSchema *tenant_schema = NULL;
ObSchemaGetterGuard schema_guard; ObSchemaGetterGuard schema_guard;
ObRawExpr *expr = NULL; ObRawExpr *expr = NULL;
lib::Worker::CompatMode compat_mode; lib::Worker::CompatMode compat_mode = lib::Worker::CompatMode::INVALID;
if (OB_FAIL(default_session.init(0, 0, &allocator))) { if (OB_FAIL(default_session.init(0, 0, &allocator))) {
LOG_WARN("init empty session failed", K(ret)); LOG_WARN("init empty session failed", K(ret));
@ -7946,7 +7946,7 @@ int ObDDLService::modify_generated_column_local_vars(ObColumnSchemaV2 &generated
const ObTenantSchema *tenant_schema = NULL; const ObTenantSchema *tenant_schema = NULL;
ObSchemaGetterGuard schema_guard; ObSchemaGetterGuard schema_guard;
ObRawExpr *expr = NULL; ObRawExpr *expr = NULL;
lib::Worker::CompatMode compat_mode; lib::Worker::CompatMode compat_mode = lib::Worker::CompatMode::INVALID;
if (OB_FAIL(default_session.init(0, 0, &allocator))) { if (OB_FAIL(default_session.init(0, 0, &allocator))) {
LOG_WARN("init empty session failed", K(ret)); LOG_WARN("init empty session failed", K(ret));
} else if (OB_FAIL(schema_service_->get_tenant_schema_guard(tenant_id, schema_guard))) { } else if (OB_FAIL(schema_service_->get_tenant_schema_guard(tenant_id, schema_guard))) {
@ -8157,7 +8157,7 @@ int ObDDLService::modify_func_expr_column_name(
} else { } else {
char *new_part_func_expr_buf = NULL; char *new_part_func_expr_buf = NULL;
int64_t outer_pos = 0; int64_t outer_pos = 0;
lib::Worker::CompatMode compat_mode; lib::Worker::CompatMode compat_mode = lib::Worker::CompatMode::INVALID;
if (OB_ISNULL(new_part_func_expr_buf = if (OB_ISNULL(new_part_func_expr_buf =
static_cast<char *>(allocator.alloc(OB_MAX_SQL_LENGTH)))) { static_cast<char *>(allocator.alloc(OB_MAX_SQL_LENGTH)))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
@ -8545,7 +8545,7 @@ int ObDDLService::rebuild_constraint_check_expr(
} else { } else {
char *new_check_expr_buf = NULL; char *new_check_expr_buf = NULL;
int64_t outer_pos = 0; int64_t outer_pos = 0;
lib::Worker::CompatMode compat_mode; lib::Worker::CompatMode compat_mode = lib::Worker::CompatMode::INVALID;
if (OB_ISNULL(new_check_expr_buf = if (OB_ISNULL(new_check_expr_buf =
static_cast<char *>(allocator.alloc(OB_MAX_SQL_LENGTH)))) { static_cast<char *>(allocator.alloc(OB_MAX_SQL_LENGTH)))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;

6
src/share/schema/ob_table_sql_service.cpp
View File

@ -1115,7 +1115,7 @@ int ObTableSqlService::add_columns_for_core(ObISQLClient &sql_client, const ObTa
} }
// for batch sql query // for batch sql query
bool enable_stash_query = false; bool enable_stash_query = false;
ObSqlTransQueryStashDesc *stash_desc; ObSqlTransQueryStashDesc *stash_desc = NULL;
ObMySQLTransaction* trans = dynamic_cast<ObMySQLTransaction*>(&sql_client); ObMySQLTransaction* trans = dynamic_cast<ObMySQLTransaction*>(&sql_client);
if (OB_SUCC(ret) && trans != nullptr && trans->get_enable_query_stash()) { if (OB_SUCC(ret) && trans != nullptr && trans->get_enable_query_stash()) {
enable_stash_query = true; enable_stash_query = true;
@ -1198,8 +1198,8 @@ int ObTableSqlService::add_columns_for_not_core(ObISQLClient &sql_client,
ObSqlString *column_history_sql_ptr = &column_history_sql_obj; ObSqlString *column_history_sql_ptr = &column_history_sql_obj;
// for batch sql query // for batch sql query
bool enable_stash_query = false; bool enable_stash_query = false;
ObSqlTransQueryStashDesc *stash_desc; ObSqlTransQueryStashDesc *stash_desc = NULL;
ObSqlTransQueryStashDesc *stash_desc2; ObSqlTransQueryStashDesc *stash_desc2 = NULL;
ObMySQLTransaction* trans = dynamic_cast<ObMySQLTransaction*>(&sql_client); ObMySQLTransaction* trans = dynamic_cast<ObMySQLTransaction*>(&sql_client);
if (OB_SUCC(ret) && trans != nullptr && trans->get_enable_query_stash()) { if (OB_SUCC(ret) && trans != nullptr && trans->get_enable_query_stash()) {
if (OB_FAIL(trans->get_stash_query(tenant_id, OB_ALL_COLUMN_TNAME, stash_desc))) { if (OB_FAIL(trans->get_stash_query(tenant_id, OB_ALL_COLUMN_TNAME, stash_desc))) {