Remove dead GUC variables and forward declarations.

src/backend/cdb/cdbvars.c

@@ -62,8 +62,6 @@ bool		Debug_print_prelim_plan;	/* Shall we log argument of
 
 bool		Debug_print_slice_table;	/* Shall we log the slice table? */
 
-bool		Debug_print_dispatch_plan;	/* Shall we log the plan we'll dispatch? */
-
 bool            gp_backup_directIO = false;     /* disable\enable direct I/O dump */
 
 int             gp_backup_directIO_read_chunk_mb = 20; /* size of readChunk buffer for directIO dump */
@@ -89,8 +87,6 @@ bool		Gp_write_shared_snapshot;	/* tell the writer QE to write the
 
 bool		gp_reraise_signal=false;	/* try to dump core when we get SIGABRT & SIGSEGV */
 
-bool		gp_version_mismatch_error=true;	/* Enforce same-version on QD&QE. */
-
 bool		gp_set_proc_affinity=false; /* set processor affinity (if platform supports it) */
 
 int			gp_reject_percent_threshold; /* SREH reject % kicks off only after *
@@ -171,11 +167,6 @@ bool	gp_enable_slow_cursor_testmode = false;
  */
 bool gp_eager_hashtable_release = true;
 
-/*
- * Debug_print_combocid_detail: request details when we hit combocid limits.
- */
-bool	Debug_print_combocid_detail = false;
-
 /*
  * TCP port the Interconnect listens on for incoming connections from other
  * backends.  Assigned by initMotionLayerIPC() at process startup.  This port
@@ -203,12 +194,8 @@ int			interconnect_setup_timeout=7200;
 
 int			Gp_interconnect_type = INTERCONNECT_TYPE_UDPIFC;
 
-bool		gp_interconnect_aggressive_retry=true; /* fast-track app-level retry */
-
 bool gp_interconnect_full_crc=false; /* sanity check UDP data. */
 
-bool gp_interconnect_elide_setup=true; /* under some conditions we can eliminate the setup */
-
 bool gp_interconnect_log_stats=false; /* emit stats at log-level */
 
 bool gp_interconnect_cache_future_packets=true;
@@ -239,20 +226,12 @@ uint32 gp_interconnect_id=0;
  * Resource management
  */
 
-/*
- * gp_process_memory_cutoff (real)
- * Deprecated.  Will remove in next release.
- */
-double  gp_process_memory_cutoff;           /* SET/SHOW in units of kB */
-
-
 double gp_hashagg_respill_bias = 1;
 
 /* --------------------------------------------------------------------------------------------------
  * Greenplum Optimizer GUCs
  */
 
-bool        enable_adaptive_nestloop = true;
 double      gp_motion_cost_per_row = 0;
 int         gp_segments_for_planner = 0;
 

src/backend/utils/misc/guc_gp.c

@@ -791,16 +791,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		false, NULL, NULL
 	},
 
