Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/backend/optimizer/util/clauses.c
Original file line number Diff line number Diff line change
Expand Up @@ -5528,35 +5528,41 @@ flatten_join_alias_var_optimizer(Query *query, int queryLevel)
if (NIL != targetList)
{
queryNew->targetList = (List *) flatten_join_alias_vars(queryNew, (Node *) targetList);
list_free(targetList);
/* We can free the old list only if it was replaced */
if (targetList != queryNew->targetList)
list_free(targetList);
}

List * returningList = queryNew->returningList;
if (NIL != returningList)
{
queryNew->returningList = (List *) flatten_join_alias_vars(queryNew, (Node *) returningList);
list_free(returningList);
if (returningList != queryNew->returningList)
list_free(returningList);
}

Node *havingQual = queryNew->havingQual;
if (NULL != havingQual)
{
queryNew->havingQual = flatten_join_alias_vars(queryNew, havingQual);
pfree(havingQual);
if (havingQual != queryNew->havingQual)
pfree(havingQual);
}

List *scatterClause = queryNew->scatterClause;
if (NIL != scatterClause)
{
queryNew->scatterClause = (List *) flatten_join_alias_vars(queryNew, (Node *) scatterClause);
list_free(scatterClause);
if (scatterClause != queryNew->scatterClause)
list_free(scatterClause);
}

Node *limitOffset = queryNew->limitOffset;
if (NULL != limitOffset)
{
queryNew->limitOffset = flatten_join_alias_vars(queryNew, limitOffset);
pfree(limitOffset);
if (limitOffset != queryNew->limitOffset)
pfree(limitOffset);
}

List *windowClause = queryNew->windowClause;
Expand All @@ -5583,7 +5589,8 @@ flatten_join_alias_var_optimizer(Query *query, int queryLevel)
if (NULL != limitCount)
{
queryNew->limitCount = flatten_join_alias_vars(queryNew, limitCount);
pfree(limitCount);
if (limitCount != queryNew->limitCount)
pfree(limitCount);
}

return queryNew;
Expand Down
Loading