database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化了修复rownum的4个bug的代码

Browse Source
This commit is contained in:
zhouxiongjia
2020-10-27 15:52:23 +08:00
parent 307db7f772
commit 1b439d8718
4 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/common/backend/parser/parse_agg.cpp
View File

@ -56,6 +56,7 @@ static void finalize_grouping_exprs(
static bool finalize_grouping_exprs_walker(Node* node, check_ungrouped_columns_context* context);
static List* expand_groupingset_node(GroupingSet* gs);
static void find_rownum_in_groupby_clauses(Rownum *rownumVar, check_ungrouped_columns_context* context);
/*
* transformAggregateCall -
@ -742,23 +743,7 @@ static bool check_ungrouped_columns_walker(Node* node, check_ungrouped_columns_c
/* If There is ROWNUM, it must appear in the GROUP BY clause or be used in an aggregate function. */
if (IsA(node, Rownum)) {
Rownum *rownumVar = (Rownum *)node;
bool haveRownum = false;
if (!context->have_non_var_grouping || context->sublevels_up != 0) {
foreach (gl, context->groupClauses) {
Node *gnode = (Node *)((TargetEntry *)lfirst(gl))->expr;
if (IsA(gnode, Rownum)) {
haveRownum = true;
break;
}
}
if (haveRownum == false) {
ereport(ERROR, (errcode(ERRCODE_GROUPING_ERROR),
errmsg("ROWNUM must appear in the GROUP BY clause or be used in an aggregate function"),
parser_errposition(context->pstate, rownumVar->location)));
}
}
find_rownum_in_groupby_clauses((Rownum *)node, context);
}
/*
* If we have an ungrouped Var of the original query level, we have a
@ -1493,3 +1478,25 @@ Oid resolve_aggregate_transtype(Oid aggfuncid, Oid aggtranstype, Oid* inputTypes
}
return aggtranstype;
}
static void find_rownum_in_groupby_clauses(Rownum *rownumVar, check_ungrouped_columns_context *context)
{
bool haveRownum = false;
ListCell *gl = NULL;
if (!context->have_non_var_grouping || context->sublevels_up != 0) {
foreach (gl, context->groupClauses) {
Node *gnode = (Node *)((TargetEntry *)lfirst(gl))->expr;
if (IsA(gnode, Rownum)) {
haveRownum = true;
break;
}
}
if (haveRownum == false) {
ereport(ERROR, (errcode(ERRCODE_GROUPING_ERROR),
errmsg("ROWNUM must appear in the GROUP BY clause or be used in an aggregate function"),
parser_errposition(context->pstate, rownumVar->location)));
}
}
}