From 42fcd3dd8040b023771582e86d3482eaeb0d671c Mon Sep 17 00:00:00 2001 From: ls0 Date: Fri, 4 Mar 2022 14:27:56 +0800 Subject: [PATCH] use set_exprs_ instead of output_ for set op --- src/sql/engine/set/ob_hash_except_op.cpp | 6 +++--- src/sql/engine/set/ob_hash_intersect_op.cpp | 6 +++--- src/sql/engine/set/ob_hash_set_op.cpp | 6 ++++-- src/sql/engine/set/ob_merge_except_op.cpp | 2 +- src/sql/engine/set/ob_merge_intersect_op.cpp | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/sql/engine/set/ob_hash_except_op.cpp b/src/sql/engine/set/ob_hash_except_op.cpp index 66ae454768..96dd10ecb3 100644 --- a/src/sql/engine/set/ob_hash_except_op.cpp +++ b/src/sql/engine/set/ob_hash_except_op.cpp @@ -122,9 +122,9 @@ int ObHashExceptOp::inner_get_next_row() cur_exprs = &left_->get_spec().output_; } } else { - if (OB_FAIL(hp_infras_.get_left_next_row(store_row, MY_SPEC.output_))) { + if (OB_FAIL(hp_infras_.get_left_next_row(store_row, MY_SPEC.set_exprs_))) { } else { - cur_exprs = &MY_SPEC.output_; + cur_exprs = &MY_SPEC.set_exprs_; } } if (OB_ITER_END == ret) { @@ -176,7 +176,7 @@ int ObHashExceptOp::inner_get_next_row() } } // end of while if (OB_SUCC(ret) && !has_got_part_) { - if (OB_FAIL(convert_row(*cur_exprs, MY_SPEC.output_))) { + if (OB_FAIL(convert_row(*cur_exprs, MY_SPEC.set_exprs_))) { LOG_WARN("copy current row failed", K(ret)); } } diff --git a/src/sql/engine/set/ob_hash_intersect_op.cpp b/src/sql/engine/set/ob_hash_intersect_op.cpp index 6c02fac1e1..c3f5d643cf 100644 --- a/src/sql/engine/set/ob_hash_intersect_op.cpp +++ b/src/sql/engine/set/ob_hash_intersect_op.cpp @@ -109,9 +109,9 @@ int ObHashIntersectOp::inner_get_next_row() cur_exprs = &left_->get_spec().output_; } } else { - if (OB_FAIL(hp_infras_.get_left_next_row(store_row, MY_SPEC.output_))) { + if (OB_FAIL(hp_infras_.get_left_next_row(store_row, MY_SPEC.set_exprs_))) { } else { - cur_exprs = &MY_SPEC.output_; + cur_exprs = &MY_SPEC.set_exprs_; } } if (OB_ITER_END == ret) { @@ -162,7 +162,7 @@ int ObHashIntersectOp::inner_get_next_row() } } // end of while if (OB_SUCC(ret) && !has_got_part_) { - if (OB_FAIL(convert_row(*cur_exprs, MY_SPEC.output_))) { + if (OB_FAIL(convert_row(*cur_exprs, MY_SPEC.set_exprs_))) { LOG_WARN("copy current row failed", K(ret)); } } diff --git a/src/sql/engine/set/ob_hash_set_op.cpp b/src/sql/engine/set/ob_hash_set_op.cpp index 83f651e00b..6de6fb2f40 100644 --- a/src/sql/engine/set/ob_hash_set_op.cpp +++ b/src/sql/engine/set/ob_hash_set_op.cpp @@ -143,8 +143,10 @@ int ObHashSetOp::build_hash_table(bool from_child) LOG_WARN("failed to insert row", K(ret)); } } else { - if (OB_FAIL(hp_infras_.get_right_next_row(store_row, get_spec().output_))) { - } else if (OB_FAIL(hp_infras_.insert_row(get_spec().output_, has_exists, inserted))) { + if (OB_FAIL( + hp_infras_.get_right_next_row(store_row, static_cast(get_spec()).set_exprs_))) { + } else if (OB_FAIL(hp_infras_.insert_row( + static_cast(get_spec()).set_exprs_, has_exists, inserted))) { LOG_WARN("failed to insert row", K(ret)); } } diff --git a/src/sql/engine/set/ob_merge_except_op.cpp b/src/sql/engine/set/ob_merge_except_op.cpp index b68ca338aa..2677653b0f 100644 --- a/src/sql/engine/set/ob_merge_except_op.cpp +++ b/src/sql/engine/set/ob_merge_except_op.cpp @@ -118,7 +118,7 @@ int ObMergeExceptOp::inner_get_next_row() } } if (OB_SUCC(ret)) { - if (OB_FAIL(convert_row(*left_row, MY_SPEC.output_))) { + if (OB_FAIL(convert_row(*left_row, MY_SPEC.set_exprs_))) { LOG_WARN("failed to convert row", K(ret)); } else if (OB_FAIL(last_row_.save_store_row(*left_row, eval_ctx_, 0))) { LOG_WARN("failed to save right row", K(ret)); diff --git a/src/sql/engine/set/ob_merge_intersect_op.cpp b/src/sql/engine/set/ob_merge_intersect_op.cpp index 5577f2a28f..a7375103a6 100644 --- a/src/sql/engine/set/ob_merge_intersect_op.cpp +++ b/src/sql/engine/set/ob_merge_intersect_op.cpp @@ -109,7 +109,7 @@ int ObMergeIntersectOp::inner_get_next_row() } } if (OB_SUCC(ret)) { - if (OB_FAIL(convert_row(*left_row, MY_SPEC.output_))) { + if (OB_FAIL(convert_row(*left_row, MY_SPEC.set_exprs_))) { LOG_WARN("failed to convert row", K(ret)); } else if (OB_FAIL(last_row_.save_store_row(*left_row, eval_ctx_, 0))) { LOG_WARN("failed to save right row", K(ret));