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

Commitd8733ce

Browse files
committed
Repair planning bugs caused by my misguided removal of restrictinfo link
fields in JoinPaths --- turns out that we do need that after all :-(.Also, rearrange planner so that only one RelOptInfo is created for aparticular set of joined base relations, no matter how many differentsubsets of relations it can be created from. This saves memory andprocessing time compared to the old method of making a bunch of RelOptInfosand then removing the duplicates. Clean up the jointree iteration logic;not sure if it's better, but I sure find it more readable and plausiblenow, particularly for the case of 'bushy plans'.
1 parent2bda7a4 commitd8733ce

File tree

24 files changed

+1212
-1094
lines changed

24 files changed

+1212
-1094
lines changed

‎src/backend/nodes/copyfuncs.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.103 2000/01/27 18:11:27 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.104 2000/02/07 04:40:56 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -977,7 +977,7 @@ _copyRelOptInfo(RelOptInfo *from)
977977
newnode->pages=from->pages;
978978
newnode->tuples=from->tuples;
979979

980-
Node_Copy(from,newnode,restrictinfo);
980+
Node_Copy(from,newnode,baserestrictinfo);
981981
Node_Copy(from,newnode,joininfo);
982982
Node_Copy(from,newnode,innerjoin);
983983

@@ -1137,6 +1137,7 @@ CopyJoinPathFields(JoinPath *from, JoinPath *newnode)
11371137
{
11381138
Node_Copy(from,newnode,outerjoinpath);
11391139
Node_Copy(from,newnode,innerjoinpath);
1140+
Node_Copy(from,newnode,joinrestrictinfo);
11401141
}
11411142

11421143
/* ----------------

‎src/backend/nodes/equalfuncs.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.58 2000/01/31 01:21:39 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.59 2000/02/07 04:40:57 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -374,6 +374,8 @@ _equalJoinPath(JoinPath *a, JoinPath *b)
374374
return false;
375375
if (!equal(a->innerjoinpath,b->innerjoinpath))
376376
return false;
377+
if (!equal(a->joinrestrictinfo,b->joinrestrictinfo))
378+
return false;
377379
return true;
378380
}
379381

‎src/backend/nodes/freefuncs.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.33 2000/01/27 18:11:28 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.34 2000/02/07 04:40:57 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -735,7 +735,7 @@ _freeRelOptInfo(RelOptInfo *node)
735735
*/
736736
freeObject(node->cheapestpath);
737737

738-
freeObject(node->restrictinfo);
738+
freeObject(node->baserestrictinfo);
739739
freeObject(node->joininfo);
740740
freeObject(node->innerjoin);
741741

@@ -853,6 +853,10 @@ FreeJoinPathFields(JoinPath *node)
853853
{
854854
freeObject(node->outerjoinpath);
855855
freeObject(node->innerjoinpath);
856+
/* XXX probably wrong, since ordinarily a JoinPath would share its
857+
* restrictinfo list with other paths made for the same join?
858+
*/
859+
freeObject(node->joinrestrictinfo);
856860
}
857861

858862
/* ----------------

‎src/backend/nodes/outfuncs.c

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
*$Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.105 2000/01/27 18:11:28 tgl Exp $
9+
*$Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.106 2000/02/07 04:40:57 tgl Exp $
1010
*
1111
* NOTES
1212
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -915,10 +915,10 @@ _outRelOptInfo(StringInfo str, RelOptInfo *node)
915915
*/
916916

917917
appendStringInfo(str,
918-
" :cheapestpath @ 0x%x :pruneable %s :restrictinfo ",
918+
" :cheapestpath @ 0x%x :pruneable %s :baserestrictinfo ",
919919
(int)node->cheapestpath,
920920
node->pruneable ?"true" :"false");
921-
_outNode(str,node->restrictinfo);
921+
_outNode(str,node->baserestrictinfo);
922922

923923
appendStringInfo(str," :joininfo ");
924924
_outNode(str,node->joininfo);
@@ -1035,16 +1035,12 @@ _outNestPath(StringInfo str, NestPath *node)
10351035
node->path.pathtype,
10361036
node->path.path_cost);
10371037
_outNode(str,node->path.pathkeys);
1038-
1039-
/*
1040-
* Not sure if these are nodes; they're declared as "struct path *".
1041-
* For now, i'll just print the addresses.
1042-
*/
1043-
1044-
appendStringInfo(str,
1045-
" :outerjoinpath @ 0x%x :innerjoinpath @ 0x%x ",
1046-
(int)node->outerjoinpath,
1047-
(int)node->innerjoinpath);
1038+
appendStringInfo(str," :outerjoinpath ");
1039+
_outNode(str,node->outerjoinpath);
1040+
appendStringInfo(str," :innerjoinpath ");
1041+
_outNode(str,node->innerjoinpath);
1042+
appendStringInfo(str," :joinrestrictinfo ");
1043+
_outNode(str,node->joinrestrictinfo);
10481044
}
10491045

