10 files changed, 13 insertions, 13 deletions
diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c
index 86d918fafb4..c16b38eed8b 100644
--- a/src/backend/access/common/reloptions.c
+++ b/src/backend/access/common/reloptions.c
@@ -218,7 +218,7 @@ static relopt_int intRelOpts[] =
 	},
 	{
 		{
-			"pending_list_cleanup_size",
+			"gin_pending_list_limit",
 			"Maximum size of the pending list for this GIN index, in kilobytes.",
 			RELOPT_KIND_GIN
 		},
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
index 96255104ac1..25746995b5e 100644
--- a/src/backend/access/gin/ginfast.c
+++ b/src/backend/access/gin/ginfast.c
@@ -26,7 +26,7 @@
 #include "utils/rel.h"
 
 /* GUC parameter */
-int			pending_list_cleanup_size = 0;
+int			gin_pending_list_limit = 0;
 
 #define GIN_PAGE_FREESIZE \
 	( BLCKSZ - MAXALIGN(SizeOfPageHeaderData) - MAXALIGN(sizeof(GinPageOpaqueData)) )
@@ -426,7 +426,7 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
 	 * call it when it can do all the work in a single collection cycle. In
 	 * non-vacuum mode, it shouldn't require maintenance_work_mem, so fire it
 	 * while pending list is still small enough to fit into
-	 * pending_list_cleanup_size.
+	 * gin_pending_list_limit.
 	 *
 	 * ginInsertCleanup() should not be called inside our CRIT_SECTION.
 	 */
diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c
index ff1dd7ee519..d0458cfd0cf 100644
--- a/src/backend/access/gin/ginutil.c
+++ b/src/backend/access/gin/ginutil.c
@@ -526,7 +526,7 @@ ginoptions(PG_FUNCTION_ARGS)
 	int			numoptions;
 	static const relopt_parse_elt tab[] = {
 		{"fastupdate", RELOPT_TYPE_BOOL, offsetof(GinOptions, useFastUpdate)},
-		{"pending_list_cleanup_size", RELOPT_TYPE_INT, offsetof(GinOptions,
+		{"gin_pending_list_limit", RELOPT_TYPE_INT, offsetof(GinOptions,
 																pendingListCleanupSize)}
 	};
 
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index db65c7688dc..23cbe906a78 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -2543,12 +2543,12 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"pending_list_cleanup_size", PGC_USERSET, CLIENT_CONN_STATEMENT,
+		{"gin_pending_list_limit", PGC_USERSET, CLIENT_CONN_STATEMENT,
 			gettext_noop("Sets the maximum size of the pending list for GIN index."),
 			 NULL,
 			GUC_UNIT_KB
 		},
-		&pending_list_cleanup_size,
+		&gin_pending_list_limit,
 		4096, 64, MAX_KILOBYTES,
 		NULL, NULL, NULL
 	},
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 6e8ea1e481c..4a89cb7d9f8 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -519,7 +519,7 @@
 #bytea_output = 'hex'			# hex, escape
 #xmlbinary = 'base64'
 #xmloption = 'content'
-#pending_list_cleanup_size = 4MB
+#gin_pending_list_limit = 4MB
 
 # - Locale and Formatting -
 
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index be6ad7ea643..8c85425fc5d 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -1172,7 +1172,7 @@ psql_completion(const char *text, int start, int end)
 			 pg_strcasecmp(prev_wd, "(") == 0)
 	{
 		static const char *const list_INDEXOPTIONS[] =
-		{"fillfactor", "fastupdate", "pending_list_cleanup_size", NULL};
+		{"fillfactor", "fastupdate", "gin_pending_list_limit", NULL};
 
 		COMPLETE_WITH_LIST(list_INDEXOPTIONS);
 	}
diff --git a/src/include/access/gin.h b/src/include/access/gin.h
index a0d4da84b08..433e56f20df 100644
--- a/src/include/access/gin.h
+++ b/src/include/access/gin.h
@@ -67,7 +67,7 @@ typedef char GinTernaryValue;
 
 /* GUC parameters */
 extern PGDLLIMPORT int GinFuzzySearchLimit;
-extern int pending_list_cleanup_size;
+extern int gin_pending_list_limit;
 
 /* ginutil.c */
 extern void ginGetStats(Relation index, GinStatsData *stats);
diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
index 4a8db5a5003..333316d78e2 100644
--- a/src/include/access/gin_private.h
+++ b/src/include/access/gin_private.h
@@ -326,7 +326,7 @@ typedef struct GinOptions
 	((relation)->rd_options && \
 	 ((GinOptions *) (relation)->rd_options)->pendingListCleanupSize != -1 ? \
 	 ((GinOptions *) (relation)->rd_options)->pendingListCleanupSize : \
-	 pending_list_cleanup_size)
+	 gin_pending_list_limit)
 
 
 /* Macros for buffer lock/unlock operations */
diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
index 45689d9950f..3ecb2382308 100644
--- a/src/test/regress/expected/create_index.out
+++ b/src/test/regress/expected/create_index.out
@@ -2244,14 +2244,14 @@ DROP TABLE array_gin_test;
 -- Test GIN index's reloptions
 --
 CREATE INDEX gin_relopts_test ON array_index_op_test USING gin (i)
-  WITH (FASTUPDATE=on, PENDING_LIST_CLEANUP_SIZE=128);
+  WITH (FASTUPDATE=on, GIN_PENDING_LIST_LIMIT=128);
 \d+ gin_relopts_test
      Index "public.gin_relopts_test"
  Column |  Type   | Definition | Storage 
 --------+---------+------------+---------
  i      | integer | i          | plain
 gin, for table "public.array_index_op_test"
-Options: fastupdate=on, pending_list_cleanup_size=128
+Options: fastupdate=on, gin_pending_list_limit=128
 
 --
 -- HASH
diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql
index 619558551e5..e837676d28e 100644
--- a/src/test/regress/sql/create_index.sql
+++ b/src/test/regress/sql/create_index.sql
@@ -658,7 +658,7 @@ DROP TABLE array_gin_test;
 -- Test GIN index's reloptions
 --
 CREATE INDEX gin_relopts_test ON array_index_op_test USING gin (i)
-  WITH (FASTUPDATE=on, PENDING_LIST_CLEANUP_SIZE=128);
+  WITH (FASTUPDATE=on, GIN_PENDING_LIST_LIMIT=128);
 \d+ gin_relopts_test
 
 --