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

fix aggr bug

Browse Source
This commit is contained in:
wangt1xiuyi
2023-09-08 11:56:21 +08:00
committed by ob-robot
parent 0ca39e9932
commit 06de08f309
2 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/sql/parser/sql_parser_mysql_mode.y
View File

@ -8322,22 +8322,7 @@ opt_lock_type:
; ;
no_table_select: no_table_select:
select_with_opt_hint opt_query_expression_option_list select_expr_list into_opt %prec LOWER_PARENS select_with_opt_hint opt_query_expression_option_list select_expr_list into_opt
{
ParseNode *project_list = NULL;
merge_nodes(project_list, result, T_PROJECT_LIST, $3);
ParseNode *select_node = NULL;
malloc_select_node(select_node, result->malloc_pool_);
select_node->children_[PARSE_SELECT_DISTINCT] = $2;
select_node->children_[PARSE_SELECT_SELECT] = project_list;
select_node->children_[PARSE_SELECT_HINTS] = $1;
select_node->children_[PARSE_SELECT_INTO] = $4;
$$ = select_node;
setup_token_pos_info(select_node, @1.first_column - 1, 6);
}
| select_with_opt_hint opt_query_expression_option_list select_expr_list into_opt
FROM DUAL opt_where opt_groupby opt_having opt_named_windows FROM DUAL opt_where opt_groupby opt_having opt_named_windows
{ {
ParseNode *project_list = NULL; ParseNode *project_list = NULL;
@ -8357,24 +8342,21 @@ FROM DUAL opt_where opt_groupby opt_having opt_named_windows
setup_token_pos_info(select_node, @1.first_column - 1, 6); setup_token_pos_info(select_node, @1.first_column - 1, 6);
} }
| select_with_opt_hint opt_query_expression_option_list select_expr_list into_opt | select_with_opt_hint opt_query_expression_option_list select_expr_list into_opt opt_where opt_groupby opt_having opt_named_windows
WHERE opt_hint_value expr opt_groupby opt_having opt_named_windows
{ {
ParseNode *project_list = NULL; ParseNode *project_list = NULL;
ParseNode *where_node = NULL;
ParseNode *select_node = NULL; ParseNode *select_node = NULL;
merge_nodes(project_list, result, T_PROJECT_LIST, $3); merge_nodes(project_list, result, T_PROJECT_LIST, $3);
malloc_non_terminal_node(where_node, result->malloc_pool_, T_WHERE_CLAUSE, 2, $7, $6);
setup_token_pos_info($$, @1.first_column - 1, 5); setup_token_pos_info($$, @1.first_column - 1, 5);
malloc_select_node(select_node, result->malloc_pool_); malloc_select_node(select_node, result->malloc_pool_);
select_node->children_[PARSE_SELECT_DISTINCT] = $2; select_node->children_[PARSE_SELECT_DISTINCT] = $2;
select_node->children_[PARSE_SELECT_SELECT] = project_list; select_node->children_[PARSE_SELECT_SELECT] = project_list;
select_node->children_[PARSE_SELECT_WHERE] = where_node; select_node->children_[PARSE_SELECT_WHERE] = $5;
select_node->children_[PARSE_SELECT_HINTS] = $1; select_node->children_[PARSE_SELECT_HINTS] = $1;
select_node->children_[PARSE_SELECT_INTO] = $4; select_node->children_[PARSE_SELECT_INTO] = $4;
select_node->children_[PARSE_SELECT_DYNAMIC_GROUP] = $8; select_node->children_[PARSE_SELECT_DYNAMIC_GROUP] = $6;
select_node->children_[PARSE_SELECT_DYNAMIC_HAVING] = $9; select_node->children_[PARSE_SELECT_DYNAMIC_HAVING] = $7;
select_node->children_[PARSE_SELECT_NAMED_WINDOWS] = $10; select_node->children_[PARSE_SELECT_NAMED_WINDOWS] = $8;
$$ = select_node; $$ = select_node;
setup_token_pos_info(select_node, @1.first_column - 1, 6); setup_token_pos_info(select_node, @1.first_column - 1, 6);
} }

4
src/sql/resolver/expr/ob_raw_expr_printer.cpp
View File

@ -1080,6 +1080,10 @@ int ObRawExprPrinter::print(ObAggFunRawExpr *expr)
SET_SYMBOL_IF_EMPTY("json_arrayagg"); SET_SYMBOL_IF_EMPTY("json_arrayagg");
case T_FUN_JSON_OBJECTAGG: case T_FUN_JSON_OBJECTAGG:
SET_SYMBOL_IF_EMPTY("json_objectagg"); SET_SYMBOL_IF_EMPTY("json_objectagg");
case T_FUN_APPROX_COUNT_DISTINCT_SYNOPSIS:
SET_SYMBOL_IF_EMPTY("approx_count_distinct_synopsis");
case T_FUN_APPROX_COUNT_DISTINCT_SYNOPSIS_MERGE:
SET_SYMBOL_IF_EMPTY("approx_count_distinct_synopsis_merge");
case T_FUN_PL_AGG_UDF:{ case T_FUN_PL_AGG_UDF:{
if (type == T_FUN_PL_AGG_UDF) { if (type == T_FUN_PL_AGG_UDF) {
if (OB_ISNULL(expr->get_pl_agg_udf_expr()) || if (OB_ISNULL(expr->get_pl_agg_udf_expr()) ||