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

fix some fatal error for merge groupby/ hash distinct/ px_coord_merge_sort

Browse Source
This commit is contained in:
ls0
2021-09-08 14:50:42 +08:00
committed by wangzelin.wzl
parent ea087416e4
commit 79f1a13d71
3 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/sql/optimizer/ob_logical_operator.cpp
View File

@ -5760,19 +5760,32 @@ int ObLogicalOperator::inner_set_merge_sort(ObLogicalOperator* producer, ObLogic
if (OB_SUCC(ret) && 0 < sort->get_sort_keys().count()) {
// just use sort keys, avoid output_exprs are incorrect
consumer_exchange->set_is_merge_sort(true);
consumer_exchange->set_local_order(!global_order);
need_remove = true;
if (global_order && OB_FAIL(producer_exchange->set_op_ordering(sort->get_sort_keys()))) {
LOG_WARN("failed to set op ordering", K(ret));
} else if (!global_order && OB_FAIL(producer_exchange->set_local_ordering(sort->get_sort_keys()))) {
LOG_WARN("failed to set local ordering", K(ret));
} else if (OB_FAIL(consumer_exchange->set_sort_keys(sort->get_sort_keys()))) {
LOG_WARN("failed to set op ordering", K(ret));
} else {
LOG_TRACE("sort keys of exchange",
K(ret),
K(consumer_exchange->get_sort_keys()),
K(consumer_exchange->is_task_order()));
//for local merge sort in px_coord_merge_sort, we push down the sort operator
//keep the local order in sort op
if (!global_order && ObPQDistributeMethod::MAX_VALUE
== consumer_exchange->get_dist_method()) {
if (OB_FAIL(producer_exchange->allocate_sort_below(0, sort->get_sort_keys()))) {
LOG_WARN("failed to allocate sort", K(ret));
} else {
global_order = true;
static_cast<ObLogSort *>(producer_exchange->get_child(0))->set_local_merge_sort(true);
}
}
if (OB_SUCC(ret)) {
consumer_exchange->set_local_order(!global_order);
need_remove = true;
if (global_order && OB_FAIL(producer_exchange->set_op_ordering(sort->get_sort_keys()))) {
LOG_WARN("failed to set op ordering", K(ret));
} else if (!global_order && OB_FAIL(producer_exchange->set_local_ordering(sort->get_sort_keys()))) {
LOG_WARN("failed to set local ordering", K(ret));
} else if (OB_FAIL(consumer_exchange->set_sort_keys(sort->get_sort_keys()))) {
LOG_WARN("failed to set op ordering", K(ret));
} else {
LOG_TRACE("sort keys of exchange",
K(ret),
K(consumer_exchange->get_sort_keys()),
K(consumer_exchange->is_task_order()));
}
}
}
}