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

PDML delete with barrier should not throw MEMORY_EXCEED error.

Browse Source
This commit is contained in:
raywill
2023-05-23 03:11:36 +00:00
committed by ob-robot
parent f08b092b29
commit 2876cc28d2
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/engine/pdml/static/ob_pdml_op_data_driver.cpp
View File

@ -93,12 +93,11 @@ int ObPDMLOpDataDriver::destroy()
return ret; return ret;
} }
int ObPDMLOpDataDriver::set_with_barrier(uint64_t op_id, int ObPDMLOpDataDriver::set_dh_barrier_param(uint64_t op_id,
const ObPxMultiPartModifyOpInput *modify_input) const ObPxMultiPartModifyOpInput *modify_input)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
op_id_ = op_id; op_id_ = op_id;
with_barrier_ = true;
if (OB_ISNULL(modify_input)) { if (OB_ISNULL(modify_input)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("table modify is null", K(ret)); LOG_WARN("table modify is null", K(ret));

2
src/sql/engine/pdml/static/ob_pdml_op_data_driver.h
View File

@ -67,7 +67,7 @@ public:
int destroy(); 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); int get_next_row(ObExecContext &ctx, const ObExprPtrIArray &row);
private: private:

7
src/sql/engine/pdml/static/ob_px_multi_part_delete_op.cpp
View File

@ -65,14 +65,15 @@ int ObPxMultiPartDeleteOp::inner_open()
LOG_WARN("failed to inner open", K(ret)); LOG_WARN("failed to inner open", K(ret));
} else if (OB_FAIL(ObDMLService::init_del_rtdef(dml_rtctx_, del_rtdef_, MY_SPEC.del_ctdef_))) { } else if (OB_FAIL(ObDMLService::init_del_rtdef(dml_rtctx_, del_rtdef_, MY_SPEC.del_ctdef_))) {
LOG_WARN("init delete rtdef failed", K(ret)); 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)); LOG_WARN("failed to init data driver", K(ret));
} else if (MY_SPEC.with_barrier_) { } else if (MY_SPEC.with_barrier_) {
if (OB_ISNULL(input_)) { if (OB_ISNULL(input_)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("the input is null", K(ret)); LOG_WARN("the input is null", K(ret));
} else if (OB_FAIL(data_driver_.set_with_barrier(MY_SPEC.get_id(), } else if (OB_FAIL(data_driver_.set_dh_barrier_param(
static_cast<const ObPxMultiPartModifyOpInput *>(input_)))) { MY_SPEC.get_id(),
static_cast<const ObPxMultiPartModifyOpInput *>(input_)))) {
LOG_WARN("faile to set barrier", K(ret)); LOG_WARN("faile to set barrier", K(ret));
} }
} }