-	{
-		{"gp_enable_tablespace_auto_mkdir", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable tablespace code to create empty directory if necessary"),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&gp_enable_tablespace_auto_mkdir,
-		false, NULL, NULL
-	},
-
 	{
 		{"gp_enable_preunique", PGC_USERSET, QUERY_TUNING_METHOD,
 			gettext_noop("Enable 2-phase duplicate removal."),
@@ -831,16 +821,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		true, NULL, NULL
 	},
 
-	{
-		{"gp_hashagg_recalc_density", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("(Obsolete) Executor can recalculate grouping density based on pre-spill real density."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&defunct_bool,
-		true, NULL, NULL
-	},
-
 	{
 		{"gp_enable_agg_distinct", PGC_USERSET, QUERY_TUNING_METHOD,
 			gettext_noop("Enable 2-phase aggregation to compute a single distinct-qualified aggregate."),
@@ -1067,15 +1047,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		true, NULL, NULL
 	},
 
-	{
-		{"gp_enable_interconnect_aggressive_retry", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable application-level fast-track interconnect retries"),
-			NULL,
-			GUC_NO_RESET_ALL | GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&gp_interconnect_aggressive_retry,
-		true, NULL, NULL
-	},
 	{
 		{"gp_crash_recovery_abort_suppress_fatal", PGC_SUSET, DEVELOPER_OPTIONS,
 			gettext_noop("Warning about crash recovery abort transaction issue"),
@@ -1154,16 +1125,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		false, NULL, NULL
 	},
 
-	{
-		{"Debug_print_combocid_detail", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("When running into combocid limit, emit detailed snapshot information."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&Debug_print_combocid_detail,
-		false, NULL, NULL
-	},
-
 	{
 		{"gp_appendonly_verify_block_checksums", PGC_USERSET, DEVELOPER_OPTIONS,
 			gettext_noop("Verify the append-only block checksum when reading."),
@@ -1273,15 +1234,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		false, NULL, NULL
 	},
 
-	{
-		{"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."),
@@ -1349,16 +1301,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		false, NULL, NULL
 	},
 
-	{
-		{"gp_interconnect_elide_setup", PGC_USERSET, DEPRECATED_OPTIONS,
-			gettext_noop("Avoid performing full startup handshake for every statement."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE | GUC_GPDB_ADDOPT
-		},
-		&gp_interconnect_elide_setup,
-		true, NULL, NULL
-	},
-
 	{
 		{"gp_interconnect_log_stats", PGC_USERSET, QUERY_TUNING_OTHER,
 			gettext_noop("Emit statistics from the UDP-IC at the end of every statement."),
@@ -1378,16 +1320,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		true, NULL, NULL
 	},
 
-	{
-		{"gp_version_mismatch_error", PGC_USERSET, QUERY_TUNING_OTHER,
-			gettext_noop("QD/QE version string mismatches reported as an error"),
-			NULL,
-			GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
-		},
-		&gp_version_mismatch_error,
-		true, NULL, NULL
-	},
-
 	{
 		{"gp_external_grant_privileges", PGC_POSTMASTER, EXTERNAL_TABLES,
 			gettext_noop("Enable non superusers to create http or gpfdist external tables."),
@@ -4298,26 +4230,6 @@ struct config_int ConfigureNamesInt_gp[] =
 		32, 4, 1000000, NULL, NULL
 	},
 
-	{
-		{"gp_hashagg_spillbatch_min", PGC_USERSET, GP_ARRAY_TUNING,
-			gettext_noop("(Obsolete) Minimum number of spill batches of HashAgg"),
-			gettext_noop("Controlling number of spill batches, if too small, hashagg may respill"),
-			GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
-		},
-		&gp_hashagg_spillbatch_min,
-		0, 0, 1000000, NULL, NULL
-	},
-
-	{
-		{"gp_hashagg_spillbatch_max", PGC_USERSET, GP_ARRAY_TUNING,
-			gettext_noop("(Obsolete) Maximum number of spill batches of HashAgg"),
-			gettext_noop("Controlling number of spill batches, if too big, hashagg spill I/O will be slow"),
-			GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
-		},
-		&gp_hashagg_spillbatch_max,
-		0, 0, 1000000, NULL, NULL
-	},
-
 	{
 		{"gp_hashjoin_bloomfilter", PGC_USERSET, GP_ARRAY_TUNING,
 			gettext_noop("Use bloomfilter in hash join"),
@@ -4441,15 +4353,6 @@ struct config_int ConfigureNamesInt_gp[] =
 		32, 0, 1024, NULL, NULL
 	},
 
-	{
-		{"gp_dbg_flags", PGC_USERSET, QUERY_TUNING_OTHER,
-			gettext_noop("Experimental feature: Generic sort flags."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE | GUC_GPDB_ADDOPT
-		},
-		&gp_dbg_flags,
-		0, 0, INT_MAX, NULL, NULL
-	},
 	{
 		{"gp_statistics_blocks_target", PGC_USERSET, STATS_ANALYZE,
 			gettext_noop("The number of blocks to be sampled to estimate reltuples/relpages for heap tables."),
@@ -4834,16 +4737,6 @@ struct config_real ConfigureNamesReal_gp[] =
 		DEFAULT_CURSOR_TUPLE_FRACTION, 0.0, 1.0, NULL, NULL
 	},
 
-	{
-		{"gp_process_memory_cutoff", PGC_USERSET, RESOURCES_MEM,
-			gettext_noop("Virtual memory limit per process, in kilobytes."),
-			gettext_noop("0 for no limit.  Process is terminated if limit is exceeded."),
-			GUC_UNIT_KB | GUC_NO_SHOW_ALL
-		},
-		&gp_process_memory_cutoff,
-		0, 0, SIZE_MAX / 2 / 1024, NULL, NULL,
-	},
-
 	{
 		{"gp_workfile_limit_per_segment", PGC_POSTMASTER, RESOURCES,
 			gettext_noop("Maximum disk space (in KB) used for workfiles per segment."),

src/include/cdb/cdbvars.h

@@ -128,8 +128,6 @@ extern const char *show_gp_role(void);
 
 extern bool gp_reraise_signal; /* try to force a core dump ?*/
 
-extern bool gp_version_mismatch_error;	/* Enforce same-version on QD&QE. */
-
 extern bool gp_set_proc_affinity; /* try to bind postmaster to a processor */
 
 /* Parameter Gp_is_writer
@@ -221,13 +219,6 @@ extern bool           gp_enable_slow_cursor_testmode;
  */
 extern bool gp_eager_hashtable_release;
 
-/* Parameter debug_print_combocid_detail
- *
- * This run-time parameter requests extra details when we hit the combocid
- * limit in combocid.c
- */
-extern bool Debug_print_combocid_detail;
-
 /* Parameter gp_debug_pgproc
  *
  * This run-time parameter requests to print out detailed info relevant to
@@ -254,23 +245,6 @@ extern bool Debug_print_prelim_plan;
  */
 extern bool Debug_print_slice_table;
 
-/* Parameter debug_print_dispatch_plan
- *
- * This run-time parameter is closely related to the PostgreSQL parameter
- * debug_print_plan which, if true, causes the final plan to display on the
- * server log prior to execution. In GPDB, some plan changes occur after
- * planning just prior to dispatch. This parameter, if true, causes the
- * dispatchable plan to display on the log.
- */
-extern bool Debug_print_dispatch_plan;
-
-/* Parameter debug_print_plannedstmt
- *
- * This run-time parameter causes the PlannedStmt structure containing 
- * the final plan to display on the server log prior to execution. 
- */
-extern bool Debug_print_plannedstmt;
-
 /*
  * gp_backup_directIO
  *
@@ -498,15 +472,6 @@ extern int 	Gp_udp_bufsize_k;
  */
 extern int	Gp_interconnect_hash_multiplier;
 
-/*
- * Parameter gp_interconnect_aggressive_retry
- *
- * The run-time parameter gp_interconnect_aggressive_retry controls the
- * activation of the application-level retry (which acts much faster than the OS-level
- * TCP retries); In most cases this should stay enabled.
- */
-extern bool gp_interconnect_aggressive_retry; /* fast-track app-level retry */
-
 /*
  * Parameter gp_interconnect_full_crc
  *
@@ -514,13 +479,6 @@ extern bool gp_interconnect_aggressive_retry; /* fast-track app-level retry */
  */
 extern bool gp_interconnect_full_crc;
 
-/*
- * Parameter gp_interconnect_elide_setup
- *
- * Perform a full initial handshake for every statement ?
- */
-extern bool gp_interconnect_elide_setup;
-
 /*
  * Parameter gp_interconnect_log_stats
  *
@@ -654,28 +612,10 @@ extern GpVars_Verbosity    gp_log_interconnect;
 const char *gpvars_assign_gp_log_interconnect(const char *newval, bool doit, GucSource source __attribute__((unused)) );
 const char *gpvars_show_gp_log_interconnect(void);
 
-
-/* --------------------------------------------------------------------------------------------------
- * Resource management
- */
-
-/*
- * gp_process_memory_cutoff (real)
- *
- * Deprecated.  Will remove in next release.
- */
-extern double   gp_process_memory_cutoff;           /* SET/SHOW in units of kB */
-
 /* --------------------------------------------------------------------------------------------------
  * Greenplum Optimizer GUCs
  */
 
-
-/*
- * enable_adaptive_nestloop
- */
-extern bool enable_adaptive_nestloop;
-
 /*
  * "gp_motion_cost_per_row"
  *
@@ -700,8 +640,6 @@ extern int      gp_segments_for_planner;
  */
 extern bool gp_enable_multiphase_agg;
 
-extern bool fast_path_expressions;
-
 /*
  * Perform a post-planning scan of the final plan looking for motion deadlocks:
  * emit verbose messages about any found.
@@ -909,7 +847,6 @@ extern bool trace_sort;
  *
  */
 extern int gp_sort_flags;
-extern int gp_dbg_flags;
 
 /* If Greenplum is discarding duplicate rows in sort, switch back to
  * standard sort if the number of distinct values exceeds max_distinct.
@@ -932,18 +869,10 @@ extern bool gp_dynamic_partition_pruning;
  */
 extern bool gp_cte_sharing;
 
-/* turn SQL/MED functionality on */
-
-extern bool	gp_foreign_data_access;
-
 /* MPP-7770: disallow altering storage using SET WITH */
 
 extern bool	gp_setwith_alter_storage;
 
-/* let tablespace make missing LOCATION directory if necessary */
-
-extern bool	gp_enable_tablespace_auto_mkdir;
-
 /* MPP-9772, MPP-9773: remove support for CREATE INDEX CONCURRENTLY */
 extern bool	gp_create_index_concurrently;
 
@@ -961,11 +890,6 @@ extern int gp_max_plan_size;
  */
 extern double gp_hashagg_rewrite_limit;
 
-/* Before the hybrid hash aggregator starts to spill it can
- * re-evaluate the density of groups in its input to come up with a
- * (possibly better) batching scheme */
-extern bool gp_hashagg_recalc_density;
-
 /* If we use two stage hashagg, we can stream the bottom half */
 extern bool gp_hashagg_streambottom;
 
@@ -974,11 +898,6 @@ extern bool gp_hashagg_streambottom;
  */
 extern int gp_hashagg_default_nbatches;
 
-/* Hashagg spill: minimum number of spill batches */
-extern int gp_hashagg_spillbatch_min;
-/* Hashagg spill: max number of spill batches */
-extern int gp_hashagg_spillbatch_max;
-
 /* Hashjoin use bloom filter */
 extern int gp_hashjoin_bloomfilter;
 
@@ -1156,9 +1075,6 @@ extern void verifyGpIdentityIsSet(void);
 /* control current usability of enabling hash index */
 extern bool gpvars_assign_gp_hash_index(bool newval, bool doit, GucSource source);
 
-/* wire off SET WITH() for alter table distributed by */
-extern bool gp_disable_atsdb_set_with;
-
 extern const char *gpvars_assign_gp_resqueue_memory_policy(const char *newval, bool doit, GucSource source __attribute__((unused)) );
 
 extern const char *gpvars_show_gp_resqueue_memory_policy(void);