MergeSort was sometimes called mergejoin and was confusing. Now

it is now only mergejoin.

5 files changed, 13 insertions, 13 deletions

diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 9541e64b14e..5de80471b3d 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plannodes.h,v 1.16 1998/07/15 14:54:39 momjian Exp $
+ * $Id: plannodes.h,v 1.17 1998/08/04 16:44:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -211,7 +211,7 @@ typedef struct MergeJoin
 {
 	Join		join;
 	List	   *mergeclauses;
-	Oid			mergesortop;
+	Oid			mergejoinop;
 	Oid		   *mergerightorder;/* inner sort operator */
 	Oid		   *mergeleftorder; /* outer sort operator */
 	MergeJoinState *mergestate;
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index baee1b1d079..11871611445 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relation.h,v 1.8 1998/07/18 04:22:45 momjian Exp $
+ * $Id: relation.h,v 1.9 1998/08/04 16:44:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -215,8 +215,8 @@ typedef struct CInfo
 	bool		notclause;
 	List	   *indexids;
 
-	/* mergesort only */
-	MergeOrder *mergesortorder;
+	/* mergejoin only */
+	MergeOrder *mergejoinorder;
 
 	/* hashjoin only */
 	Oid			hashjoinoperator;
@@ -247,7 +247,7 @@ typedef struct JInfo
 	NodeTag		type;
 	List	   *otherrels;
 	List	   *jinfoclauseinfo;
-	bool		mergesortable;
+	bool		mergejoinable;
 	bool		hashjoinable;
 	bool		inactive;
 } JInfo;
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index 0c1a88b586a..f0f716c012a 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: cost.h,v 1.9 1998/07/18 04:22:46 momjian Exp $
+ * $Id: cost.h,v 1.10 1998/08/04 16:44:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@ extern bool _enable_indexscan_;
 extern bool _enable_sort_;
 extern bool _enable_hash_;
 extern bool _enable_nestloop_;
-extern bool _enable_mergesort_;
+extern bool _enable_mergejoin_;
 extern bool _enable_hashjoin_;
 
 extern Cost cost_seqscan(int relid, int relpages, int reltuples);
@@ -40,7 +40,7 @@ extern Cost
 cost_nestloop(Cost outercost, Cost innercost, int outertuples,
 			  int innertuples, int outerpages, bool is_indexjoin);
 extern Cost
-cost_mergesort(Cost outercost, Cost innercost,
+cost_mergejoin(Cost outercost, Cost innercost,
 			   List *outersortkeys, List *innersortkeys,
 		   int outersize, int innersize, int outerwidth, int innerwidth);
 extern Cost
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index d8369f7e746..a24acd89cb7 100644
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pathnode.h,v 1.8 1998/07/18 04:22:51 momjian Exp $
+ * $Id: pathnode.h,v 1.9 1998/08/04 16:44:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,7 +33,7 @@ extern JoinPath *
 create_nestloop_path(RelOptInfo *joinrel, RelOptInfo *outer_rel,
 					 Path *outer_path, Path *inner_path, List *keys);
 extern MergePath *
-create_mergesort_path(RelOptInfo *joinrel, int outersize,
+create_mergejoin_path(RelOptInfo *joinrel, int outersize,
 		 int innersize, int outerwidth, int innerwidth, Path *outer_path,
 					  Path *inner_path, List *keys, MergeOrder *order,
 		   List *mergeclauses, List *outersortkeys, List *innersortkeys);
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index e7408dd34fd..cd42f227116 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lsyscache.h,v 1.11 1998/07/12 21:29:40 momjian Exp $
+ * $Id: lsyscache.h,v 1.12 1998/08/04 16:44:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,7 @@ extern int32 get_atttypmod(Oid relid, AttrNumber attnum);
 extern RegProcedure get_opcode(Oid opid);
 extern char *get_opname(Oid opid);
 extern bool
-op_mergesortable(Oid opid, Oid ltype, Oid rtype,
+op_mergejoinable(Oid opid, Oid ltype, Oid rtype,
 				 Oid *leftOp, Oid *rightOp);
 extern Oid	op_hashjoinable(Oid opid, Oid ltype, Oid rtype);
 extern Oid	get_commutator(Oid opid);