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

Fix plan with das for update hang in px transmit operator

Browse Source
This commit is contained in:
qianchanger
2023-01-06 14:38:14 +00:00
committed by ob-robot
parent 2cfa340452
commit c082c93fd4
6 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/engine/px/exchange/ob_px_transmit_op.cpp
View File

@ -164,16 +164,6 @@ void ObPxTransmitOp::destroy()
ObTransmitOp::destroy();
}
bool ObPxTransmitOp::is_dml_type_match_iter_end(bool need_drive_dml_query)
{
// In the new engine, insert, update, and delete no longer do real dml in inner_open,
// do real dml in get_next_row, so the original early termination logic needs to be modified,
// and other dml operators can still retain this optimization, such as replace, merge, etc.
return child_->get_spec().is_dml_operator() &&
!child_->get_spec().is_pdml_operator() &&
!need_drive_dml_query;
}
int ObPxTransmitOp::inner_open()
{
int ret = OB_SUCCESS;
@ -226,9 +216,6 @@ int ObPxTransmitOp::fetch_first_row()
OB_ISNULL(phy_plan = phy_plan_ctx->get_phy_plan())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("null phy_plan or phy_plan_ctx", K(phy_plan_ctx), K(phy_plan), K(ret));
} else if (is_dml_type_match_iter_end(phy_plan->need_drive_dml_query_)) {
iter_end_ = true;
LOG_TRACE("transmit iter end", K(ret), K(iter_end_));
} else {
const ObBatchRows *brs = NULL;
if (is_vectorized()) {

2
src/sql/engine/px/exchange/ob_px_transmit_op.h
View File

@ -1,4 +1,5 @@
/**
* Copyright (c) 2021 OceanBase
* OceanBase CE is licensed under Mulan PubL v2.
* You can use this software according to the terms and conditions of the Mulan PubL v2.
@ -148,7 +149,6 @@ private:
int broadcast_eof_row();
int next_row();
int set_rollup_hybrid_keys(ObSliceIdxCalc &slice_calc);
bool is_dml_type_match_iter_end(bool need_drive_dml_query);
int fetch_first_row();
int set_expect_range_count();