1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-07 00:36:50 +03:00

MergeSort was sometimes called mergejoin and was confusing. Now

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

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.29 1998/07/18 04:22:36 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.30 1998/08/04 16:44:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -79,7 +79,7 @@ make_hashjoin(List *tlist, List *qpqual,
List *hashclauses, Plan *lefttree, Plan *righttree);
static Hash *make_hash(List *tlist, Var *hashkey, Plan *lefttree);
static MergeJoin *
make_mergesort(List *tlist, List *qpqual,
make_mergejoin(List *tlist, List *qpqual,
List *mergeclauses, Oid opcode, Oid *rightorder,
Oid *leftorder, Plan *righttree, Plan *lefttree);
static Material *
@ -584,7 +584,7 @@ create_mergejoin_node(MergePath *best_path,
inner_node = (Plan *) sorted_inner_node;
}
join_node = make_mergesort(tlist,
join_node = make_mergejoin(tlist,
qpqual,
mergeclauses,
opcode,
@ -1038,7 +1038,7 @@ make_hash(List *tlist, Var *hashkey, Plan *lefttree)
}
static MergeJoin *
make_mergesort(List *tlist,
make_mergejoin(List *tlist,
List *qpqual,
List *mergeclauses,
Oid opcode,
@ -1058,7 +1058,7 @@ make_mergesort(List *tlist,
plan->lefttree = lefttree;
plan->righttree = righttree;
node->mergeclauses = mergeclauses;
node->mergesortop = opcode;
node->mergejoinop = opcode;
node->mergerightorder = rightorder;
node->mergeleftorder = leftorder;