10501046
/*
@@ -1058,16 +1054,12 @@ _outMergePath(StringInfo str, MergePath *node)
10581054
node->jpath.path.pathtype,
10591055
node->jpath.path.path_cost);
10601056
_outNode(str,node->jpath.path.pathkeys);
1061-
1062-
/*
1063-
* Not sure if these are nodes; they're declared as "struct path *".
1064-
* For now, i'll just print the addresses.
1065-
*/
1066-
1067-
appendStringInfo(str,
1068-
" :outerjoinpath @ 0x%x :innerjoinpath @ 0x%x ",
1069-
(int)node->jpath.outerjoinpath,
1070-
(int)node->jpath.innerjoinpath);
1057+
appendStringInfo(str," :outerjoinpath ");
1058+
_outNode(str,node->jpath.outerjoinpath);
1059+
appendStringInfo(str," :innerjoinpath ");
1060+
_outNode(str,node->jpath.innerjoinpath);
1061+
appendStringInfo(str," :joinrestrictinfo ");
1062+
_outNode(str,node->jpath.joinrestrictinfo);
10711063

10721064
appendStringInfo(str," :path_mergeclauses ");
10731065
_outNode(str,node->path_mergeclauses);
@@ -1090,16 +1082,12 @@ _outHashPath(StringInfo str, HashPath *node)
10901082
node->jpath.path.pathtype,
10911083
node->jpath.path.path_cost);
10921084
_outNode(str,node->jpath.path.pathkeys);
1093-
1094-
/*
1095-
* Not sure if these are nodes; they're declared as "struct path *".
1096-
* For now, i'll just print the addresses.
1097-
*/
1098-
1099-
appendStringInfo(str,
1100-
" :outerjoinpath @ 0x%x :innerjoinpath @ 0x%x ",
1101-
(int)node->jpath.outerjoinpath,
1102-
(int)node->jpath.innerjoinpath);
1085+
appendStringInfo(str," :outerjoinpath ");
1086+
_outNode(str,node->jpath.outerjoinpath);
1087+
appendStringInfo(str," :innerjoinpath ");
1088+
_outNode(str,node->jpath.innerjoinpath);
1089+
appendStringInfo(str," :joinrestrictinfo ");
1090+
_outNode(str,node->jpath.joinrestrictinfo);
11031091

11041092
appendStringInfo(str," :path_hashclauses ");
11051093
_outNode(str,node->path_hashclauses);

‎src/backend/nodes/readfuncs.c

Lines changed: 15 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.81 2000/01/27 18:11:28 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.82 2000/02/07 04:40:57 tgl Exp $
1212
*
1313
* NOTES
1414
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -1288,8 +1288,8 @@ _readRelOptInfo()
12881288
sscanf(token,"%x", (unsignedint*)&local_node->cheapestpath);
12891289

12901290

1291-
token=lsptok(NULL,&length);/* get :restrictinfo */
1292-
local_node->restrictinfo=nodeRead(true);/* now read it */
1291+
token=lsptok(NULL,&length);/* get :baserestrictinfo */
1292+
local_node->baserestrictinfo=nodeRead(true);/* now read it */
12931293

12941294
token=lsptok(NULL,&length);/* get :joininfo */
12951295
local_node->joininfo=nodeRead(true);/* now read it */
@@ -1518,25 +1518,14 @@ _readNestPath()
15181518
token=lsptok(NULL,&length);/* get :pathkeys */
15191519
local_node->path.pathkeys=nodeRead(true);/* now read it */
15201520

