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

fix mysqltest for aggregation in subquery

Browse Source
This commit is contained in:
obdev
2023-08-29 13:44:32 +00:00
committed by ob-robot
parent 59f3482c2d
commit d4f81eda30
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/sql/resolver/dml/ob_aggr_expr_push_up_analyzer.cpp
View File

@ -240,24 +240,26 @@ ObSelectResolver *ObAggrExprPushUpAnalyzer::fetch_final_aggr_resolver(ObDMLResol
if (min_level_resolver != NULL && cur_resolver != min_level_resolver if (min_level_resolver != NULL && cur_resolver != min_level_resolver
&& NULL != cur_resolver->get_parent_namespace_resolver() && NULL != cur_resolver->get_parent_namespace_resolver()
&& (lib::is_mysql_mode() && (lib::is_mysql_mode()
|| T_HAVING_SCOPE == cur_resolver->get_parent_namespace_resolver()->get_current_scope() || T_HAVING_SCOPE == cur_resolver->get_parent_namespace_resolver()->get_current_scope())) {
|| (T_ORDER_SCOPE == cur_resolver->get_parent_namespace_resolver()->get_current_scope() /*
&& T_WHERE_SCOPE != cur_resolver->get_current_scope()))) { * bug fix:
if (lib::is_oracle_mode() && cur_resolver->is_select_resolver()) { *
/* * For mysql, aggr func belongs to the upper level, whether there is a "union" or not.
* bug fix: *
* * For oracle, aggr func not in "HAVING" belongs to the subquery, does not need to
* SELECT (SELECT COUNT(t1.a) from dual) FROM t1 GROUP BY t1.a; * push up.
* * *
* SELECT (SELECT COUNT(t1.a) union select 1 where 1>2) FROM t1 GROUP BY t1.a; * SELECT (SELECT COUNT(t1.a) FROM dual) FROM t1 GROUP BY t1.a;
* * * *
* For oracle, aggr func always belongs to the subquery, does not need to push up. * SELECT (SELECT COUNT(t1.a) union select 1 where 1>2) FROM t1 GROUP BY t1.a;
* For mysql, aggr func belongs to the upper level, whether there is a "union" or not. * *
*/ * SELECT 1 FROM t1 HAVING 1 in (SELECT MAX(t1.n1) FROM dual);
} else { * *
ObDMLResolver *next_resolver = cur_resolver->get_parent_namespace_resolver(); * Here, for oracle mode, COUNT belongs to the subquery, but MAX belongs to the
final_resolver = fetch_final_aggr_resolver(next_resolver, min_level_resolver); * upper query.
} */
ObDMLResolver *next_resolver = cur_resolver->get_parent_namespace_resolver();
final_resolver = fetch_final_aggr_resolver(next_resolver, min_level_resolver);
} }
if (NULL == final_resolver && cur_resolver->is_select_resolver()) { if (NULL == final_resolver && cur_resolver->is_select_resolver()) {
ObSelectResolver *select_resolver = static_cast<ObSelectResolver*>(cur_resolver); ObSelectResolver *select_resolver = static_cast<ObSelectResolver*>(cur_resolver);