Move GPDB-specific GUCs to separate file.

This makes merging and diffing with upstream easier. There were so many
GPDB-added GUCs in guc.c that "git merge" didn't handle it very well, and
you easily got merge conflicts that were error-prone to fix manually.

I kept a few GUCs in guc.c that are not present in REL8_2_0, because they
were backported from later PostgreSQL versions, rather than being
completely GPDB-specific.

Clean up the diff between guc.c and upstream, by removing unnecessary
includes, reordering a few GUCs to match upstream better, and similar
cosmetic changes.

I had to move MAX_KILOBYTES from guc.c to guc_tables.h, because guc_gp.c
needs it too. I also had to export assign_msglvl() function from guc.c, so
that it can be called from other assign_* functions from guc_gp.c. And I
had to add the code to process the ConfigureNames*_gp arrays in addition
to the upstream ones. These things increase the diff against upstream, but
not by too much, IMHO. I also copy-pasted constants like MS_PER_S and
KB_PER_MB, which seems safe as those are natural constants, and should
never change.

src/Makefile.mock

@@ -23,6 +23,7 @@ EXCL_OBJS=src/backend/bootstrap/bootparse.o \
 			src/backend/regex/regexec.o \
 			src/backend/utils/adt/like.o \
 			src/backend/utils/misc/guc.o \
+			src/backend/utils/misc/guc_gp.o \
 			src/backend/replication/repl_gram.o \
 			src/timezone/%.o \
             src/backend/main/%.o \

src/backend/access/aocs/test/Makefile

@@ -23,6 +23,7 @@ aocsam_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/adt/like.o \
 	$(top_srcdir)/src/backend/utils/hash/hashfn.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgstrcasecmp.o \

src/backend/access/appendonly/test/Makefile

@@ -23,6 +23,7 @@ aomd_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/adt/like.o \
 	$(top_srcdir)/src/backend/utils/hash/hashfn.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgstrcasecmp.o \
@@ -47,6 +48,7 @@ appendonly_visimap_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/adt/datum.o \
 	$(top_srcdir)/src/backend/utils/adt/like.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgstrcasecmp.o \

src/backend/access/common/test/Makefile

@@ -27,6 +27,7 @@ COMMON_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/hash/dynahash.o \
 	$(top_srcdir)/src/backend/utils/hash/hashfn.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgstrcasecmp.o \

src/backend/access/external/test/Makefile

@@ -24,6 +24,7 @@ COMMON_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/error/elog.o \
 	$(top_srcdir)/src/backend/utils/hash/hashfn.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgstrcasecmp.o \

src/backend/access/transam/test/Makefile

@@ -23,6 +23,7 @@ COMMON_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/adt/like.o \
 	$(top_srcdir)/src/backend/utils/hash/hashfn.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgstrcasecmp.o \
@@ -58,6 +59,7 @@ distributedlog_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/adt/like.o \
 	$(top_srcdir)/src/backend/utils/hash/hashfn.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgstrcasecmp.o \

src/backend/catalog/caql/test/Makefile

@@ -29,6 +29,7 @@ COMMON_REAL_OBJS = \
 	$(top_srcdir)/src/backend/utils/mb/mbutils.o \
 	$(top_srcdir)/src/backend/utils/mb/wchar.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/pgsleep.o \
 	$(top_srcdir)/src/port/path.o \

src/backend/catalog/core/test/Makefile

@@ -30,6 +30,7 @@ catcore_REAL_OBJS= \
 	$(top_srcdir)/src/backend/utils/mb/mbutils.o \
 	$(top_srcdir)/src/backend/utils/mb/wchar.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/pgsleep.o \
 	$(top_srcdir)/src/port/path.o \

src/backend/cdb/test/Makefile

@@ -30,6 +30,7 @@ cdbbufferedread_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/mb/mbutils.o \
 	$(top_srcdir)/src/backend/utils/mb/wchar.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/pgsleep.o \
 	$(top_srcdir)/src/port/path.o \
@@ -62,6 +63,7 @@ cdbbackup_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/mb/mbutils.o \
 	$(top_srcdir)/src/backend/utils/mb/wchar.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgsleep.o \
@@ -93,6 +95,7 @@ cdbdisp_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/mb/mbutils.o \
 	$(top_srcdir)/src/backend/utils/mb/wchar.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/pgsleep.o \
 	$(top_srcdir)/src/port/path.o \
@@ -120,6 +123,7 @@ cdbgang_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/mb/mbutils.o \
 	$(top_srcdir)/src/backend/utils/mb/wchar.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/mmgr/vmem_tracker.o \
 	$(top_srcdir)/src/port/pgsleep.o \
 	$(top_srcdir)/src/port/path.o \
@@ -147,6 +151,7 @@ cdbfilerep_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/mb/mbutils.o \
 	$(top_srcdir)/src/backend/utils/mb/wchar.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/port/pgsleep.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/qsort.o \

src/backend/commands/test/Makefile

@@ -23,6 +23,7 @@ tablecmds_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/adt/like.o \
 	$(top_srcdir)/src/backend/utils/hash/hashfn.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgstrcasecmp.o \
@@ -55,6 +56,7 @@ define_REAL_OBJS=\
     $(top_srcdir)/src/backend/utils/hash/hashfn.o \
     $(top_srcdir)/src/backend/utils/init/globals.o \
     $(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
     $(top_srcdir)/src/backend/catalog/namespace.o \
     $(top_srcdir)/src/port/exec.o \
     $(top_srcdir)/src/port/path.o \

src/backend/executor/test/Makefile

@@ -24,6 +24,7 @@ nodeSubplan_REAL_OBJS=\
         $(top_srcdir)/src/backend/utils/adt/like.o \
         $(top_srcdir)/src/backend/utils/hash/hashfn.o \
         $(top_srcdir)/src/backend/utils/misc/guc.o \
+        $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
         $(top_srcdir)/src/backend/utils/init/globals.o \
         $(top_srcdir)/src/port/exec.o \
         $(top_srcdir)/src/port/path.o \
@@ -52,6 +53,7 @@ nodeShareInputScan_REAL_OBJS=\
         $(top_srcdir)/src/backend/utils/adt/like.o \
         $(top_srcdir)/src/backend/utils/hash/hashfn.o \
         $(top_srcdir)/src/backend/utils/misc/guc.o \
+        $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
         $(top_srcdir)/src/backend/utils/init/globals.o \
         $(top_srcdir)/src/port/exec.o \
         $(top_srcdir)/src/port/path.o \
@@ -80,6 +82,7 @@ execAmi_REAL_OBJS=\
         $(top_srcdir)/src/backend/utils/adt/like.o \
         $(top_srcdir)/src/backend/utils/hash/hashfn.o \
         $(top_srcdir)/src/backend/utils/misc/guc.o \
+        $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
         $(top_srcdir)/src/backend/utils/init/globals.o \
         $(top_srcdir)/src/port/exec.o \
         $(top_srcdir)/src/port/path.o \
@@ -108,6 +111,7 @@ execWorkfile_REAL_OBJS=\
         $(top_srcdir)/src/backend/utils/adt/like.o \
         $(top_srcdir)/src/backend/utils/hash/hashfn.o \
         $(top_srcdir)/src/backend/utils/misc/guc.o \
+        $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
         $(top_srcdir)/src/backend/utils/init/globals.o \
         $(top_srcdir)/src/port/exec.o \
         $(top_srcdir)/src/port/path.o \
@@ -137,6 +141,7 @@ execHHashagg_REAL_OBJS=\
         $(top_srcdir)/src/backend/utils/adt/like.o \
         $(top_srcdir)/src/backend/utils/hash/hashfn.o \
         $(top_srcdir)/src/backend/utils/misc/guc.o \
+        $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
         $(top_srcdir)/src/backend/utils/init/globals.o \
         $(top_srcdir)/src/port/exec.o \
         $(top_srcdir)/src/port/path.o \

src/backend/libpq/test/Makefile

@@ -23,6 +23,7 @@ pqcomm_REAL_OBJS=\
     $(top_srcdir)/src/backend/utils/hash/hashfn.o \
     $(top_srcdir)/src/backend/utils/init/globals.o \
     $(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
     $(top_srcdir)/src/port/exec.o \
     $(top_srcdir)/src/port/path.o \
     $(top_srcdir)/src/port/pgsleep.o \
@@ -51,6 +52,7 @@ auth_REAL_OBJS=\
     $(top_srcdir)/src/backend/utils/hash/hashfn.o \
     $(top_srcdir)/src/backend/utils/init/globals.o \
     $(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
     $(top_srcdir)/src/port/exec.o \
     $(top_srcdir)/src/port/path.o \
     $(top_srcdir)/src/port/pgsleep.o \

src/backend/postmaster/test/Makefile

@@ -25,6 +25,7 @@ backoff_REAL_OBJS=\
 		$(top_srcdir)/src/backend/utils/mb/mbutils.o \
 		$(top_srcdir)/src/backend/utils/mb/wchar.o \
 		$(top_srcdir)/src/backend/utils/misc/guc.o \
+		$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 		$(top_srcdir)/src/backend/utils/init/globals.o \
 		$(top_srcdir)/src/port/pgsleep.o \
 		$(top_srcdir)/src/port/path.o \
@@ -55,6 +56,7 @@ syslogger_REAL_OBJS=\
 		$(top_srcdir)/src/backend/utils/mb/mbutils.o \
 		$(top_srcdir)/src/backend/utils/mb/wchar.o \
 		$(top_srcdir)/src/backend/utils/misc/guc.o \
+		$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 		$(top_srcdir)/src/backend/utils/init/globals.o \
 		$(top_srcdir)/src/port/pgsleep.o \
 		$(top_srcdir)/src/port/path.o \

src/backend/storage/file/test/Makefile

@@ -24,6 +24,7 @@ bfz_REAL_OBJS=\
         $(top_srcdir)/src/backend/utils/adt/like.o \
         $(top_srcdir)/src/backend/utils/hash/hashfn.o \
         $(top_srcdir)/src/backend/utils/misc/guc.o \
+        $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
         $(top_srcdir)/src/backend/utils/init/globals.o \
         $(top_srcdir)/src/port/exec.o \
         $(top_srcdir)/src/port/path.o \

src/backend/storage/lmgr/test/Makefile

@@ -27,6 +27,7 @@ lock_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/mb/mbutils.o \
 	$(top_srcdir)/src/backend/utils/mb/wchar.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/pgsleep.o \
 	$(top_srcdir)/src/port/path.o \
@@ -60,6 +61,7 @@ lwlock_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/mb/mbutils.o \
 	$(top_srcdir)/src/backend/utils/mb/wchar.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/pgsleep.o \
 	$(top_srcdir)/src/port/path.o \

src/backend/tcop/test/Makefile

@@ -23,6 +23,7 @@ postgres_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/adt/like.o \
 	$(top_srcdir)/src/backend/utils/hash/hashfn.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/exec.o \
 	$(top_srcdir)/src/port/path.o \

src/backend/utils/adt/test/Makefile

@@ -22,7 +22,8 @@ common_REAL_OBJS=\
     $(top_srcdir)/src/backend/utils/adt/datum.o \
     $(top_srcdir)/src/backend/utils/adt/like.o \
     $(top_srcdir)/src/backend/utils/hash/hashfn.o \
-	$(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
     $(top_srcdir)/src/backend/utils/init/globals.o \
     $(top_srcdir)/src/port/exec.o \
     $(top_srcdir)/src/port/path.o \

src/backend/utils/datumstream/test/Makefile

@@ -11,6 +11,7 @@ datumstreamblock_REAL_OBJS=\
         $(top_srcdir)/src/backend/utils/adt/like.o \
         $(top_srcdir)/src/backend/utils/mb/wchar.o \
         $(top_srcdir)/src/backend/utils/misc/guc.o \
+        $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
         $(top_srcdir)/src/backend/utils/init/globals.o \
         $(top_srcdir)/src/timezone/localtime.o \
         $(top_srcdir)/src/timezone/strftime.o \

src/backend/utils/fmgr/test/Makefile

@@ -22,7 +22,8 @@ common_REAL_OBJS=\
     $(top_srcdir)/src/backend/utils/adt/datum.o \
     $(top_srcdir)/src/backend/utils/adt/like.o \
     $(top_srcdir)/src/backend/utils/hash/hashfn.o \
-	$(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
     $(top_srcdir)/src/backend/utils/init/globals.o \
     $(top_srcdir)/src/port/exec.o \
     $(top_srcdir)/src/port/path.o \

src/backend/utils/hash/test/Makefile

@@ -27,6 +27,7 @@ dynahash_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/mb/mbutils.o \
 	$(top_srcdir)/src/backend/utils/mb/wchar.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/pgsleep.o \
 	$(top_srcdir)/src/port/path.o \

src/backend/utils/misc/Makefile

@@ -19,7 +19,7 @@ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 
 OBJS = guc.o help_config.o pg_rusage.o ps_status.o superuser.o tzparser.o uriparser.o \
        faultinjector.o netcheck.o simex.o simexsys.o syncbitvector.o testutils.o atomic.o \
-	   bitstream.o bitmap_compression.o size.o
+	   bitstream.o bitmap_compression.o size.o guc_gp.o
 
 # This location might depend on the installation directories. Therefore
 # we can't subsitute it into pg_config.h.

src/backend/utils/misc/test/Makefile

@@ -36,10 +36,12 @@ common_REAL_OBJS=\
     $(top_srcdir)/src/timezone/localtime.o \
     $(top_srcdir)/src/timezone/pgtz.o
 
-guc_REAL_OBJS=$(common_REAL_OBJS)
+guc_REAL_OBJS=$(common_REAL_OBJS) \
+    $(top_srcdir)/src/backend/utils/misc/guc_gp.o
 
 ps_status_REAL_OBJS=$(common_REAL_OBJS) \
-    $(top_srcdir)/src/backend/utils/misc/guc.o
+    $(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc_gp.o
 
 bitstream_REAL_OBJS=\
         $(top_srcdir)/src/backend/lib/stringinfo.o \
@@ -58,6 +60,7 @@ bitstream_REAL_OBJS=\
         $(top_srcdir)/src/backend/utils/mb/mbutils.o \
         $(top_srcdir)/src/backend/utils/mb/wchar.o \
         $(top_srcdir)/src/backend/utils/misc/guc.o \
+        $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
         $(top_srcdir)/src/backend/utils/init/globals.o \
         $(top_srcdir)/src/port/pgsleep.o \
         $(top_srcdir)/src/port/path.o \
@@ -87,6 +90,7 @@ bitmap_compression_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/hash/hashfn.o \
 	$(top_srcdir)/src/backend/utils/misc/bitstream.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgstrcasecmp.o \

src/backend/utils/mmgr/test/Makefile

@@ -22,7 +22,8 @@ common_REAL_OBJS=\
     $(top_srcdir)/src/backend/utils/adt/datum.o \
     $(top_srcdir)/src/backend/utils/adt/like.o \
     $(top_srcdir)/src/backend/utils/hash/hashfn.o \
-	$(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
     $(top_srcdir)/src/backend/utils/init/globals.o \
     $(top_srcdir)/src/port/exec.o \
     $(top_srcdir)/src/port/path.o \

src/backend/utils/resscheduler/test/Makefile

@@ -31,6 +31,7 @@ memquota_REAL_OBJS=\
     $(top_srcdir)/src/backend/utils/hash/hashfn.o \
     $(top_srcdir)/src/backend/utils/init/globals.o \
     $(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
     $(top_srcdir)/src/port/path.o \
     $(top_srcdir)/src/port/pgstrcasecmp.o \
     $(top_srcdir)/src/port/qsort.o \

src/backend/utils/sort/test/Makefile

@@ -23,6 +23,7 @@ string_wrapper_REAL_OBJS=\
         $(top_srcdir)/src/backend/utils/adt/like.o \
         $(top_srcdir)/src/backend/utils/hash/hashfn.o \
         $(top_srcdir)/src/backend/utils/misc/guc.o \
+        $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
         $(top_srcdir)/src/backend/utils/init/globals.o \
         $(top_srcdir)/src/port/exec.o \
         $(top_srcdir)/src/port/path.o \

src/backend/utils/test/Makefile

@@ -22,7 +22,8 @@ common_REAL_OBJS=\
     $(top_srcdir)/src/backend/utils/adt/datum.o \
     $(top_srcdir)/src/backend/utils/adt/like.o \
     $(top_srcdir)/src/backend/utils/hash/hashfn.o \
-	$(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc.o \
+    $(top_srcdir)/src/backend/utils/misc/guc_gp.o \
     $(top_srcdir)/src/backend/utils/init/globals.o \
     $(top_srcdir)/src/port/exec.o \
     $(top_srcdir)/src/port/path.o \

src/bin/pg_dump/cdb/test/Makefile

@@ -25,6 +25,7 @@ cdb_dump_util_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/hash/hashfn.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgstrcasecmp.o \
 	$(top_srcdir)/src/port/qsort.o \
@@ -51,6 +52,7 @@ cdb_bsa_util_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/hash/hashfn.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgstrcasecmp.o \
 	$(top_srcdir)/src/port/qsort.o \

src/bin/pg_dump/test/Makefile

@@ -24,6 +24,7 @@ dumputils_REAL_OBJS=\
 	$(top_srcdir)/src/backend/utils/hash/hashfn.o \
 	$(top_srcdir)/src/backend/utils/init/globals.o \
 	$(top_srcdir)/src/backend/utils/misc/guc.o \
+	$(top_srcdir)/src/backend/utils/misc/guc_gp.o \
 	$(top_srcdir)/src/port/path.o \
 	$(top_srcdir)/src/port/pgstrcasecmp.o \
 	$(top_srcdir)/src/port/qsort.o \

src/include/utils/guc_tables.h

@@ -192,6 +192,12 @@ struct config_generic
 #define GUC_HAVE_LOCAL		0x0002		/* a SET LOCAL has been executed */
 #define GUC_HAVE_STACK		0x0004		/* we have stacked prior value(s) */
 
+/* upper limit for GUC variables measured in kilobytes of memory */
+#if SIZEOF_SIZE_T > 4
+#define MAX_KILOBYTES	INT_MAX
+#else
+#define MAX_KILOBYTES	(INT_MAX / 1024)
+#endif
 
 /* GUC records for specific variable types */
 
@@ -265,4 +271,14 @@ extern int get_num_guc_variables(void);
 extern void build_guc_variables(void);
 
 extern bool parse_int(const char *value, int *result, int flags, const char **hintmsg);
+
+/* guc_gp.c needs this from guc.c */
+const char *assign_msglvl(int *var, const char *newval, bool doit, GucSource source);
+
+/* guc_gp.c exports these for guc.c */
+extern struct config_bool ConfigureNamesBool_gp[];
+extern struct config_int ConfigureNamesInt_gp[];
+extern struct config_real ConfigureNamesReal_gp[];
+extern struct config_string ConfigureNamesString_gp[];
+
 #endif   /* GUC_TABLES_H */