You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by hu...@apache.org on 2015/12/14 03:22:24 UTC
incubator-hawq git commit: HAWQ-243. Remove deprecated GUCs related
to planner and optimizer
Repository: incubator-hawq
Updated Branches:
refs/heads/master bcd40ad82 -> 0f0983214
HAWQ-243. Remove deprecated GUCs related to planner and optimizer
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/0f098321
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/0f098321
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/0f098321
Branch: refs/heads/master
Commit: 0f09832140c98383d93126dc8b8a95409624147a
Parents: bcd40ad
Author: Ruilong Huo <rh...@pivotal.io>
Authored: Thu Dec 10 01:13:44 2015 -0800
Committer: Ruilong Huo <rh...@pivotal.io>
Committed: Mon Dec 14 10:22:03 2015 +0800
----------------------------------------------------------------------
src/backend/utils/misc/guc.c | 19 -------------------
src/backend/utils/misc/postgresql.conf.sample | 1 -
src/test/regress/expected/rangefuncs.out | 3 +--
3 files changed, 1 insertion(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0f098321/src/backend/utils/misc/guc.c
----------------------------------------------------------------------
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 869d747..debea7b 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -1722,16 +1722,6 @@ static struct config_bool ConfigureNamesBool[] =
false, NULL, NULL
},
- {
- {"enable_agg_restructure", PGC_USERSET, QUERY_TUNING_METHOD,
- gettext_noop("Deprecated: use gp_enable_multiphase_agg."),
- NULL,
- GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
- },
- &defunct_bool,
- true, NULL, NULL
- },
-
{
/* MPP-9772, MPP-9773: remove support for CREATE INDEX CONCURRENTLY */
{"gp_create_index_concurrently", PGC_USERSET, DEVELOPER_OPTIONS,
@@ -2215,15 +2205,6 @@ static struct config_bool ConfigureNamesBool[] =
},
{
- {"gp_enable_adaptive_nestloop", PGC_USERSET, QUERY_TUNING_METHOD,
- gettext_noop("Enables the planner's use of the Adaptive Join Choice operator."),
- gettext_noop("During query execution, actual outer row count determines choice of Nested or Hash Join.")
- },
- &enable_adaptive_nestloop,
- true, NULL, NULL
- },
-
- {
{"gp_is_writer", PGC_BACKEND, GP_WORKER_IDENTITY,
gettext_noop("True in a worker process which can directly update its local database segment."),
NULL,
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0f098321/src/backend/utils/misc/postgresql.conf.sample
----------------------------------------------------------------------
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index da76e55..74f6de1 100755
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -143,7 +143,6 @@ max_prepared_transactions = 250 # can be 0 or more
#enable_hashjoin = on
#enable_mergejoin = off
#enable_nestloop = off
-#gp_enable_adaptive_nestloop = on
#gp_enable_multiphase_agg = on
#gp_enable_preunique = on
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0f098321/src/test/regress/expected/rangefuncs.out
----------------------------------------------------------------------
diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out
index eab79ff..0b0be22 100755
--- a/src/test/regress/expected/rangefuncs.out
+++ b/src/test/regress/expected/rangefuncs.out
@@ -1,7 +1,6 @@
SELECT name, setting FROM pg_settings WHERE name LIKE 'enable%';
name | setting
------------------------+---------
- enable_agg_restructure | on
enable_bitmapscan | on
enable_groupagg | on
enable_hashagg | on
@@ -12,7 +11,7 @@ SELECT name, setting FROM pg_settings WHERE name LIKE 'enable%';
enable_seqscan | on
enable_sort | on
enable_tidscan | on
-(11 rows)
+(10 rows)
CREATE TABLE foo2(fooid int, f2 int);
INSERT INTO foo2 VALUES(1, 11);