diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-11-02 18:54:15 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-11-02 18:54:15 +0000 |
| commit | 97ddfc960738e6b178b4d16d4ec4553eed078827 (patch) | |
| tree | b026f19f8f45542e4160d978ebe11ca82c6be27a /src/backend/optimizer/plan/createplan.c | |
| parent | 65bd783614c2e6ddeec42e8ba19e8b676ba5cee0 (diff) | |
| download | postgresql-97ddfc960738e6b178b4d16d4ec4553eed078827.tar.gz postgresql-97ddfc960738e6b178b4d16d4ec4553eed078827.zip | |
Ensure that EquivalenceClasses generated from ORDER BY keys contain proper
RelabelType nodes when the sort key is binary-compatible with the sort
operator rather than having exactly its input type. We did this correctly
for index columns but not sort keys, leading to failure to notice that
a varchar index matches an ORDER BY request. This requires a bit more work
in make_sort_from_pathkeys, but not anyplace else that I can find.
Per bug report and subsequent discussion.
Diffstat (limited to 'src/backend/optimizer/plan/createplan.c')
| -rw-r--r-- | src/backend/optimizer/plan/createplan.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 23099df6dc3..fb9b437174f 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.231 2007/05/21 17:57:34 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.232 2007/11/02 18:54:15 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2756,12 +2756,30 @@ make_sort_from_pathkeys(PlannerInfo *root, Plan *lefttree, List *pathkeys, if (em->em_is_const || em->em_is_child) continue; + tle = tlist_member((Node *) em->em_expr, tlist); if (tle) { pk_datatype = em->em_datatype; break; /* found expr already in tlist */ } + + /* + * We can also use it if the pathkey expression is a relabel + * of the tlist entry. This is needed for binary-compatible + * cases (cf. make_pathkey_from_sortinfo). + */ + if (IsA(em->em_expr, RelabelType)) + { + Expr *rtarg = ((RelabelType *) em->em_expr)->arg; + + tle = tlist_member((Node *) rtarg, tlist); + if (tle) + { + pk_datatype = em->em_datatype; + break; /* found expr already in tlist */ + } + } } if (!tle) { |