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

Commit584f943

Browse files
committed
Rename Rel to RelOptInfo.
1 parent3a132e9 commit584f943

38 files changed

+295
-295
lines changed

‎src/backend/nodes/copyfuncs.c

Lines changed: 5 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/nodes/copyfuncs.c,v 1.43 1998/07/15 14:54:31 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.44 1998/07/18 04:22:25 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -998,10 +998,10 @@ _copyArrayRef(ArrayRef *from)
998998
** planner/path/xfunc.c accordingly!!!
999999
**-- JMH, 8/2/93
10001000
*/
1001-
staticRel*
1002-
_copyRel(Rel*from)
1001+
staticRelOptInfo*
1002+
_copyRel(RelOptInfo*from)
10031003
{
1004-
Rel*newnode=makeNode(Rel);
1004+
RelOptInfo*newnode=makeNode(RelOptInfo);
10051005
inti,
10061006
len;
10071007

@@ -1734,7 +1734,7 @@ copyObject(void *from)
17341734
/*
17351735
* RELATION NODES
17361736
*/
1737-
caseT_Rel:
1737+
caseT_RelOptInfo:
17381738
retval=_copyRel(from);
17391739
break;
17401740
caseT_Path:

‎src/backend/nodes/outfuncs.c

Lines changed: 5 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/nodes/outfuncs.c,v 1.40 1998/07/15 14:54:32 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.41 1998/07/18 04:22:26 momjian Exp $
1111
*
1212
* NOTES
1313
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -990,11 +990,11 @@ _outEState(StringInfo str, EState *node)
990990
*Stuff from relation.h
991991
*/
992992
staticvoid
993-
_outRel(StringInfostr,Rel*node)
993+
_outRel(StringInfostr,RelOptInfo*node)
994994
{
995995
charbuf[500];
996996

997-
appendStringInfo(str,"REL ");
997+
appendStringInfo(str,"RELOPTINFO ");
998998

999999
appendStringInfo(str," :relids ");
10001000
_outIntList(str,node->relids);
@@ -1058,7 +1058,7 @@ _outRel(StringInfo str, Rel *node)
10581058
staticvoid
10591059
_outTargetEntry(StringInfostr,TargetEntry*node)
10601060
{
1061-
appendStringInfo(str,"TLE ");
1061+
appendStringInfo(str,"TARGETENTRY ");
10621062
appendStringInfo(str," :resdom ");
10631063
_outNode(str,node->resdom);
10641064

@@ -1787,7 +1787,7 @@ _outNode(StringInfo str, void *obj)
17871787
caseT_EState:
17881788
_outEState(str,obj);
17891789
break;
1790-
caseT_Rel:
1790+
caseT_RelOptInfo:
17911791
_outRel(str,obj);
17921792
break;
17931793
caseT_TargetEntry:

‎src/backend/nodes/readfuncs.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/readfuncs.c,v 1.32 1998/07/15 14:54:34 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.33 1998/07/18 04:22:26 momjian Exp $
1111
*
1212
* NOTES
1313
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -1221,14 +1221,14 @@ _readEState()
12211221
*_readRel
12221222
* ----------------
12231223
*/
1224-
staticRel*
1224+
staticRelOptInfo*
12251225
_readRel()
12261226
{
1227-
Rel*local_node;
1227+
RelOptInfo*local_node;
12281228
char*token;
12291229
intlength;
12301230

1231-
local_node=makeNode(Rel);
1231+
local_node=makeNode(RelOptInfo);
12321232

12331233
token=lsptok(NULL,&length);/* get :relids */
12341234
local_node->relids=
@@ -1990,9 +1990,9 @@ parsePlanString(void)
19901990
return_value=_readParam();
19911991
elseif (!strncmp(token,"ESTATE",length))
19921992
return_value=_readEState();
1993-
elseif (!strncmp(token,"REL",length))
1993+
elseif (!strncmp(token,"RELOPTINFO",length))
19941994
return_value=_readRel();
1995-
elseif (!strncmp(token,"TLE",length))
1995+
elseif (!strncmp(token,"TARGETENTRY",length))
19961996
return_value=_readTargetEntry();
19971997
elseif (!strncmp(token,"RTE",length))
19981998
return_value=_readRangeTblEntry();

‎src/backend/optimizer/geqo/geqo_eval.c

Lines changed: 32 additions & 32 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: geqo_eval.c,v 1.19 1998/06/15 19:28:35 momjian Exp $
8+
* $Id: geqo_eval.c,v 1.20 1998/07/18 04:22:27 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -50,13 +50,13 @@
5050
#include"optimizer/geqo_paths.h"
5151

5252

53-
staticList*gimme_clause_joins(Query*root,Rel*outer_rel,Rel*inner_rel);
54-
staticRel*gimme_clauseless_join(Rel*outer_rel,Rel*inner_rel);
55-
staticRel*init_join_rel(Rel*outer_rel,Rel*inner_rel,JInfo*joininfo);
53+
staticList*gimme_clause_joins(Query*root,RelOptInfo*outer_rel,RelOptInfo*inner_rel);
54+
staticRelOptInfo*gimme_clauseless_join(RelOptInfo*outer_rel,RelOptInfo*inner_rel);
55+
staticRelOptInfo*init_join_rel(RelOptInfo*outer_rel,RelOptInfo*inner_rel,JInfo*joininfo);
5656
staticList*new_join_tlist(List*tlist,List*other_relids,intfirst_resdomno);
5757
staticList*new_joininfo_list(List*joininfo_list,List*join_relids);
58-
staticvoidgeqo_joinrel_size(Rel*joinrel,Rel*outer_rel,Rel*inner_rel);
59-
staticRel*geqo_nth(intstop,List*rels);
58+
staticvoidgeqo_joinrel_size(RelOptInfo*joinrel,RelOptInfo*outer_rel,RelOptInfo*inner_rel);
59+
staticRelOptInfo*geqo_nth(intstop,List*rels);
6060

6161
/*
6262
* geqo_eval--
@@ -66,7 +66,7 @@ static Rel *geqo_nth(int stop, List *rels);
6666
Cost
6767
geqo_eval(Query*root,Gene*tour,intnum_gene)
6868
{
69-
Rel*joinrel;
69+
RelOptInfo*joinrel;
7070
Costfitness;
7171
List*temp;
7272

@@ -98,22 +98,22 @@ geqo_eval(Query *root, Gene *tour, int num_gene)
9898
*
9999
* Returns a new join relation incorporating all joins in a left-sided tree.
100100
*/
101-
Rel*
102-
gimme_tree(Query*root,Gene*tour,intrel_count,intnum_gene,Rel*outer_rel)
101+
RelOptInfo*
102+
gimme_tree(Query*root,Gene*tour,intrel_count,intnum_gene,RelOptInfo*outer_rel)
103103
{
104-
Rel*inner_rel;/* current relation */
104+
RelOptInfo*inner_rel;/* current relation */
105105
intbase_rel_index;
106106

107107
List*new_rels=NIL;
108-
Rel*new_rel=NULL;
108+
RelOptInfo*new_rel=NULL;
109109

110110
if (rel_count<num_gene)
111111
{/* tree not yet finished */
112112

113113
/* tour[0] = 3; tour[1] = 1; tour[2] = 2 */
114114
base_rel_index= (int)tour[rel_count];
115115

116-
inner_rel= (Rel*)geqo_nth(base_rel_index,root->base_relation_list_);
116+
inner_rel= (RelOptInfo*)geqo_nth(base_rel_index,root->base_relation_list_);
117117

118118
if (rel_count==0)
119119
{/* processing first join with
@@ -158,7 +158,7 @@ gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, Rel *outer_rel)
158158
}
159159

160160
/* get essential new relation */
161-
new_rel= (Rel*)lfirst(new_rels);
161+
new_rel= (RelOptInfo*)lfirst(new_rels);
162162
rel_count++;
163163

164164
/* process new_rel->cheapestpath, new_rel->unorderedpath */
@@ -189,7 +189,7 @@ gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, Rel *outer_rel)
189189
*/
190190

191191
staticList*
192-
gimme_clause_joins(Query*root,Rel*outer_rel,Rel*inner_rel)
192+
gimme_clause_joins(Query*root,RelOptInfo*outer_rel,RelOptInfo*inner_rel)
193193
{
194194
List*join_list=NIL;
195195
List*i=NIL;
@@ -198,7 +198,7 @@ gimme_clause_joins(Query *root, Rel *outer_rel, Rel *inner_rel)
198198
foreach(i,joininfo_list)
199199
{
200200
JInfo*joininfo= (JInfo*)lfirst(i);
201-
Rel*rel=NULL;
201+
RelOptInfo*rel=NULL;
202202

203203
if (!joininfo->inactive)
204204
{
@@ -239,8 +239,8 @@ gimme_clause_joins(Query *root, Rel *outer_rel, Rel *inner_rel)
239239
* Returns a new join relation.
240240
*/
241241

242-
staticRel*
243-
gimme_clauseless_join(Rel*outer_rel,Rel*inner_rel)
242+
staticRelOptInfo*
243+
gimme_clauseless_join(RelOptInfo*outer_rel,RelOptInfo*inner_rel)
244244
{
245245
return (init_join_rel(outer_rel,inner_rel, (JInfo*)NULL));
246246
}
@@ -256,10 +256,10 @@ gimme_clauseless_join(Rel *outer_rel, Rel *inner_rel)
256256
*
257257
* Returns the new join relation node.
258258
*/
259-
staticRel*
260-
init_join_rel(Rel*outer_rel,Rel*inner_rel,JInfo*joininfo)
259+
staticRelOptInfo*
260+
init_join_rel(RelOptInfo*outer_rel,RelOptInfo*inner_rel,JInfo*joininfo)
261261
{
262-
Rel*joinrel=makeNode(Rel);
262+
RelOptInfo*joinrel=makeNode(RelOptInfo);
263263
List*joinrel_joininfo_list=NIL;
264264
List*new_outer_tlist;
265265
List*new_inner_tlist;
@@ -457,7 +457,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
457457
List*xrel=NIL;
458458
List*xjoininfo=NIL;
459459

460-
Rel*rel;
460+
RelOptInfo*rel;
461461
List*relids;
462462

463463
List*super_rels;
@@ -466,7 +466,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
466466

467467
foreach(xjoinrel,joinrels)
468468
{
469-
Rel*joinrel= (Rel*)lfirst(xjoinrel);
469+
RelOptInfo*joinrel= (RelOptInfo*)lfirst(xjoinrel);
470470

471471
foreach(xrelid,joinrel->relids)
472472
{
@@ -477,7 +477,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
477477
*/
478478

479479
/*
480-
* ! BUG BUG ! Relid relid = (Relid)lfirst(xrelid);Rel *rel =
480+
* ! BUG BUG ! Relid relid = (Relid)lfirst(xrelid);RelOptInfo *rel =
481481
* get_join_rel(root, relid);
482482
*/
483483

@@ -502,7 +502,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
502502
}
503503
foreach(xjoinrel,joinrels)
504504
{
505-
Rel*joinrel= (Rel*)lfirst(xjoinrel);
505+
RelOptInfo*joinrel= (RelOptInfo*)lfirst(xjoinrel);
506506

507507
foreach(xjoininfo,joinrel->joininfo)
508508
{
@@ -516,7 +516,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
516516
{
517517

518518
/*
519-
* ! BUG BUG ! Relid relid = (Relid)lfirst(xrelid);Rel
519+
* ! BUG BUG ! Relid relid = (Relid)lfirst(xrelid);RelOptInfo
520520
* *rel = get_join_rel(root, relid);
521521
*/
522522

@@ -549,7 +549,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
549549

550550
foreach(xsuper_rel,super_rels)
551551
{
552-
Rel*super_rel= (Rel*)lfirst(xsuper_rel);
552+
RelOptInfo*super_rel= (RelOptInfo*)lfirst(xsuper_rel);
553553

554554
if (nonoverlap_rels(super_rel,joinrel))
555555
{
@@ -584,7 +584,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
584584
}
585585
foreach(xrel,outerrels)
586586
{
587-
rel= (Rel*)lfirst(xrel);
587+
rel= (RelOptInfo*)lfirst(xrel);
588588
rel->superrels=NIL;
589589
}
590590
}
@@ -611,7 +611,7 @@ geqo_final_join_rels(List *join_rel_list)
611611
*/
612612
foreach(xrel,join_rel_list)
613613
{
614-
Rel*rel= (Rel*)lfirst(xrel);
614+
RelOptInfo*rel= (RelOptInfo*)lfirst(xrel);
615615
List*xjoininfo=NIL;
616616
boolfinal= true;
617617

@@ -645,7 +645,7 @@ geqo_final_join_rels(List *join_rel_list)
645645
* Modifies the superrels field of rel
646646
*/
647647
staticvoid
648-
add_superrels(Rel*rel,Rel*super_rel)
648+
add_superrels(RelOptInfo*rel,RelOptInfo*super_rel)
649649
{
650650
rel->superrels=lappend(rel->superrels,super_rel);
651651
}
@@ -660,7 +660,7 @@ add_superrels(Rel *rel, Rel *super_rel)
660660
* Returns non-nil if rel1 and rel2 do not overlap.
661661
*/
662662
staticbool
663-
nonoverlap_rels(Rel*rel1,Rel*rel2)
663+
nonoverlap_rels(RelOptInfo*rel1,RelOptInfo*rel2)
664664
{
665665
return (nonoverlap_sets(rel1->relids,rel2->relids));
666666
}
@@ -688,7 +688,7 @@ nonoverlap_sets(List *s1, List *s2)
688688
* long join queries; so get logarithm of size when MAXINT overflow;
689689
*/
690690
staticvoid
691-
geqo_joinrel_size(Rel*joinrel,Rel*outer_rel,Rel*inner_rel)
691+
geqo_joinrel_size(RelOptInfo*joinrel,RelOptInfo*outer_rel,RelOptInfo*inner_rel)
692692
{
693693
Costtemp;
694694
intntuples;
@@ -715,7 +715,7 @@ geqo_log(double x, double b)
715715
return (log(x) /log(b));
716716
}
717717

718-
staticRel*
718+
staticRelOptInfo*
719719
geqo_nth(intstop,List*rels)
720720
{
721721
List*r;

‎src/backend/optimizer/geqo/geqo_main.c

Lines changed: 4 additions & 4 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: geqo_main.c,v 1.7 1998/02/26 04:32:22 momjian Exp $
9+
* $Id: geqo_main.c,v 1.8 1998/07/18 04:22:27 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -63,7 +63,7 @@
6363
* similar to a constrained Traveling Salesman Problem (TSP)
6464
*/
6565

66-
Rel*
66+
RelOptInfo*
6767
geqo(Query*root)
6868
{
6969
intgeneration;
@@ -98,7 +98,7 @@ geqo(Query *root)
9898
status_interval;
9999

100100
Gene*best_tour;
101-
Rel*best_rel;
101+
RelOptInfo*best_rel;
102102

103103
/*Plan *best_plan; */
104104

@@ -254,7 +254,7 @@ geqo(Query *root)
254254
best_tour= (Gene*)pool->data[0].string;
255255

256256
/* root->join_relation_list_ will be modified during this ! */
257-
best_rel= (Rel*)gimme_tree(root,best_tour,0,pool->string_length,NULL);
257+
best_rel= (RelOptInfo*)gimme_tree(root,best_tour,0,pool->string_length,NULL);
258258

259259
/* DBG: show the query plan
260260
print_plan(best_plan, root);

‎src/backend/optimizer/geqo/geqo_misc.c

Lines changed: 2 additions & 2 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: geqo_misc.c,v 1.8 1998/06/15 19:28:35 momjian Exp $
8+
* $Id: geqo_misc.c,v 1.9 1998/07/18 04:22:28 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -262,7 +262,7 @@ geqo_print_path(Query *root, Path *path, int indent)
262262
}
263263

264264
void
265-
geqo_print_rel(Query*root,Rel*rel)
265+
geqo_print_rel(Query*root,RelOptInfo*rel)
266266
{
267267
List*l;
268268

0 commit comments

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