database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

MergeSort was sometimes called mergejoin and was confusing. Now

Browse Source 
it is now only mergejoin.
This commit is contained in:
Bruce Momjian
1998-08-04 16:44:31 +00:00
parent 7db9ea5c1e
commit d9be0ff432
23 changed files with 117 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/nodes/copyfuncs.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.45 1998/08/01 22:12:05 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.46 1998/08/04 16:43:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -335,7 +335,7 @@ _copyMergeJoin(MergeJoin *from)
*/
Node_Copy(from, newnode, mergeclauses);
newnode->mergesortop = from->mergesortop;
newnode->mergejoinop = from->mergejoinop;
newnode->mergerightorder = (Oid *) palloc(sizeof(Oid) * 2);
newnode->mergerightorder[0] = from->mergerightorder[0];
@@ -1334,7 +1334,7 @@ _copyCInfo(CInfo *from)
newnode->notclause = from->notclause;
Node_Copy(from, newnode, indexids);
Node_Copy(from, newnode, mergesortorder);
Node_Copy(from, newnode, mergejoinorder);
newnode->hashjoinoperator = from->hashjoinoperator;
newnode->cinfojoinid = listCopy(from->cinfojoinid);
@@ -1424,7 +1424,7 @@ _copyJInfo(JInfo *from)
newnode->otherrels = listCopy(from->otherrels);
Node_Copy(from, newnode, jinfoclauseinfo);
newnode->mergesortable = from->mergesortable;
newnode->mergejoinable = from->mergejoinable;
newnode->hashjoinable = from->hashjoinable;
newnode->inactive = from->inactive;

6
src/backend/nodes/equalfuncs.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.17 1998/08/01 22:12:07 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.18 1998/08/04 16:43:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -293,7 +293,7 @@ _equalCInfo(CInfo *a, CInfo *b)
if (a->notclause != b->notclause)
return (false);
#ifdef EqualMergeOrderExists
if (!EqualMergeOrder(a->mergesortorder, b->mergesortorder))
if (!EqualMergeOrder(a->mergejoinorder, b->mergejoinorder))
return (false);
#endif
if (a->hashjoinoperator != b->hashjoinoperator)
@@ -538,7 +538,7 @@ _equalJInfo(JInfo *a, JInfo *b)
return (false);
if (!equal((a->jinfoclauseinfo), (b->jinfoclauseinfo)))
return (false);
if (a->mergesortable != b->mergesortable)
if (a->mergejoinable != b->mergejoinable)
return (false);
if (a->hashjoinable != b->hashjoinable)
return (false);

12
src/backend/nodes/outfuncs.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.42 1998/08/01 22:12:08 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.43 1998/08/04 16:43:59 momjian Exp $
*
* NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -403,7 +403,7 @@ _outMergeJoin(StringInfo str, MergeJoin *node)
appendStringInfo(str, " :mergeclauses ");
_outNode(str, node->mergeclauses);
sprintf(buf, " :mergesortop %u ", node->mergesortop);
sprintf(buf, " :mergejoinop %u ", node->mergejoinop);
appendStringInfo(str, buf);
sprintf(buf, " :mergerightorder %u ", node->mergerightorder[0]);
@@ -1373,8 +1373,8 @@ _outCInfo(StringInfo str, CInfo *node)
appendStringInfo(str, " :indexids ");
_outNode(str, node->indexids);
appendStringInfo(str, " :mergesortorder ");
_outNode(str, node->mergesortorder);
appendStringInfo(str, " :mergejoinorder ");
_outNode(str, node->mergejoinorder);
sprintf(buf, " :hashjoinoperator %u ", node->hashjoinoperator);
appendStringInfo(str, buf);
@@ -1434,8 +1434,8 @@ _outJInfo(StringInfo str, JInfo *node)
appendStringInfo(str, " :jinfoclauseinfo ");
_outNode(str, node->jinfoclauseinfo);
appendStringInfo(str, " :mergesortable ");
appendStringInfo(str, node->mergesortable ? "true" : "false");
appendStringInfo(str, " :mergejoinable ");
appendStringInfo(str, node->mergejoinable ? "true" : "false");
appendStringInfo(str, " :hashjoinable ");
appendStringInfo(str, node->hashjoinable ? "true" : "false");

18
src/backend/nodes/readfuncs.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.34 1998/08/01 22:12:09 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.35 1998/08/04 16:44:00 momjian Exp $
*
* NOTES
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -407,9 +407,9 @@ _readMergeJoin()
token = lsptok(NULL, &length); /* eat :mergeclauses */
local_node->mergeclauses = nodeRead(true); /* now read it */
token = lsptok(NULL, &length); /* eat :mergesortop */
token = lsptok(NULL, &length); /* get mergesortop */
local_node->mergesortop = atol(token);
token = lsptok(NULL, &length); /* eat :mergejoinop */
token = lsptok(NULL, &length); /* get mergejoinop */
local_node->mergejoinop = atol(token);
return (local_node);
}
@@ -1794,8 +1794,8 @@ _readCInfo()
token = lsptok(NULL, &length); /* get :indexids */
local_node->indexids = nodeRead(true); /* now read it */
token = lsptok(NULL, &length); /* get :mergesortorder */
local_node->mergesortorder = (MergeOrder *) nodeRead(true);
token = lsptok(NULL, &length); /* get :mergejoinorder */
local_node->mergejoinorder = (MergeOrder *) nodeRead(true);
token = lsptok(NULL, &length); /* get :hashjoinoperator */
token = lsptok(NULL, &length); /* now read it */
@@ -1880,12 +1880,12 @@ _readJInfo()
token = lsptok(NULL, &length); /* get :jinfoclauseinfo */
local_node->jinfoclauseinfo = nodeRead(true); /* now read it */
token = lsptok(NULL, &length); /* get :mergesortable */
token = lsptok(NULL, &length); /* get :mergejoinable */
if (!strncmp(token, "true", 4))
local_node->mergesortable = true;
local_node->mergejoinable = true;
else
local_node->mergesortable = false;
local_node->mergejoinable = false;
token = lsptok(NULL, &length); /* get :hashjoinable */