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

Commitd9be0ff

Browse files
committed
MergeSort was sometimes called mergejoin and was confusing. Now
it is now only mergejoin.
1 parent7db9ea5 commitd9be0ff

File tree

23 files changed

+117
-116
lines changed

23 files changed

+117
-116
lines changed

‎src/backend/commands/explain.c

Lines changed: 5 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/commands/explain.c,v 1.22 1998/08/0415:00:26 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.23 1998/08/0416:43:54 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -17,6 +17,7 @@
1717
#include<postgres.h>
1818

1919
#include<nodes/plannodes.h>
20+
#include<nodes/print.h>
2021
#include<tcop/tcopprot.h>
2122
#include<lib/stringinfo.h>
2223
#include<commands/explain.h>
@@ -81,10 +82,7 @@ ExplainQuery(Query *query, bool verbose, CommandDest dest)
8182
es->rtable=query->rtable;
8283

8384
if (es->printNodes)
84-
{
85-
pprint(plan);/* display in postmaster log file */
8685
s=nodeToString(plan);
87-
}
8886

8987
if (es->printCost)
9088
{
@@ -108,6 +106,9 @@ ExplainQuery(Query *query, bool verbose, CommandDest dest)
108106
elog(NOTICE,"%.*s",ELOG_MAXLEN-64,s);
109107
len-=ELOG_MAXLEN-64;
110108
}
109+
if (es->printNodes)
110+
pprint(plan);/* display in postmaster log file */
111+
111112
pfree(es);
112113
}
113114

‎src/backend/nodes/copyfuncs.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/nodes/copyfuncs.c,v 1.45 1998/08/01 22:12:05 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.46 1998/08/04 16:43:56 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -335,7 +335,7 @@ _copyMergeJoin(MergeJoin *from)
335335
*/
336336
Node_Copy(from,newnode,mergeclauses);
337337

338-
newnode->mergesortop=from->mergesortop;
338+
newnode->mergejoinop=from->mergejoinop;
339339

340340
newnode->mergerightorder= (Oid*)palloc(sizeof(Oid)*2);
341341
newnode->mergerightorder[0]=from->mergerightorder[0];
@@ -1334,7 +1334,7 @@ _copyCInfo(CInfo *from)
13341334
newnode->notclause=from->notclause;
13351335

13361336
Node_Copy(from,newnode,indexids);
1337-
Node_Copy(from,newnode,mergesortorder);
1337+
Node_Copy(from,newnode,mergejoinorder);
13381338
newnode->hashjoinoperator=from->hashjoinoperator;
13391339
newnode->cinfojoinid=listCopy(from->cinfojoinid);
13401340

@@ -1424,7 +1424,7 @@ _copyJInfo(JInfo *from)
14241424
newnode->otherrels=listCopy(from->otherrels);
14251425
Node_Copy(from,newnode,jinfoclauseinfo);
14261426

1427-
newnode->mergesortable=from->mergesortable;
1427+
newnode->mergejoinable=from->mergejoinable;
14281428
newnode->hashjoinable=from->hashjoinable;
14291429
newnode->inactive=from->inactive;
14301430

‎src/backend/nodes/equalfuncs.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/nodes/equalfuncs.c,v 1.17 1998/08/01 22:12:07 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.18 1998/08/04 16:43:58 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -293,7 +293,7 @@ _equalCInfo(CInfo *a, CInfo *b)
293293
if (a->notclause!=b->notclause)
294294
return (false);
295295
#ifdefEqualMergeOrderExists
296-
if (!EqualMergeOrder(a->mergesortorder,b->mergesortorder))
296+
if (!EqualMergeOrder(a->mergejoinorder,b->mergejoinorder))
297297
return (false);
298298
#endif
299299
if (a->hashjoinoperator!=b->hashjoinoperator)
@@ -538,7 +538,7 @@ _equalJInfo(JInfo *a, JInfo *b)
538538
return (false);
539539
if (!equal((a->jinfoclauseinfo), (b->jinfoclauseinfo)))
540540
return (false);
541-
if (a->mergesortable!=b->mergesortable)
541+
if (a->mergejoinable!=b->mergejoinable)
542542
return (false);
543543
if (a->hashjoinable!=b->hashjoinable)
544544
return (false);

