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

Commit82682ff

Browse files
committed
optimizer rename
1 parentba2883b commit82682ff

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

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

Lines changed: 4 additions & 4 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/allpaths.c,v 1.35 1999/02/15 03:22:03 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.36 1999/02/15 03:59:27 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -211,7 +211,7 @@ make_one_rel_by_joins(Query *root, List *outer_rels, int levels_needed)
211211
* involves the join relation to the joininfo list of the
212212
* other relation
213213
*/
214-
add_new_joininfos(root,joined_rels,outer_rels);
214+
add_rel_to_rel_joininfos(root,joined_rels,outer_rels);
215215
}
216216
#endif
217217

@@ -236,12 +236,12 @@ make_one_rel_by_joins(Query *root, List *outer_rels, int levels_needed)
236236
* prune rels that have been completely incorporated into new
237237
* join rels
238238
*/
239-
outer_rels=prune_oldrels(outer_rels);
239+
outer_rels=del_rels_all_bushy_inactive(outer_rels);
240240

241241
/*
242242
* merge join rels if then contain the same list of base rels
243243
*/
244-
outer_rels=merge_joinrels(joined_rels,outer_rels);
244+
outer_rels=merge_rels_with_same_relids(joined_rels,outer_rels);
245245
root->join_rel_list=outer_rels;
246246
}
247247
else

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

Lines changed: 4 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/joinrels.c,v 1.23 1999/02/15 03:22:05 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.24 1999/02/15 03:59:27 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -373,7 +373,7 @@ new_joininfo_list(List *joininfo_list, List *join_relids)
373373
}
374374

375375
/*
376-
*add_new_joininfos
376+
*add_rel_to_rel_joininfos
377377
* For each new join relation, create new joininfos that
378378
* use the join relation as inner relation, and add
379379
* the new joininfos to those rel nodes that still
@@ -384,7 +384,7 @@ new_joininfo_list(List *joininfo_list, List *join_relids)
384384
* Modifies the joininfo field of appropriate rel nodes.
385385
*/
386386
void
387-
add_new_joininfos(Query*root,List*joinrels,List*outerrels)
387+
add_rel_to_rel_joininfos(Query*root,List*joinrels,List*outerrels)
388388
{
389389
List*xjoinrel=NIL;
390390
List*xrelid=NIL;
@@ -462,6 +462,7 @@ add_new_joininfos(Query *root, List *joinrels, List *outerrels)
462462
}
463463
}
464464
}
465+
465466
foreach(xrel,outerrels)
466467
{
467468
RelOptInfo*rel= (RelOptInfo*)lfirst(xrel);

‎src/backend/optimizer/path/prune.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/optimizer/path/Attic/prune.c,v 1.33 1999/02/15 03:22:06 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.34 1999/02/15 03:59:27 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -48,7 +48,7 @@ merge_rels_with_same_relids(List *rel_list)
4848
}
4949

5050
/*
51-
* merge_rel_with_same_relids
51+
* merge_rel_with_same_relids
5252
* Prunes those relations from 'other_rels' that are redundant with
5353
* 'rel'. A relation is redundant if it is built up of the same
5454
* relations as 'rel'. Paths for the redundant relation are merged into
@@ -108,7 +108,7 @@ rels_set_cheapest(List *rel_list)
108108

109109
#ifdefNOT_USED
110110
/*
111-
*merge_joinrels
111+
*merge_rels_with_same_relids
112112
* Given two lists of rel nodes that are already
113113
* pruned, merge them into one pruned rel node list
114114
*
@@ -118,7 +118,7 @@ rels_set_cheapest(List *rel_list)
118118
* Returns one pruned rel node list
119119
*/
120120
List*
121-
merge_joinrels(List*rel_list1,List*rel_list2)
121+
merge_rels_with_same_relids(List*rel_list1,List*rel_list2)
122122
{
123123
List*xrel=NIL;
124124

@@ -132,7 +132,7 @@ merge_joinrels(List *rel_list1, List *rel_list2)
132132
}
133133

134134
/*
135-
*prune_oldrels
135+
*del_rels_all_bushy_inactive
136136
* If all the joininfo's in a rel node are bushy_inactive,
137137
* that means that this node has been joined into
138138
* other nodes in all possible ways, therefore
@@ -144,7 +144,7 @@ merge_joinrels(List *rel_list1, List *rel_list2)
144144
* Returns a new list of rel nodes
145145
*/
146146
List*
147-
prune_oldrels(List*old_rels)
147+
del_rels_all_bushy_inactive(List*old_rels)
148148
{
149149
RelOptInfo*rel;
150150
List*joininfo_list,

‎src/include/optimizer/paths.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: paths.h,v 1.17 1999/02/15 03:22:31 momjian Exp $
10+
* $Id: paths.h,v 1.18 1999/02/15 03:59:28 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -78,7 +78,7 @@ extern MergeInfo *match_order_mergeinfo(PathOrder *ordering,
7878
* routines to determine which relations to join
7979
*/
8080
externList*make_rels_by_joins(Query*root,List*outer_rels);
81-
externvoidadd_new_joininfos(Query*root,List*joinrels,List*outerrels);
81+
externvoidadd_rel_to_rel_joininfos(Query*root,List*joinrels,List*outerrels);
8282
externList*make_rels_by_clause_joins(Query*root,RelOptInfo*outer_rel,
8383
List*joininfo_list,List*only_relids);
8484
externList*make_rels_by_clauseless_joins(RelOptInfo*outer_rel,

0 commit comments

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