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

use set_exprs_ instead of output_ for set op

Browse Source
This commit is contained in:
ls0
2022-03-04 14:27:56 +08:00
committed by LINxiansheng
parent 0ccf105b38
commit 42fcd3dd80
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/engine/set/ob_hash_except_op.cpp
View File

@ -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));
}
}

6
src/sql/engine/set/ob_hash_intersect_op.cpp
View File

@ -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));
}
}

6
src/sql/engine/set/ob_hash_set_op.cpp
View File

@ -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<const ObHashSetSpec &>(get_spec()).set_exprs_))) {
} else if (OB_FAIL(hp_infras_.insert_row(
static_cast<const ObHashSetSpec &>(get_spec()).set_exprs_, has_exists, inserted))) {
LOG_WARN("failed to insert row", K(ret));
}
}

2
src/sql/engine/set/ob_merge_except_op.cpp
View File

@ -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));

2
src/sql/engine/set/ob_merge_intersect_op.cpp
View File

@ -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));