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

Commit9dbb0ef

Browse files
committed
Optmizer cleanup
1 parentd5a785c commit9dbb0ef

30 files changed

+161
-162
lines changed

‎src/backend/nodes/equalfuncs.c

Lines changed: 2 additions & 2 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.28 1999/02/1003:52:35 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.29 1999/02/1021:02:33 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -305,7 +305,7 @@ _equalRestrictInfo(RestrictInfo * a, RestrictInfo * b)
305305
* RelOptInfo is a subclass of Node.
306306
*/
307307
staticbool
308-
_equalRelOptInfo(RelOptInfo*a,RelOptInfo*b)
308+
_equalRelOptInfo(RelOptInfo*a,RelOptInfo*b)
309309
{
310310
Assert(IsA(a,RelOptInfo));
311311
Assert(IsA(b,RelOptInfo));

‎src/backend/nodes/freefuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.5 1999/02/1003:52:35 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.6 1999/02/1021:02:33 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -714,7 +714,7 @@ _freeArrayRef(ArrayRef *node)
714714
* ----------------
715715
*/
716716
staticvoid
717-
_freeRelOptInfo(RelOptInfo*node)
717+
_freeRelOptInfo(RelOptInfo*node)
718718
{
719719
/* ----------------
720720
*free remainder of node

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

Lines changed: 12 additions & 12 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.26 1999/02/03 21:16:19 momjian Exp $
8+
* $Id: geqo_eval.c,v 1.27 1999/02/10 21:02:34 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -50,12 +50,12 @@
5050
#include"optimizer/geqo_paths.h"
5151

5252

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,JoinInfo*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,JoinInfo*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(RelOptInfo*joinrel,RelOptInfo*outer_rel,RelOptInfo*inner_rel);
58+
staticvoidgeqo_joinrel_size(RelOptInfo*joinrel,RelOptInfo*outer_rel,RelOptInfo*inner_rel);
5959
staticRelOptInfo*geqo_nth(intstop,List*rels);
6060

6161
/*
@@ -99,7 +99,7 @@ geqo_eval(Query *root, Gene *tour, int num_gene)
9999
* Returns a new join relation incorporating all joins in a left-sided tree.
100100
*/
101101
RelOptInfo*
102-
gimme_tree(Query*root,Gene*tour,intrel_count,intnum_gene,RelOptInfo*outer_rel)
102+
gimme_tree(Query*root,Gene*tour,intrel_count,intnum_gene,RelOptInfo*outer_rel)
103103
{
104104
RelOptInfo*inner_rel;/* current relation */
105105
intbase_rel_index;
@@ -189,7 +189,7 @@ gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo * ou
189189
*/
190190

191191
staticList*
192-
gimme_clause_joins(Query*root,RelOptInfo*outer_rel,RelOptInfo*inner_rel)
192+
gimme_clause_joins(Query*root,RelOptInfo*outer_rel,RelOptInfo*inner_rel)
193193
{
194194
List*join_list=NIL;
195195
List*i=NIL;
@@ -240,7 +240,7 @@ gimme_clause_joins(Query *root, RelOptInfo * outer_rel, RelOptInfo * inner_rel)
240240
*/
241241

242242
staticRelOptInfo*
243-
gimme_clauseless_join(RelOptInfo*outer_rel,RelOptInfo*inner_rel)
243+
gimme_clauseless_join(RelOptInfo*outer_rel,RelOptInfo*inner_rel)
244244
{
245245
returninit_join_rel(outer_rel,inner_rel, (JoinInfo*)NULL);
246246
}
@@ -257,7 +257,7 @@ gimme_clauseless_join(RelOptInfo * outer_rel, RelOptInfo * inner_rel)
257257
* Returns the new join relation node.
258258
*/
259259
staticRelOptInfo*
260-
init_join_rel(RelOptInfo*outer_rel,RelOptInfo*inner_rel,JoinInfo*joininfo)
260+
init_join_rel(RelOptInfo*outer_rel,RelOptInfo*inner_rel,JoinInfo*joininfo)
261261
{
262262
RelOptInfo*joinrel=makeNode(RelOptInfo);
263263
List*joinrel_joininfo_list=NIL;
@@ -635,7 +635,7 @@ geqo_final_join_rels(List *join_rel_list)
635635
* Modifies the superrels field of rel
636636
*/
637637
staticvoid
638-
add_superrels(RelOptInfo*rel,RelOptInfo*super_rel)
638+
add_superrels(RelOptInfo*rel,RelOptInfo*super_rel)
639639
{
640640
rel->superrels=lappend(rel->superrels,super_rel);
641641
}
@@ -650,7 +650,7 @@ add_superrels(RelOptInfo * rel, RelOptInfo * super_rel)
650650
* Returns non-nil if rel1 and rel2 do not overlap.
651651
*/
652652
staticbool
653-
nonoverlap_rels(RelOptInfo*rel1,RelOptInfo*rel2)
653+
nonoverlap_rels(RelOptInfo*rel1,RelOptInfo*rel2)
654654
{
655655
returnnonoverlap_sets(rel1->relids,rel2->relids);
656656
}
@@ -678,7 +678,7 @@ nonoverlap_sets(List *s1, List *s2)
678678
* long join queries; so get logarithm of size when MAXINT overflow;
679679
*/
680680
staticvoid
681-
geqo_joinrel_size(RelOptInfo*joinrel,RelOptInfo*outer_rel,RelOptInfo*inner_rel)
681+
geqo_joinrel_size(RelOptInfo*joinrel,RelOptInfo*outer_rel,RelOptInfo*inner_rel)
682682
{
683683
Costtemp;
684684
intntuples;

‎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.13 1999/02/1003:52:37 momjian Exp $
8+
* $Id: geqo_misc.c,v 1.14 1999/02/1021:02:34 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,RelOptInfo*rel)
265+
geqo_print_rel(Query*root,RelOptInfo*rel)
266266
{
267267
List*l;
268268

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

Lines changed: 6 additions & 6 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_paths.c,v 1.14 1999/02/09 03:51:15 momjian Exp $
8+
* $Id: geqo_paths.c,v 1.15 1999/02/10 21:02:35 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -28,8 +28,8 @@
2828
#include"optimizer/geqo_paths.h"
2929

3030

31-
staticList*geqo_prune_rel(RelOptInfo*rel,List*other_rels);
32-
staticPath*set_paths(RelOptInfo*rel,Path*unorderedpath);
31+
staticList*geqo_prune_rel(RelOptInfo*rel,List*other_rels);
32+
staticPath*set_paths(RelOptInfo*rel,Path*unorderedpath);
3333

3434
/*
3535
* geqo-prune-rels--
@@ -65,7 +65,7 @@ geqo_prune_rels(List *rel_list)
6565
*
6666
*/
6767
staticList*
68-
geqo_prune_rel(RelOptInfo*rel,List*other_rels)
68+
geqo_prune_rel(RelOptInfo*rel,List*other_rels)
6969
{
7070
List*i=NIL;
7171
List*t_list=NIL;
@@ -102,7 +102,7 @@ geqo_prune_rel(RelOptInfo * rel, List *other_rels)
102102
*
103103
*/
104104
void
105-
geqo_rel_paths(RelOptInfo*rel)
105+
geqo_rel_paths(RelOptInfo*rel)
106106
{
107107
List*y=NIL;
108108
Path*path= (Path*)NULL;
@@ -134,7 +134,7 @@ geqo_rel_paths(RelOptInfo * rel)
134134
*
135135
*/
136136
staticPath*
137-
set_paths(RelOptInfo*rel,Path*unorderedpath)
137+
set_paths(RelOptInfo*rel,Path*unorderedpath)
138138
{
139139
Path*cheapest=set_cheapest(rel,rel->pathlist);
140140

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.8 1998/09/01 04:29:24 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.9 1999/02/10 21:02:35 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -41,7 +41,7 @@
4141
*/
4242

4343
void
44-
minspantree(Query*root,List*join_rels,RelOptInfo*garel)
44+
minspantree(Query*root,List*join_rels,RelOptInfo*garel)
4545
{
4646
intnumber_of_rels=length(root->base_rel_list);
4747
intnumber_of_joins=length(join_rels);

‎src/backend/optimizer/path/allpaths.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/allpaths.c,v 1.26 1999/02/1003:52:38 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.27 1999/02/1021:02:36 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -47,7 +47,7 @@ static void find_rel_paths(Query *root, List *rels);
4747
staticList*find_join_paths(Query*root,List*outer_rels,intlevels_needed);
4848

4949
#ifdefOPTIMIZER_DEBUG
50-
staticvoiddebug_print_rel(Query*root,RelOptInfo*rel);
50+
staticvoiddebug_print_rel(Query*root,RelOptInfo*rel);
5151

5252
#endif
5353

@@ -405,7 +405,7 @@ print_path(Query *root, Path *path, int indent)
405405
}
406406

407407
staticvoid
408-
debug_print_rel(Query*root,RelOptInfo*rel)
408+
debug_print_rel(Query*root,RelOptInfo*rel)
409409
{
410410
List*l;
411411

‎src/backend/optimizer/path/costsize.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/costsize.c,v 1.28 1999/02/1003:52:39 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.29 1999/02/1021:02:37 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -360,7 +360,7 @@ cost_hashjoin(Cost outercost,
360360
* Returns the size.
361361
*/
362362
int
363-
compute_rel_size(RelOptInfo*rel)
363+
compute_rel_size(RelOptInfo*rel)
364364
{
365365
Costtemp;
366366
inttemp1;
@@ -383,7 +383,7 @@ compute_rel_size(RelOptInfo * rel)
383383
* Returns the width of the tuple as a fixnum.
384384
*/
385385
int
386-
compute_rel_width(RelOptInfo*rel)
386+
compute_rel_width(RelOptInfo*rel)
387387
{
388388
returncompute_targetlist_width(get_actual_tlist(rel->targetlist));
389389
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp