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

bugfix: get a wrong comparison result of rollup exprs

Browse Source
This commit is contained in:
xianyu-w
2023-08-25 06:40:25 +00:00
committed by ob-robot
parent a02a29f89c
commit de67b84f18
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/sql/rewrite/ob_stmt_comparer.cpp
View File

@ -478,26 +478,21 @@ int ObStmtComparer::check_stmt_containment(const ObDMLStmt *first,
// check group by exprs // check group by exprs
if (OB_SUCC(ret) && QueryRelation::QUERY_UNCOMPARABLE != relation) { if (OB_SUCC(ret) && QueryRelation::QUERY_UNCOMPARABLE != relation) {
bool is_consistent = false; bool is_consistent = false;
common::ObSEArray<ObRawExpr*, 4> first_groupby_rollup_exprs; first_count = first_sel->get_group_exprs().count();
common::ObSEArray<ObRawExpr*, 4> second_groupby_rollup_exprs; second_count = second_sel->get_group_exprs().count();
if (OB_FAIL(append(first_groupby_rollup_exprs, first_sel->get_group_exprs()))) { int64_t first_rollup_count = first_sel->get_rollup_exprs().count();
LOG_WARN("failed to append group by rollup exprs.", K(ret)); int64_t second_rollup_count = second_sel->get_rollup_exprs().count();
} else if (OB_FAIL(append(first_groupby_rollup_exprs, first_sel->get_rollup_exprs()))) { if ((first_sel->get_aggr_item_size() > 0 ||
LOG_WARN("failed to append group by rollup exprs.", K(ret));
} else if (OB_FAIL(append(second_groupby_rollup_exprs, second_sel->get_group_exprs()))) {
LOG_WARN("failed to append group by rollup exprs.", K(ret));
} else if (OB_FAIL(append(second_groupby_rollup_exprs, second_sel->get_rollup_exprs()))) {
LOG_WARN("failed to append group by rollup exprs.", K(ret));
} else { /*do nothing.*/ }
first_count = first_groupby_rollup_exprs.count();
second_count = second_groupby_rollup_exprs.count();
if (OB_FAIL(ret)) {
} else if ((first_sel->get_aggr_item_size() > 0 ||
second_sel->get_aggr_item_size() > 0) second_sel->get_aggr_item_size() > 0)
&& relation != QueryRelation::QUERY_EQUAL) { && relation != QueryRelation::QUERY_EQUAL) {
relation = QueryRelation::QUERY_UNCOMPARABLE; relation = QueryRelation::QUERY_UNCOMPARABLE;
LOG_TRACE("succeed to check group by map", K(relation), K(map_info)); LOG_TRACE("succeed to check group by map", K(relation), K(map_info));
} else if (0 == first_count && 0 == second_count) { } else if (first_rollup_count != second_rollup_count ||
first_count != second_count) {
relation = QueryRelation::QUERY_UNCOMPARABLE;
LOG_TRACE("succeed to check group by map", K(relation), K(map_info));
} else if (0 == first_count && 0 == second_count &&
0 == first_rollup_count && 0 == second_rollup_count) {
map_info.is_group_equal_ = true; map_info.is_group_equal_ = true;
} else if (OB_FAIL(ObTransformUtils::check_group_by_consistent(first_sel, } else if (OB_FAIL(ObTransformUtils::check_group_by_consistent(first_sel,
is_consistent))) { is_consistent))) {
@ -513,8 +508,8 @@ int ObStmtComparer::check_stmt_containment(const ObDMLStmt *first,
LOG_WARN("failed to allcoate group by map", K(ret)); LOG_WARN("failed to allcoate group by map", K(ret));
} else if (OB_FAIL(compute_conditions_map(first_sel, } else if (OB_FAIL(compute_conditions_map(first_sel,
second_sel, second_sel,
first_groupby_rollup_exprs, first_sel->get_group_exprs(),
second_groupby_rollup_exprs, second_sel->get_group_exprs(),
map_info, map_info,
map_info.group_map_, map_info.group_map_,
match_count))) { match_count))) {
@ -522,6 +517,19 @@ int ObStmtComparer::check_stmt_containment(const ObDMLStmt *first,
} else if (match_count != first_count || match_count != second_count) { } else if (match_count != first_count || match_count != second_count) {
relation = QueryRelation::QUERY_UNCOMPARABLE; relation = QueryRelation::QUERY_UNCOMPARABLE;
LOG_TRACE("succeed to check group by map", K(relation), K(map_info)); LOG_TRACE("succeed to check group by map", K(relation), K(map_info));
} else if (first_rollup_count != 0) {
ObStmtCompareContext context(first_sel, second_sel, map_info, &first_sel->get_query_ctx()->calculable_items_);
bool rollup_match = true;
for (int64_t i = 0; OB_SUCC(ret) && rollup_match && i < first_rollup_count; i++) {
if (OB_FAIL(is_same_condition(first_sel->get_rollup_exprs().at(i),
second_sel->get_rollup_exprs().at(i),
context,
rollup_match))) {
LOG_WARN("failed to check is condition equal", K(ret));
}
}
map_info.is_group_equal_ = rollup_match;
LOG_TRACE("succeed to check group by map", K(relation), K(map_info));
} else { } else {
// todo @guoping.wgp we can do better to check containment relationship for group by clause // todo @guoping.wgp we can do better to check containment relationship for group by clause
map_info.is_group_equal_ = true; map_info.is_group_equal_ = true;