diff --git a/src/sql/engine/pdml/static/ob_pdml_op_data_driver.cpp b/src/sql/engine/pdml/static/ob_pdml_op_data_driver.cpp index ee8f983a96..6789a51e6c 100644 --- a/src/sql/engine/pdml/static/ob_pdml_op_data_driver.cpp +++ b/src/sql/engine/pdml/static/ob_pdml_op_data_driver.cpp @@ -93,12 +93,11 @@ int ObPDMLOpDataDriver::destroy() return ret; } -int ObPDMLOpDataDriver::set_with_barrier(uint64_t op_id, - const ObPxMultiPartModifyOpInput *modify_input) +int ObPDMLOpDataDriver::set_dh_barrier_param(uint64_t op_id, + const ObPxMultiPartModifyOpInput *modify_input) { int ret = OB_SUCCESS; op_id_ = op_id; - with_barrier_ = true; if (OB_ISNULL(modify_input)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("table modify is null", K(ret)); diff --git a/src/sql/engine/pdml/static/ob_pdml_op_data_driver.h b/src/sql/engine/pdml/static/ob_pdml_op_data_driver.h index 942197722b..443ed00bf6 100644 --- a/src/sql/engine/pdml/static/ob_pdml_op_data_driver.h +++ b/src/sql/engine/pdml/static/ob_pdml_op_data_driver.h @@ -67,7 +67,7 @@ public: int destroy(); - int set_with_barrier(uint64_t op_id, const ObPxMultiPartModifyOpInput *modify_input); + int set_dh_barrier_param(uint64_t op_id, const ObPxMultiPartModifyOpInput *modify_input); int get_next_row(ObExecContext &ctx, const ObExprPtrIArray &row); private: diff --git a/src/sql/engine/pdml/static/ob_px_multi_part_delete_op.cpp b/src/sql/engine/pdml/static/ob_px_multi_part_delete_op.cpp index 694ae07ebf..e832c48377 100644 --- a/src/sql/engine/pdml/static/ob_px_multi_part_delete_op.cpp +++ b/src/sql/engine/pdml/static/ob_px_multi_part_delete_op.cpp @@ -65,14 +65,15 @@ int ObPxMultiPartDeleteOp::inner_open() LOG_WARN("failed to inner open", K(ret)); } else if (OB_FAIL(ObDMLService::init_del_rtdef(dml_rtctx_, del_rtdef_, MY_SPEC.del_ctdef_))) { LOG_WARN("init delete rtdef failed", K(ret)); - } else if (OB_FAIL(data_driver_.init(get_spec(), ctx_.get_allocator(), del_rtdef_, this, this, this, false))) { + } else if (OB_FAIL(data_driver_.init(get_spec(), ctx_.get_allocator(), del_rtdef_, this, this, this, false, MY_SPEC.with_barrier_))) { LOG_WARN("failed to init data driver", K(ret)); } else if (MY_SPEC.with_barrier_) { if (OB_ISNULL(input_)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("the input is null", K(ret)); - } else if (OB_FAIL(data_driver_.set_with_barrier(MY_SPEC.get_id(), - static_cast(input_)))) { + } else if (OB_FAIL(data_driver_.set_dh_barrier_param( + MY_SPEC.get_id(), + static_cast(input_)))) { LOG_WARN("faile to set barrier", K(ret)); } }