1521-
/*
1522-
* Not sure if these are nodes; they're declared as "struct path *".
1523-
* For now, i'll just print the addresses.
1524-
*
1525-
* GJK: Since I am parsing this stuff, I'll just ignore the addresses,
1526-
* and initialize these pointers to NULL.
1527-
*/
1528-
15291521
token=lsptok(NULL,&length);/* get :outerjoinpath */
1530-
token=lsptok(NULL,&length);/* get @ */
1531-
token=lsptok(NULL,&length);/* now read it */
1532-
1533-
local_node->outerjoinpath=NULL;
1522+
local_node->outerjoinpath=nodeRead(true);/* now read it */
15341523

15351524
token=lsptok(NULL,&length);/* get :innerjoinpath */
1536-
token=lsptok(NULL,&length);/* get @ */
1537-
token=lsptok(NULL,&length);/* now read it */
1525+
local_node->innerjoinpath=nodeRead(true);/* now read it */
15381526

1539-
local_node->innerjoinpath=NULL;
1527+
token=lsptok(NULL,&length);/* get :joinrestrictinfo */
1528+
local_node->joinrestrictinfo=nodeRead(true);/* now read it */
15401529

15411530
returnlocal_node;
15421531
}
@@ -1569,25 +1558,14 @@ _readMergePath()
15691558
token=lsptok(NULL,&length);/* get :pathkeys */
15701559
local_node->jpath.path.pathkeys=nodeRead(true);/* now read it */
15711560

1572-
/*
1573-
* Not sure if these are nodes; they're declared as "struct path *".
1574-
* For now, i'll just print the addresses.
1575-
*
1576-
* GJK: Since I am parsing this stuff, I'll just ignore the addresses,
1577-
* and initialize these pointers to NULL.
1578-
*/
1579-
15801561
token=lsptok(NULL,&length);/* get :outerjoinpath */
1581-
token=lsptok(NULL,&length);/* get @ */
1582-
token=lsptok(NULL,&length);/* now read it */
1583-
1584-
local_node->jpath.outerjoinpath=NULL;
1562+
local_node->jpath.outerjoinpath=nodeRead(true);/* now read it */
15851563

15861564
token=lsptok(NULL,&length);/* get :innerjoinpath */
1587-
token=lsptok(NULL,&length);/* get @ */
1588-
token=lsptok(NULL,&length);/* now read it */
1565+
local_node->jpath.innerjoinpath=nodeRead(true);/* now read it */
15891566

1590-
local_node->jpath.innerjoinpath=NULL;
1567+
token=lsptok(NULL,&length);/* get :joinrestrictinfo */
1568+
local_node->jpath.joinrestrictinfo=nodeRead(true);/* now read it */
15911569

15921570
token=lsptok(NULL,&length);/* get :path_mergeclauses */
15931571
local_node->path_mergeclauses=nodeRead(true);/* now read it */
@@ -1629,25 +1607,14 @@ _readHashPath()
16291607
token=lsptok(NULL,&length);/* get :pathkeys */
16301608
local_node->jpath.path.pathkeys=nodeRead(true);/* now read it */
16311609

1632-
/*
1633-
* Not sure if these are nodes; they're declared as "struct path *".
1634-
* For now, i'll just print the addresses.
1635-
*
1636-
* GJK: Since I am parsing this stuff, I'll just ignore the addresses,
1637-
* and initialize these pointers to NULL.
1638-
*/
1639-
16401610
token=lsptok(NULL,&length);/* get :outerjoinpath */
1641-
token=lsptok(NULL,&length);/* get @ */
1642-
token=lsptok(NULL,&length);/* now read it */
1643-
1644-
local_node->jpath.outerjoinpath=NULL;
1611+
local_node->jpath.outerjoinpath=nodeRead(true);/* now read it */
16451612

16461613
token=lsptok(NULL,&length);/* get :innerjoinpath */
1647-
token=lsptok(NULL,&length);/* get @ */
1648-
token=lsptok(NULL,&length);/* now read it */
1614+
local_node->jpath.innerjoinpath=nodeRead(true);/* now read it */
16491615

1650-
local_node->jpath.innerjoinpath=NULL;
1616+
token=lsptok(NULL,&length);/* get :joinrestrictinfo */
1617+
local_node->jpath.joinrestrictinfo=nodeRead(true);/* now read it */
16511618

16521619
token=lsptok(NULL,&length);/* get :path_hashclauses */
16531620
local_node->path_hashclauses=nodeRead(true);/* now read it */

0 commit comments

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