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

Fixed the issue of direct load initialization being skipped in merge into scene

Browse Source
This commit is contained in:
obdev
2025-02-06 08:14:54 +00:00
committed by ob-robot
parent 3ab0a5747c
commit c4bf786100
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/engine/ob_exec_context.cpp
View File

@ -784,10 +784,7 @@ int ObExecContext::init_physical_plan_ctx(const ObPhysicalPlan &plan)
} else {
consistency = STRONG;
}
if (stmt::T_INSERT == plan.get_stmt_type()) {
bool is_direct_load = plan.get_enable_append();
phy_plan_ctx_->set_is_direct_insert_plan(is_direct_load);
}
phy_plan_ctx_->set_is_direct_insert_plan(plan.get_enable_append());
phy_plan_ctx_->set_consistency_level(consistency);
phy_plan_ctx_->set_timeout_timestamp(start_time + plan_timeout);
phy_plan_ctx_->set_rich_format(my_session_->use_rich_format());

21
src/sql/ob_result_set.cpp
View File

@ -183,7 +183,7 @@ int ObResultSet::open_result()
}
} else if (OB_FAIL(drive_dml_query())) {
LOG_WARN("fail to drive dml query", K(ret));
} else if (stmt::T_INSERT == get_stmt_type()) {
} else {
ObPhysicalPlanCtx *plan_ctx = NULL;
if (OB_ISNULL(plan_ctx = get_exec_context().get_physical_plan_ctx())) {
ret = OB_ERR_UNEXPECTED;
@ -581,16 +581,13 @@ OB_INLINE int ObResultSet::do_open_plan(ObExecContext &ctx)
ctx.get_physical_plan_ctx()->get_last_refresh_scns())))) {
LOG_WARN("fail to set last_refresh_scns", K(ret), K(physical_plan_->get_mview_ids()));
} else {
// for insert /*+ append */ into select clause
if (stmt::T_INSERT == get_stmt_type()) {
ObPhysicalPlanCtx *plan_ctx = NULL;
if (OB_ISNULL(plan_ctx = get_exec_context().get_physical_plan_ctx())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("physical plan ctx is null");
} else if (plan_ctx->get_is_direct_insert_plan()) {
if (OB_FAIL(ObTableDirectInsertService::start_direct_insert(ctx, *physical_plan_))) {
LOG_WARN("fail to start direct insert", KR(ret));
}
ObPhysicalPlanCtx *plan_ctx = NULL;
if (OB_ISNULL(plan_ctx = get_exec_context().get_physical_plan_ctx())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("physical plan ctx is null");
} else if (plan_ctx->get_is_direct_insert_plan()) {
if (OB_FAIL(ObTableDirectInsertService::start_direct_insert(ctx, *physical_plan_))) {
LOG_WARN("fail to start direct insert", KR(ret));
}
}
/* 将exec_result_设置到executor的运行时环境中，用于返回数据 */
@ -856,7 +853,7 @@ OB_INLINE int ObResultSet::do_close_plan(int errcode, ObExecContext &ctx)
ObPxAdmission::exit_query_admission(my_session_, get_exec_context(), get_stmt_type(), *get_physical_plan());
// Finishing direct-insert must be executed after ObPxTargetMgr::release_target()
if (stmt::T_INSERT == get_stmt_type() && plan_ctx->get_is_direct_insert_plan()) {
if (plan_ctx->get_is_direct_insert_plan()) {
// for insert /*+ append */ into select clause
int tmp_ret = OB_SUCCESS;
if (OB_TMP_FAIL(ObTableDirectInsertService::finish_direct_insert(