Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit64917cc

Browse files
committed
make_sort_from_pathkeys()'s method for choosing which of several
equivalent sort expressions to use was broken: you can't just lookat the relation membership, you have to actually grovel over theindividual Vars in each expression. I think this did work when itwas written, but it was broken by subsequent optimizations that madejoin relations not propagate every single input variable upward.Must find the Var that got propagated, not choose one at random.Per bug report from Daniel O'Neill.
1 parente3f27c1 commit64917cc

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

‎src/backend/optimizer/plan/createplan.c

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.167 2004/01/18 00:50:02 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.168 2004/02/29 17:36:05 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -106,7 +106,7 @@ static MergeJoin *make_mergejoin(List *tlist,
106106
staticSort*make_sort(Query*root,Plan*lefttree,intnumCols,
107107
AttrNumber*sortColIdx,Oid*sortOperators);
108108
staticSort*make_sort_from_pathkeys(Query*root,Plan*lefttree,
109-
Relidsrelids,List*pathkeys);
109+
List*pathkeys);
110110

111111

112112
/*
@@ -1057,7 +1057,6 @@ create_mergejoin_plan(Query *root,
10571057
outer_plan= (Plan*)
10581058
make_sort_from_pathkeys(root,
10591059
outer_plan,
1060-
best_path->jpath.outerjoinpath->parent->relids,
10611060
best_path->outersortkeys);
10621061
}
10631062

@@ -1067,7 +1066,6 @@ create_mergejoin_plan(Query *root,
10671066
inner_plan= (Plan*)
10681067
make_sort_from_pathkeys(root,
10691068
inner_plan,
1070-
best_path->jpath.innerjoinpath->parent->relids,
10711069
best_path->innersortkeys);
10721070
}
10731071

@@ -1837,7 +1835,6 @@ add_sort_column(AttrNumber colIdx, Oid sortOp,
18371835
* Create sort plan to sort according to given pathkeys
18381836
*
18391837
* 'lefttree' is the node which yields input tuples
1840-
* 'relids' is the set of relids represented by the input node
18411838
* 'pathkeys' is the list of pathkeys by which the result is to be sorted
18421839
*
18431840
* We must convert the pathkey information into arrays of sort key column
@@ -1850,8 +1847,7 @@ add_sort_column(AttrNumber colIdx, Oid sortOp,
18501847
* adding a Result node just to do the projection.
18511848
*/
18521849
staticSort*
1853-
make_sort_from_pathkeys(Query*root,Plan*lefttree,
1854-
Relidsrelids,List*pathkeys)
1850+
make_sort_from_pathkeys(Query*root,Plan*lefttree,List*pathkeys)
18551851
{
18561852
List*tlist=lefttree->targetlist;
18571853
List*i;
@@ -1895,12 +1891,22 @@ make_sort_from_pathkeys(Query *root, Plan *lefttree,
18951891
}
18961892
if (!resdom)
18971893
{
1898-
/* No matching Var; look foran expression */
1894+
/* No matching Var; look fora computable expression */
18991895
foreach(j,keysublist)
19001896
{
1897+
List*exprvars;
1898+
List*k;
1899+
19011900
pathkey=lfirst(j);
1902-
if (bms_is_subset(pull_varnos(pathkey->key),relids))
1903-
break;
1901+
exprvars=pull_var_clause(pathkey->key, false);
1902+
foreach(k,exprvars)
1903+
{
1904+
if (!tlist_member(lfirst(k),tlist))
1905+
break;
1906+
}
1907+
freeList(exprvars);
1908+
if (!k)
1909+
break;/* found usable expression */
19041910
}
19051911
if (!j)
19061912
elog(ERROR,"could not find pathkey item to sort");

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp