From 69ad58c04dad1850def59536f87e6c8c7577beb4 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Thu, 31 Jan 2019 15:37:22 +0900 Subject: [PATCH 4/6] Simplify some code in clause parsing --- src/backend/parser/parse_clause.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index c6ce1011e2..36601a1513 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -94,8 +94,7 @@ static TargetEntry *findTargetlistEntrySQL99(ParseState *pstate, Node *node, List **tlist, ParseExprKind exprKind); static int get_matching_location(int sortgroupref, List *sortgrouprefs, List *exprs); -static List *resolve_unique_index_expr(ParseState *pstate, InferClause *infer, - Relation heapRel); +static List *resolve_unique_index_expr(ParseState *pstate, InferClause *infer); static List *addTargetToGroupList(ParseState *pstate, TargetEntry *tle, List *grouplist, List *targetlist, int location); static WindowClause *findWindowClause(List *wclist, const char *name); @@ -3017,8 +3016,7 @@ get_matching_location(int sortgroupref, List *sortgrouprefs, List *exprs) * to infer which unique index to use. */ static List * -resolve_unique_index_expr(ParseState *pstate, InferClause *infer, - Relation heapRel) +resolve_unique_index_expr(ParseState *pstate, InferClause *infer) { List *result = NIL; ListCell *l; @@ -3167,8 +3165,7 @@ transformOnConflictArbiter(ParseState *pstate, false, false, true); if (infer->indexElems) - *arbiterExpr = resolve_unique_index_expr(pstate, infer, - pstate->p_target_relation); + *arbiterExpr = resolve_unique_index_expr(pstate, infer); /* * Handling inference WHERE clause (for partial unique index -- 2.20.1