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

Commita553760

Browse files
committed
Optimizer cleanup.
1 parentead64f3 commita553760

File tree

6 files changed

+22
-21
lines changed

6 files changed

+22
-21
lines changed

‎src/backend/nodes/equalfuncs.c

Lines changed: 1 addition & 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.23 1999/02/04 01:46:54 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.24 1999/02/06 17:29:25 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -344,7 +344,6 @@ _equalPath(Path *a, Path *b)
344344
if (a->p_ordering.ord.sortop==NULL||
345345
b->p_ordering.ord.sortop==NULL)
346346
{
347-
348347
if (a->p_ordering.ord.sortop!=b->p_ordering.ord.sortop)
349348
return false;
350349
}

‎src/backend/optimizer/path/joinutils.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/Attic/joinutils.c,v 1.9 1999/02/03 21:16:27 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/joinutils.c,v 1.10 1999/02/06 17:29:26 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -218,8 +218,8 @@ match_paths_joinkeys(List *joinkeys,
218218

219219
key_match=every_func(joinkeys,path->keys,which_subkey);
220220

221-
if (equal_path_path_ordering(ordering,
222-
&path->p_ordering)&&
221+
if (equal_path_ordering(ordering,
222+
&path->p_ordering)&&
223223
length(joinkeys)==length(path->keys)&&
224224
key_match)
225225
{

‎src/backend/optimizer/path/mergeutils.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/path/Attic/mergeutils.c,v 1.12 1999/02/04 03:19:09 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.13 1999/02/06 17:29:26 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -115,7 +115,7 @@ match_order_mergeinfo(PathOrder *ordering, List *mergeinfo_list)
115115
xmergeorder=mergeinfo->m_ordering;
116116

117117
if ((ordering->ordtype==MERGE_ORDER&&
118-
equal_merge_merge_ordering(ordering->ord.merge,xmergeorder))||
118+
equal_merge_ordering(ordering->ord.merge,xmergeorder))||
119119
(ordering->ordtype==SORTOP_ORDER&&
120120
equal_path_merge_ordering(ordering->ord.sortop,xmergeorder)))
121121
{

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

Lines changed: 10 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/util/Attic/ordering.c,v 1.10 1999/02/05 19:59:30 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.11 1999/02/06 17:29:27 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -21,13 +21,13 @@
2121
staticboolequal_sortops_order(Oid*ordering1,Oid*ordering2);
2222

2323
/*
24-
* equal-path-path-ordering--
24+
* equal-path-ordering--
2525
* Returns t iff two path orderings are equal.
2626
*
2727
*/
2828
bool
29-
equal_path_path_ordering(PathOrder*path_ordering1,
30-
PathOrder*path_ordering2)
29+
equal_path_ordering(PathOrder*path_ordering1,
30+
PathOrder*path_ordering2)
3131
{
3232
if (path_ordering1==path_ordering2)
3333
return true;
@@ -83,20 +83,22 @@ equal_path_merge_ordering(Oid *path_ordering,
8383
}
8484

8585
/*
86-
* equal-merge-merge-ordering--
86+
* equal-merge-ordering--
8787
* Returns t iff two merge orderings are equal.
8888
*
8989
*/
9090
bool
91-
equal_merge_merge_ordering(MergeOrder*merge_ordering1,
91+
equal_merge_ordering(MergeOrder*merge_ordering1,
9292
MergeOrder*merge_ordering2)
9393
{
9494
returnequal(merge_ordering1,merge_ordering2);
9595
}
9696

97-
/*****************************************************************************
97+
98+
/*
99+
*sortops
98100
*
99-
*****************************************************************************/
101+
*/
100102

101103
/*
102104
* equal_sort_ops_order -

‎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.18 1999/02/04 19:20:12 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.19 1999/02/06 17:29:27 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -165,8 +165,8 @@ better_path(Path *new_path, List *unique_paths, bool *noOther)
165165
path= (Path*)lfirst(temp);
166166

167167
if (samekeys(path->keys,new_path->keys)&&
168-
equal_path_path_ordering(&path->p_ordering,
169-
&new_path->p_ordering))
168+
equal_path_ordering(&path->p_ordering,
169+
&new_path->p_ordering))
170170
{
171171
old_path=path;
172172
break;

‎src/include/optimizer/ordering.h

Lines changed: 3 additions & 3 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: ordering.h,v 1.9 1998/09/01 04:37:12 momjian Exp $
9+
* $Id: ordering.h,v 1.10 1999/02/06 17:29:30 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -15,11 +15,11 @@
1515

1616
#include<nodes/relation.h>
1717

18-
externboolequal_path_path_ordering(PathOrder*path_ordering1,
18+
externboolequal_path_ordering(PathOrder*path_ordering1,
1919
PathOrder*path_ordering2);
2020
externboolequal_path_merge_ordering(Oid*path_ordering,
2121
MergeOrder*merge_ordering);
22-
externboolequal_merge_merge_ordering(MergeOrder*merge_ordering1,
22+
externboolequal_merge_ordering(MergeOrder*merge_ordering1,
2323
MergeOrder*merge_ordering2);
2424

2525
#endif/* ORDERING_H */

0 commit comments

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