Skip to content

Commit 0dbfea3

Browse files
bmomjianbmomjian
committed
Remove KSQO from GUC and move file to _deadcode.
1 parent b50cbbd commit 0dbfea3

File tree

8 files changed

+11
-57
lines changed

8 files changed

+11
-57
lines changed

‎doc/src/sgml/runtime.sgml

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.118 2002/06/15 19:58:53 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.119 2002/06/16 00:09:11 momjian Exp $
33
-->
44

55
<Chapter Id="runtime">
@@ -759,34 +759,6 @@ env PGOPTIONS='-c geqo=off' psql
759759
</listitem>
760760
</varlistentry>
761761

762-
<varlistentry>
763-
<term><varname>KSQO</varname> (<type>boolean</type>)</term>
764-
<listitem>
765-
<para>
766-
The <firstterm>Key Set Query Optimizer</firstterm>
767-
(<acronym>KSQO</acronym>) causes the query planner to convert
768-
queries whose <literal>WHERE</> clause contains many OR'ed AND
769-
clauses (such as <literal>WHERE (a=1 AND b=2) OR (a=2 AND b=3)
770-
...</literal>) into a union query. This method can be faster
771-
than the default implementation, but it doesn't necessarily give
772-
exactly the same results, since <literal>UNION</> implicitly
773-
adds a <literal>SELECT DISTINCT</> clause to eliminate identical
774-
output rows. <acronym>KSQO</acronym> is commonly used when
775-
working with products like <productname>Microsoft
776-
Access</productname>, which tend to generate queries of this
777-
form.
778-
</para>
779-
780-
<para>
781-
The <acronym>KSQO</acronym> algorithm used to be absolutely
782-
essential for queries with many OR'ed AND clauses, but in
783-
<productname>PostgreSQL</productname> 7.0 and later the standard
784-
planner handles these queries fairly successfully; hence the
785-
default is off.
786-
</para>
787-
</listitem>
788-
</varlistentry>
789-
790762
<varlistentry>
791763
<term><varname>RANDOM_PAGE_COST</varname> (<type>floating point</type>)</term>
792764
<listitem>

‎src/backend/optimizer/plan/planner.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.120 2002/06/13 15:10:25 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.121 2002/06/16 00:09:11 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -145,11 +145,6 @@ subquery_planner(Query *parse, double tuple_fraction)
145145
PlannerQueryLevel++;
146146
PlannerInitPlan = NIL;
147147

148-
#ifdef ENABLE_KEY_SET_QUERY
149-
/* this should go away sometime soon */
150-
transformKeySetQuery(parse);
151-
#endif
152-
153148
/*
154149
* Check to see if any subqueries in the rangetable can be merged into
155150
* this query.

‎src/backend/optimizer/prep/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
# Makefile for optimizer/prep
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.12 2000/08/31 16:10:13 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.13 2002/06/16 00:09:11 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
subdir = src/backend/optimizer/prep
1212
top_builddir = ../../../..
1313
include $(top_builddir)/src/Makefile.global
1414

15-
OBJS = prepqual.o preptlist.o prepunion.o prepkeyset.o
15+
OBJS = prepqual.o preptlist.o prepunion.o
1616

1717
all: SUBSYS.o
1818

‎src/backend/optimizer/prep/prepkeyset.c renamed to ‎src/backend/optimizer/prep/_deadcode/prepkeyset.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
*
99
*-------------------------------------------------------------------------
1010
*/
11-
11+
12+
/* THIS FILE WAS USED FOR KSQO, WHICH IS DISABLED NOW. bjm 2002-06-15 */
13+
1214
#include "postgres.h"
1315
#include "optimizer/planmain.h"
1416

‎src/backend/utils/misc/guc.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* command, configuration file, and command line options.
66
* See src/backend/utils/misc/README for more information.
77
*
8-
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.69 2002/05/17 20:32:29 tgl Exp $
8+
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.70 2002/06/16 00:09:12 momjian Exp $
99
*
1010
* Copyright 2000 by PostgreSQL Global Development Group
1111
* Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -312,11 +312,6 @@ static struct config_bool
312312
{ "enable_hashjoin", PGC_USERSET }, &enable_hashjoin,
313313
true, NULL, NULL
314314
},
315-
316-
{
317-
{ "ksqo", PGC_USERSET }, &_use_keyset_query_optimizer,
318-
false, NULL, NULL
319-
},
320315
{
321316
{ "geqo", PGC_USERSET }, &enable_geqo,
322317
true, NULL, NULL

‎src/backend/utils/misc/postgresql.conf.sample

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@
8989
#enable_mergejoin = true
9090
#enable_hashjoin = true
9191

92-
#ksqo = false
93-
9492
#effective_cache_size = 1000 # default in 8k pages
9593
#random_page_cost = 4
9694
#cpu_tuple_cost = 0.01

‎src/bin/psql/tab-complete.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.49 2002/06/15 19:43:47 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.50 2002/06/16 00:09:12 momjian Exp $
77
*/
88

99
/*----------------------------------------------------------------------
@@ -226,7 +226,6 @@ psql_completion(char *text, int start, int end)
226226
"enable_nestloop",
227227
"enable_mergejoin",
228228
"enable_hashjoin",
229-
"ksqo",
230229
"geqo",
231230
"fsync",
232231
"server_min_messages",
@@ -695,7 +694,7 @@ psql_completion(char *text, int start, int end)
695694

696695
COMPLETE_WITH_LIST(my_list);
697696
}
698-
else if (strcasecmp(prev2_wd, "GEQO") == 0 || strcasecmp(prev2_wd, "KSQO") == 0)
697+
else if (strcasecmp(prev2_wd, "GEQO") == 0)
699698
{
700699
char *my_list[] = {"ON", "OFF", "DEFAULT", NULL};
701700

‎src/include/optimizer/planmain.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: planmain.h,v 1.57 2002/05/18 02:25:50 tgl Exp $
10+
* $Id: planmain.h,v 1.58 2002/06/16 00:09:12 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -62,11 +62,4 @@ extern List *join_references(List *clauses, List *rtable,
6262
Index acceptable_rel);
6363
extern void fix_opids(Node *node);
6464

65-
/*
66-
* prep/prepkeyset.c
67-
*/
68-
extern bool _use_keyset_query_optimizer;
69-
70-
extern void transformKeySetQuery(Query *origNode);
71-
7265
#endif /* PLANMAIN_H */

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy