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

[CP] [to #55840371] fix member function call without self prefix

Browse Source
This commit is contained in:
obdev
2024-04-08 09:58:54 +00:00
committed by ob-robot
parent fb4195d21a
commit 7d0c17480c
6 changed files with 81 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/ob_spi.cpp
View File

@ -3643,6 +3643,7 @@ int ObSPIService::spi_cursor_open(ObPLExecCtx *ctx,
// 如果当前cursor已经有spi_result则复用,避免内存占用过多
retry_ctrl.clear_state_before_each_retry(session_info->get_retry_info_for_update());
OZ (cursor->prepare_spi_result(ctx, spi_result));
CK (OB_NOT_NULL(spi_result->get_memory_ctx()));
OZ (spi_result->start_cursor_stmt(ctx, static_cast<stmt::StmtType>(type), for_update));
OZ ((GCTX.schema_service_->get_tenant_schema_guard(session_info->get_effective_tenant_id(), spi_result->get_scheme_guard())));
OX (spi_result->get_sql_ctx().schema_guard_ = &spi_result->get_scheme_guard());
@ -3656,7 +3657,7 @@ int ObSPIService::spi_cursor_open(ObPLExecCtx *ctx,
WITH_CONTEXT(cursor->get_cursor_entity()) {
lib::ContextTLOptGuard guard(false);
OZ (inner_open(ctx,
spi_result->get_allocaor(),
spi_result->get_memory_ctx()->get_arena_allocator(),
sql,
ps_sql,
type,
@ -3670,7 +3671,7 @@ int ObSPIService::spi_cursor_open(ObPLExecCtx *ctx,
}
} else {
ret = inner_open(ctx,
spi_result->get_allocaor(),
spi_result->get_memory_ctx()->get_arena_allocator(),
sql,
ps_sql,
type,
@ -3769,6 +3770,7 @@ int ObSPIService::spi_cursor_open(ObPLExecCtx *ctx,
spi_result.get_out_params().reset();
spi_result.reset_member_for_retry(*session_info);
}
CK (OB_NOT_NULL(spi_result.get_memory_ctx()));
OX (retry_ctrl.clear_state_before_each_retry(session_info->get_retry_info_for_update()));
OZ ((GCTX.schema_service_->get_tenant_schema_guard(session_info->get_effective_tenant_id(), spi_result.get_scheme_guard())));
OX (spi_result.get_sql_ctx().schema_guard_ = &spi_result.get_scheme_guard());
@ -3778,7 +3780,7 @@ int ObSPIService::spi_cursor_open(ObPLExecCtx *ctx,
OX (retry_ctrl.set_sys_local_schema_version(sys_version));
OZ (inner_open(ctx,
spi_result.get_allocaor(),
spi_result.get_memory_ctx()->get_arena_allocator(),
sql,
ps_sql,
type,
@ -6568,7 +6570,7 @@ int ObSPIService::inner_open(ObPLExecCtx *ctx,
// add exec_param_info for sql_audit
char *tmp_ptr = NULL;
int64_t tmp_len = 0;
OZ (ObMPStmtExecute::store_params_value_to_str(spi_result.get_allocaor(),
OZ (ObMPStmtExecute::store_params_value_to_str(spi_result.get_memory_ctx()->get_arena_allocator(),
*ctx->exec_ctx_->get_my_session(),
&exec_params,
tmp_ptr,