From b4e7510e09d6e34a0af2dd2f4ec3e7d950bc4109 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 18 Feb 1999 06:01:11 +0000
Subject: Enable bushy and right-hand queries by default.

---
 src/backend/optimizer/path/joinrels.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'src/backend/optimizer/path/joinrels.c')

diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index 146584d5a1..8add86750b 100644
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.29 1999/02/18 05:26:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.30 1999/02/18 06:00:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,14 +23,6 @@
 #include "optimizer/joininfo.h"
 #include "optimizer/pathnode.h"
 
-#ifdef USE_RIGHT_SIDED_PLANS
-bool		_use_right_sided_plans_ = true;
-
-#else
-bool		_use_right_sided_plans_ = false;
-
-#endif
-
 static List *new_joininfo_list(List *joininfo_list, Relids join_relids);
 static bool nonoverlap_sets(List *s1, List *s2);
 static bool is_subset(List *s1, List *s2);
@@ -122,8 +114,7 @@ make_rels_by_clause_joins(Query *root, RelOptInfo *old_rel,
 				join_list = lappend(join_list, joined_rel);
 
 				/* Right-sided plan */
-				if (_use_right_sided_plans_ &&
-					length(old_rel->relids) > 1)
+				if (length(old_rel->relids) > 1)
 				{
 					joined_rel = make_join_rel(
 								get_base_rel(root, lfirsti(unjoined_relids)),
@@ -133,7 +124,7 @@ make_rels_by_clause_joins(Query *root, RelOptInfo *old_rel,
 				}
 			}
 
-			if (BushyPlanFlag && only_relids == NIL) /* no bushy from geqo */
+			if (only_relids == NIL) /* no bushy from geqo */
 			{
 				List *r;
 
-- 
cgit v1.2.1