Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 18fbe41

Browse files
bmomjianbmomjian
committed
More optimizer renaming HInfo -> HashInfo.
1 parent 9322950 commit 18fbe41

File tree

11 files changed

+61
-61
lines changed

11 files changed

+61
-61
lines changed

‎src/backend/nodes/copyfuncs.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.59 1999/02/03 21:16:17 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.60 1999/02/04 01:46:53 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1378,13 +1378,13 @@ _copyJoinMethod(JoinMethod *from)
13781378
}
13791379

13801380
/* ----------------
1381-
* _copyHInfo
1381+
* _copyHashInfo
13821382
* ----------------
13831383
*/
1384-
static HInfo *
1385-
_copyHInfo(HInfo *from)
1384+
static HashInfo *
1385+
_copyHashInfo(HashInfo *from)
13861386
{
1387-
HInfo *newnode = makeNode(HInfo);
1387+
HashInfo *newnode = makeNode(HashInfo);
13881388

13891389
/* ----------------
13901390
* copy remainder of node
@@ -1797,8 +1797,8 @@ copyObject(void *from)
17971797
case T_JoinMethod:
17981798
retval = _copyJoinMethod(from);
17991799
break;
1800-
case T_HInfo:
1801-
retval = _copyHInfo(from);
1800+
case T_HashInfo:
1801+
retval = _copyHashInfo(from);
18021802
break;
18031803
case T_MInfo:
18041804
retval = _copyMInfo(from);

‎src/backend/nodes/equalfuncs.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.22 1999/02/03 20:15:22 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.23 1999/02/04 01:46:54 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -476,10 +476,10 @@ _equalMergeOrder(MergeOrder *a, MergeOrder *b)
476476
}
477477

478478
static bool
479-
_equalHInfo(HInfo *a, HInfo *b)
479+
_equalHashInfo(HashInfo *a, HashInfo *b)
480480
{
481-
Assert(IsA(a, HInfo));
482-
Assert(IsA(b, HInfo));
481+
Assert(IsA(a, HashInfo));
482+
Assert(IsA(b, HashInfo));
483483

484484
if (a->hashop != b->hashop)
485485
return false;
@@ -696,8 +696,8 @@ equal(void *a, void *b)
696696
case T_MergeOrder:
697697
retval = _equalMergeOrder(a, b);
698698
break;
699-
case T_HInfo:
700-
retval = _equalHInfo(a, b);
699+
case T_HashInfo:
700+
retval = _equalHashInfo(a, b);
701701
break;
702702
case T_IndexScan:
703703
retval = _equalIndexScan(a, b);

‎src/backend/nodes/outfuncs.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: outfuncs.c,v 1.63 1999/02/03 20:15:22 momjian Exp $
8+
* $Id: outfuncs.c,v 1.64 1999/02/04 01:46:54 momjian Exp $
99
*
1010
* NOTES
1111
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -1137,10 +1137,10 @@ _outJoinMethod(StringInfo str, JoinMethod *node)
11371137
}
11381138

11391139
/*
1140-
* HInfo is a subclass of JoinMethod.
1140+
* HashInfo is a subclass of JoinMethod.
11411141
*/
11421142
static void
1143-
_outHInfo(StringInfo str, HInfo *node)
1143+
_outHashInfo(StringInfo str, HashInfo *node)
11441144
{
11451145
appendStringInfo(str, " HASHINFO :hashop %u :jmkeys ", node->hashop);
11461146
_outNode(str, node->jmethod.jmkeys);
@@ -1578,8 +1578,8 @@ _outNode(StringInfo str, void *obj)
15781578
case T_JoinMethod:
15791579
_outJoinMethod(str, obj);
15801580
break;
1581-
case T_HInfo:
1582-
_outHInfo(str, obj);
1581+
case T_HashInfo:
1582+
_outHashInfo(str, obj);
15831583
break;
15841584
case T_JoinInfo:
15851585
_outJoinInfo(str, obj);

‎src/backend/nodes/readfuncs.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.46 1999/02/03 21:16:18 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.47 1999/02/04 01:46:54 momjian Exp $
1111
*
1212
* NOTES
1313
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -1906,19 +1906,19 @@ _readJoinMethod()
19061906
}
19071907

19081908
/* ----------------
1909-
* _readHInfo
1909+
* _readHashInfo
19101910
*
1911-
* HInfo is a subclass of JoinMethod.
1911+
* HashInfo is a subclass of JoinMethod.
19121912
* ----------------
19131913
*/
1914-
static HInfo *
1915-
_readHInfo()
1914+
static HashInfo *
1915+
_readHashInfo()
19161916
{
1917-
HInfo *local_node;
1917+
HashInfo *local_node;
19181918
char *token;
19191919
int length;
19201920

1921-
local_node = makeNode(HInfo);
1921+
local_node = makeNode(HashInfo);
19221922

19231923
token = lsptok(NULL, &length); /* get :hashop */
19241924
token = lsptok(NULL, &length); /* now read it */
@@ -2094,7 +2094,7 @@ parsePlanString(void)
20942094
else if (!strncmp(token, "JOININFO", length))
20952095
return_value = _readJoinInfo();
20962096
else if (!strncmp(token, "HINFO", length))
2097-
return_value = _readHInfo();
2097+
return_value = _readHashInfo();
20982098
else if (!strncmp(token, "ITER", length))
20992099
return_value = _readIter();
21002100
else if (!strncmp(token, "QUERY", length))

‎src/backend/optimizer/README

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,9 @@ planner()
9393

9494
Optimizer Structures
9595
--------------------
96-
Path - info about every way to access a relation(sequential, index)
97-
PathOrder - info about every ordering (sort, merge of relations)
98-
RelOptInfo - info about every relation
99-
JoinInfo - info about join combinations
100-
RestrictInfo - info about restrictions
96+
RelOptInfo - info about every relation
97+
RestrictInfo - info about restrictions
98+
JoinInfo - info about join combinations
99+
Path - info about every way to access a relation(sequential, index)
100+
PathOrder - info about every ordering (sort, merge of relations)
101+

‎src/backend/optimizer/path/hashutils.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.9 1999/02/03 21:16:25 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.10 1999/02/04 01:46:57 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -20,7 +20,7 @@
2020
#include "optimizer/clauses.h"
2121

2222

23-
static HInfo *match_hashop_hashinfo(Oid hashop, List *hashinfo_list);
23+
static HashInfo *match_hashop_hashinfo(Oid hashop, List *hashinfo_list);
2424

2525
/*
2626
* group-clauses-by-hashop--
@@ -54,7 +54,7 @@ group_clauses_by_hashop(List *restrictinfo_list,
5454
*/
5555
if (hashjoinop)
5656
{
57-
HInfo *xhashinfo = (HInfo *) NULL;
57+
HashInfo *xhashinfo = (HashInfo *) NULL;
5858
Expr *clause = restrictinfo->clause;
5959
Var *leftop = get_leftop(clause);
6060
Var *rightop = get_rightop(clause);
@@ -77,7 +77,7 @@ group_clauses_by_hashop(List *restrictinfo_list,
7777

7878
if (xhashinfo == NULL)
7979
{
80-
xhashinfo = makeNode(HInfo);
80+
xhashinfo = makeNode(HashInfo);
8181
xhashinfo->hashop = hashjoinop;
8282

8383
xhashinfo->jmethod.jmkeys = NIL;
@@ -105,21 +105,21 @@ group_clauses_by_hashop(List *restrictinfo_list,
105105
* Returns the node if it exists.
106106
*
107107
*/
108-
static HInfo *
108+
static HashInfo *
109109
match_hashop_hashinfo(Oid hashop, List *hashinfo_list)
110110
{
111111
Oid key = 0;
112-
HInfo *xhashinfo = (HInfo *) NULL;
112+
HashInfo *xhashinfo = (HashInfo *) NULL;
113113
List *i = NIL;
114114

115115
foreach(i, hashinfo_list)
116116
{
117-
xhashinfo = (HInfo *) lfirst(i);
117+
xhashinfo = (HashInfo *) lfirst(i);
118118
key = xhashinfo->hashop;
119119
if (hashop == key)
120120
{ /* found */
121121
return xhashinfo; /* should be a hashinfo node ! */
122122
}
123123
}
124-
return (HInfo *) NIL;
124+
return (HashInfo *) NIL;
125125
}

‎src/backend/optimizer/path/joinpath.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.12 1999/02/03 21:16:27 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.13 1999/02/04 01:46:57 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -579,7 +579,7 @@ hash_inner_and_outer(RelOptInfo * joinrel,
579579
RelOptInfo * innerrel,
580580
List *hashinfo_list)
581581
{
582-
HInfo *xhashinfo = (HInfo *) NULL;
582+
HashInfo *xhashinfo = (HashInfo *) NULL;
583583
List *hjoin_list = NIL;
584584
HashPath *temp_node = (HashPath *) NULL;
585585
List *i = NIL;
@@ -589,7 +589,7 @@ hash_inner_and_outer(RelOptInfo * joinrel,
589589

590590
foreach(i, hashinfo_list)
591591
{
592-
xhashinfo = (HInfo *) lfirst(i);
592+
xhashinfo = (HashInfo *) lfirst(i);
593593
outerkeys = extract_path_keys(((JoinMethod *) xhashinfo)->jmkeys,
594594
outerrel->targetlist,
595595
OUTER);

‎src/backend/optimizer/path/prune.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.17 1998/09/01 04:29:44 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.18 1999/02/04 01:46:58 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -29,7 +29,7 @@ static List *prune_joinrel(RelOptInfo * rel, List *other_rels);
2929
/*
3030
* prune-joinrels--
3131
* Removes any redundant relation entries from a list of rel nodes
32-
* 'rel-list'. Obviosly, the first relation can't be a duplicate.
32+
* 'rel-list'. Obviously, the first relation can't be a duplicate.
3333
*
3434
* Returns the resulting list.
3535
*
@@ -59,7 +59,7 @@ prune_joinrels(List *rel_list)
5959
*
6060
*/
6161
static List *
62-
prune_joinrel(RelOptInfo * rel, List *other_rels)
62+
prune_joinrel(RelOptInfo *rel, List *other_rels)
6363
{
6464
List *i = NIL;
6565
List *result = NIL;
@@ -135,8 +135,7 @@ prune_rel_path(RelOptInfo * rel, Path *unorderedpath)
135135
Path *cheapest = set_cheapest(rel, rel->pathlist);
136136

137137
/* don't prune if not pruneable -- JMH, 11/23/92 */
138-
if (unorderedpath != cheapest
139-
&& rel->pruneable)
138+
if (unorderedpath != cheapest && rel->pruneable)
140139
{
141140

142141
rel->unorderedpath = (Path *) NULL;

‎src/backend/optimizer/util/pathnode.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.16 1999/02/03 21:16:52 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.17 1999/02/04 01:46:59 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -62,7 +62,7 @@ path_is_cheaper(Path *path1, Path *path2)
6262
*
6363
*/
6464
Path *
65-
set_cheapest(RelOptInfo * parent_rel, List *pathlist)
65+
set_cheapest(RelOptInfo *parent_rel, List *pathlist)
6666
{
6767
List *p;
6868
Path *cheapest_so_far;
@@ -99,7 +99,7 @@ set_cheapest(RelOptInfo * parent_rel, List *pathlist)
9999
*
100100
*/
101101
List *
102-
add_pathlist(RelOptInfo * parent_rel, List *unique_paths, List *new_paths)
102+
add_pathlist(RelOptInfo *parent_rel, List *unique_paths, List *new_paths)
103103
{
104104
List *x;
105105
Path *new_path;

‎src/include/nodes/nodes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: nodes.h,v 1.36 1999/02/03 20:15:46 momjian Exp $
9+
* $Id: nodes.h,v 1.37 1999/02/04 01:47:00 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -81,7 +81,7 @@ typedef enum NodeTag
8181
T_MergeOrder,
8282
T_RestrictInfo,
8383
T_JoinMethod,
84-
T_HInfo,
84+
T_HashInfo,
8585
T_MInfo,
8686
T_JoinInfo,
8787
T_Iter,

‎src/include/nodes/relation.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: relation.h,v 1.12 1999/02/03 20:15:46 momjian Exp $
9+
* $Id: relation.h,v 1.13 1999/02/04 01:47:02 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -87,7 +87,7 @@ typedef struct RelOptInfo
8787

8888
/* materialization information */
8989
List *targetlist;
90-
List *pathlist;
90+
List *pathlist; /* Path structures */
9191
struct Path *unorderedpath;
9292
struct Path *cheapestpath;
9393
bool pruneable;
@@ -102,11 +102,11 @@ typedef struct RelOptInfo
102102

103103
/* used by various scans and joins: */
104104
Oid *ordering; /* OID of operators in sort order */
105-
List *restrictinfo; /* restriction clauses */
106-
List *joininfo; /* join clauses */
105+
List *restrictinfo; /* RestrictInfo structures */
106+
List *joininfo; /* JoinInfo structures */
107107
List *innerjoin;
108108
List *superrels;
109-
} RelOptInfo;
109+
} RelOptInfo;
110110

111111
extern Var *get_expr(TargetEntry *foo);
112112

@@ -132,7 +132,7 @@ typedef struct PathOrder
132132
{
133133
Oid *sortop;
134134
MergeOrder *merge;
135-
} ord;
135+
} ord;
136136
} PathOrder;
137137

138138
typedef struct Path
@@ -230,11 +230,11 @@ typedef struct JoinMethod
230230
List *clauses;
231231
} JoinMethod;
232232

233-
typedef struct HInfo
233+
typedef struct HashInfo
234234
{
235235
JoinMethod jmethod;
236236
Oid hashop;
237-
} HInfo;
237+
} HashInfo;
238238

239239
typedef struct MInfo
240240
{
@@ -250,7 +250,7 @@ typedef struct JoinInfo
250250
bool mergejoinable;
251251
bool hashjoinable;
252252
bool inactive;
253-
} JoinInfo;
253+
} JoinInfo;
254254

255255
typedef struct Iter
256256
{

0 commit comments

Comments
 (0)