‎src/backend/nodes/outfuncs.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/outfuncs.c,v 1.42 1998/08/01 22:12:08 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.43 1998/08/04 16:43:59 momjian Exp $
1111
*
1212
* NOTES
1313
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -403,7 +403,7 @@ _outMergeJoin(StringInfo str, MergeJoin *node)
403403
appendStringInfo(str," :mergeclauses ");
404404
_outNode(str,node->mergeclauses);
405405

406-
sprintf(buf," :mergesortop %u ",node->mergesortop);
406+
sprintf(buf," :mergejoinop %u ",node->mergejoinop);
407407
appendStringInfo(str,buf);
408408

409409
sprintf(buf," :mergerightorder %u ",node->mergerightorder[0]);
@@ -1373,8 +1373,8 @@ _outCInfo(StringInfo str, CInfo *node)
13731373
appendStringInfo(str," :indexids ");
13741374
_outNode(str,node->indexids);
13751375

1376-
appendStringInfo(str," :mergesortorder ");
1377-
_outNode(str,node->mergesortorder);
1376+
appendStringInfo(str," :mergejoinorder ");
1377+
_outNode(str,node->mergejoinorder);
13781378

13791379
sprintf(buf," :hashjoinoperator %u ",node->hashjoinoperator);
13801380
appendStringInfo(str,buf);
@@ -1434,8 +1434,8 @@ _outJInfo(StringInfo str, JInfo *node)
14341434
appendStringInfo(str," :jinfoclauseinfo ");
14351435
_outNode(str,node->jinfoclauseinfo);
14361436

1437-
appendStringInfo(str," :mergesortable ");
1438-
appendStringInfo(str,node->mergesortable ?"true" :"false");
1437+
appendStringInfo(str," :mergejoinable ");
1438+
appendStringInfo(str,node->mergejoinable ?"true" :"false");
14391439
appendStringInfo(str," :hashjoinable ");
14401440
appendStringInfo(str,node->hashjoinable ?"true" :"false");
14411441

‎src/backend/nodes/readfuncs.c

Lines changed: 9 additions & 9 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.34 1998/08/01 22:12:09 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.35 1998/08/04 16:44:00 momjian Exp $
1111
*
1212
* NOTES
1313
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -407,9 +407,9 @@ _readMergeJoin()
407407
token=lsptok(NULL,&length);/* eat :mergeclauses */
408408
local_node->mergeclauses=nodeRead(true);/* now read it */
409409

410-
token=lsptok(NULL,&length);/* eat :mergesortop */
411-
token=lsptok(NULL,&length);/* getmergesortop */
412-
local_node->mergesortop=atol(token);
410+
token=lsptok(NULL,&length);/* eat :mergejoinop */
411+
token=lsptok(NULL,&length);/* getmergejoinop */
412+
local_node->mergejoinop=atol(token);
413413

414414
return (local_node);
415415
}
@@ -1794,8 +1794,8 @@ _readCInfo()
17941794
token=lsptok(NULL,&length);/* get :indexids */
17951795
local_node->indexids=nodeRead(true);/* now read it */
17961796

1797-
token=lsptok(NULL,&length);/* get :mergesortorder */
1798-
local_node->mergesortorder= (MergeOrder*)nodeRead(true);
1797+
token=lsptok(NULL,&length);/* get :mergejoinorder */
1798+
local_node->mergejoinorder= (MergeOrder*)nodeRead(true);
17991799

18001800
token=lsptok(NULL,&length);/* get :hashjoinoperator */
18011801
token=lsptok(NULL,&length);/* now read it */
@@ -1880,12 +1880,12 @@ _readJInfo()
18801880
token=lsptok(NULL,&length);/* get :jinfoclauseinfo */
18811881
local_node->jinfoclauseinfo=nodeRead(true);/* now read it */
18821882

1883-
token=lsptok(NULL,&length);/* get :mergesortable */
1883+
token=lsptok(NULL,&length);/* get :mergejoinable */
18841884

18851885
if (!strncmp(token,"true",4))
1886-
local_node->mergesortable= true;
1886+
local_node->mergejoinable= true;
18871887
else
1888-
local_node->mergesortable= false;
1888+
local_node->mergejoinable= false;
18891889

18901890
token=lsptok(NULL,&length);/* get :hashjoinable */
18911891

