Remove KSQO from GUC and move file to _deadcode.

7 files changed, 10 insertions, 28 deletions

diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 7e1c7ffdc00..f1668670369 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.120 2002/06/13 15:10:25 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.121 2002/06/16 00:09:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -145,11 +145,6 @@ subquery_planner(Query *parse, double tuple_fraction)
 	PlannerQueryLevel++;
 	PlannerInitPlan = NIL;
 
-#ifdef ENABLE_KEY_SET_QUERY
-	/* this should go away sometime soon */
-	transformKeySetQuery(parse);
-#endif
-
 	/*
 	 * Check to see if any subqueries in the rangetable can be merged into
 	 * this query.
diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile
index d78240666c6..60925de441f 100644
--- a/src/backend/optimizer/prep/Makefile
+++ b/src/backend/optimizer/prep/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for optimizer/prep
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.12 2000/08/31 16:10:13 petere Exp $
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.13 2002/06/16 00:09:11 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,7 +12,7 @@ subdir = src/backend/optimizer/prep
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = prepqual.o preptlist.o prepunion.o prepkeyset.o
+OBJS = prepqual.o preptlist.o prepunion.o
 
 all: SUBSYS.o
 
diff --git a/src/backend/optimizer/prep/prepkeyset.c b/src/backend/optimizer/prep/_deadcode/prepkeyset.c
index 76921d8e9ad..b7f7ca169e8 100644
--- a/src/backend/optimizer/prep/prepkeyset.c
+++ b/src/backend/optimizer/prep/_deadcode/prepkeyset.c
@@ -8,7 +8,9 @@
  *
  *-------------------------------------------------------------------------
  */
-
+ 
+/* THIS FILE WAS USED FOR KSQO, WHICH IS DISABLED NOW.  bjm  2002-06-15 */
+ 
 #include "postgres.h"
 #include "optimizer/planmain.h"
 
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 15c8f6f4806..53503f4b413 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -5,7 +5,7 @@
  * command, configuration file, and command line options.
  * See src/backend/utils/misc/README for more information.
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.69 2002/05/17 20:32:29 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.70 2002/06/16 00:09:12 momjian Exp $
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -312,11 +312,6 @@ static struct config_bool
 		{ "enable_hashjoin", PGC_USERSET }, &enable_hashjoin,
 		true, NULL, NULL
 	},
-
-	{
-		{ "ksqo", PGC_USERSET }, &_use_keyset_query_optimizer,
-		false, NULL, NULL
-	},
 	{
 		{ "geqo", PGC_USERSET }, &enable_geqo,
 		true, NULL, NULL
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index c2a3c1e7077..00dced8d394 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -89,8 +89,6 @@
 #enable_mergejoin = true
 #enable_hashjoin = true
 
-#ksqo = false
-
 #effective_cache_size = 1000	# default in 8k pages
 #random_page_cost = 4
 #cpu_tuple_cost = 0.01
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 0d0909faa49..521742ea1dd 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.49 2002/06/15 19:43:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.50 2002/06/16 00:09:12 momjian Exp $
  */
 
 /*----------------------------------------------------------------------
@@ -226,7 +226,6 @@ psql_completion(char *text, int start, int end)
 		"enable_nestloop",
 		"enable_mergejoin",
 		"enable_hashjoin",
-		"ksqo",
 		"geqo",
 		"fsync",
 		"server_min_messages",
@@ -695,7 +694,7 @@ psql_completion(char *text, int start, int end)
 
 			COMPLETE_WITH_LIST(my_list);
 		}
-		else if (strcasecmp(prev2_wd, "GEQO") == 0 || strcasecmp(prev2_wd, "KSQO") == 0)
+		else if (strcasecmp(prev2_wd, "GEQO") == 0)
 		{
 			char	   *my_list[] = {"ON", "OFF", "DEFAULT", NULL};
 
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 29319a14856..4c6f9e3699d 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planmain.h,v 1.57 2002/05/18 02:25:50 tgl Exp $
+ * $Id: planmain.h,v 1.58 2002/06/16 00:09:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -62,11 +62,4 @@ extern List *join_references(List *clauses, List *rtable,
 							 Index acceptable_rel);
 extern void fix_opids(Node *node);
 
-/*
- * prep/prepkeyset.c
- */
-extern bool _use_keyset_query_optimizer;
-
-extern void transformKeySetQuery(Query *origNode);
-
 #endif   /* PLANMAIN_H */