‎src/backend/optimizer/geqo/geqo_eval.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_eval.c,v 1.20 1998/07/18 04:22:27 momjian Exp $
8+
* $Id: geqo_eval.c,v 1.21 1998/08/04 16:44:02 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -422,8 +422,8 @@ new_joininfo_list(List *joininfo_list, List *join_relids)
422422
joininfo->otherrels;
423423
other_joininfo->jinfoclauseinfo=
424424
joininfo->jinfoclauseinfo;
425-
other_joininfo->mergesortable=
426-
joininfo->mergesortable;
425+
other_joininfo->mergejoinable=
426+
joininfo->mergejoinable;
427427
other_joininfo->hashjoinable=
428428
joininfo->hashjoinable;
429429
other_joininfo->inactive= false;
@@ -509,7 +509,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
509509
JInfo*joininfo= (JInfo*)lfirst(xjoininfo);
510510
List*other_rels=joininfo->otherrels;
511511
List*clause_info=joininfo->jinfoclauseinfo;
512-
boolmergesortable=joininfo->mergesortable;
512+
boolmergejoinable=joininfo->mergejoinable;
513513
boolhashjoinable=joininfo->hashjoinable;
514514

515515
foreach(xrelid,other_rels)
@@ -541,7 +541,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
541541

542542
new_joininfo->otherrels=joinrel->relids;
543543
new_joininfo->jinfoclauseinfo=clause_info;
544-
new_joininfo->mergesortable=mergesortable;
544+
new_joininfo->mergejoinable=mergejoinable;
545545
new_joininfo->hashjoinable=hashjoinable;
546546
new_joininfo->inactive= false;
547547
rel->joininfo=
@@ -570,7 +570,7 @@ geqo_add_new_joininfos(Query *root, List *joinrels, List *outerrels)
570570

571571
new_joininfo->otherrels=new_relids;
572572
new_joininfo->jinfoclauseinfo=clause_info;
573-
new_joininfo->mergesortable=mergesortable;
573+
new_joininfo->mergejoinable=mergejoinable;
574574
new_joininfo->hashjoinable=hashjoinable;
575575
new_joininfo->inactive= false;
576576
joinrel->joininfo=

‎src/backend/optimizer/path/costsize.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/optimizer/path/costsize.c,v 1.22 1998/07/18 04:22:31 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.23 1998/08/04 16:44:04 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -47,7 +47,7 @@ bool_enable_indexscan_ = true;
4747
bool_enable_sort_= true;
4848
bool_enable_hash_= true;
4949
bool_enable_nestloop_= true;
50-
bool_enable_mergesort_= true;
50+
bool_enable_mergejoin_= true;
5151
bool_enable_hashjoin_= true;
5252

5353
Cost_cpu_page_wight_=_CPU_PAGE_WEIGHT_;
@@ -259,7 +259,7 @@ cost_nestloop(Cost outercost,
259259
}
260260

261261
/*
262-
*cost_mergesort--
262+
*cost_mergejoin--
263263
* 'outercost' and 'innercost' are the (disk+cpu) costs of scanning the
264264
*outer and inner relations
265265
* 'outersortkeys' and 'innersortkeys' are lists of the keys to be used
@@ -273,7 +273,7 @@ cost_nestloop(Cost outercost,
273273
*
274274
*/
275275
Cost
276-
cost_mergesort(Costoutercost,
276+
cost_mergejoin(Costoutercost,
277277
Costinnercost,
278278
List*outersortkeys,
279279
List*innersortkeys,
@@ -284,7 +284,7 @@ cost_mergesort(Cost outercost,
284284
{
285285
Costtemp=0;
286286

287-
if (!_enable_mergesort_)
287+
if (!_enable_mergejoin_)
288288
temp+=_disable_cost_;
289289

290290
temp+=outercost;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.24 1998/08/0400:42:08 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.25 1998/08/0416:44:06 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1251,7 +1251,7 @@ index_innerjoin(Query *root, RelOptInfo *rel, List *clausegroup_list,
12511251
*
12521252
* 'rel' is the relation for which 'index' is defined
12531253
* 'clausegroup-list' is the list of clause groups (lists of clauseinfo
1254-
*nodes) grouped bymergesortorder
1254+
*nodes) grouped bymergejoinorder
12551255
* 'join' is a flag indicating whether or not the clauses are join
12561256
*clauses
12571257
*
@@ -1284,7 +1284,7 @@ create_index_paths(Query *root,
12841284
clauseinfo= (CInfo*)lfirst(j);
12851285
if (!(join_clause_p((Node*)clauseinfo->clause)&&
12861286
equal_path_merge_ordering(index->ordering,
1287-
clauseinfo->mergesortorder)))
1287+
clauseinfo->mergejoinorder)))
12881288
temp= false;
12891289
}
12901290

0 commit comments

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