Change CFS options catageory from USERSET to SIGHUP

knizhnik · knizhnik · commit 186493cb1ed4 · 2017-03-22T11:41:35.000+03:00
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -1693,7 +1693,7 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 
 	{
-		{"cfs_gc", PGC_USERSET, UNGROUPED,
+		{"cfs_gc", PGC_SIGHUP, UNGROUPED,
 		 gettext_noop("Enable garbage collection of compressed pages"),
 		 NULL,
 		},
@@ -1703,7 +1703,7 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 
 	{
-		{"cfs_gc_verify_file", PGC_USERSET, UNGROUPED,
+		{"cfs_gc_verify_file", PGC_SIGHUP, UNGROUPED,
 		 gettext_noop("Verify correctness of data written by GC"),
 		 NULL,
 		},
@@ -2826,7 +2826,7 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"cfs_level", PGC_USERSET, UNGROUPED,
+		{"cfs_level", PGC_SIGHUP, UNGROUPED,
 		 gettext_noop("CFS compression level: 0 - no compression, 1 - maximal speed,"
 					  "other possible values depend on the specific algorithm."),
 		 NULL,
@@ -2838,7 +2838,7 @@ static struct config_int ConfigureNamesInt[] =
     },
 
 	{
-		{"cfs_gc_threshold", PGC_USERSET, UNGROUPED,
+		{"cfs_gc_threshold", PGC_SIGHUP, UNGROUPED,
 		 gettext_noop("Minimum percent of garbage blocks in the file prior to garbage collection"),
 		 NULL,
 		 0
@@ -2849,7 +2849,7 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"cfs_gc_period", PGC_USERSET, UNGROUPED,
+		{"cfs_gc_period", PGC_SIGHUP, UNGROUPED,
 		 gettext_noop("Time to sleep between GC runs in milliseconds"),
 		 NULL,
 		 GUC_UNIT_MS
@@ -2860,7 +2860,7 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"cfs_gc_delay", PGC_USERSET, UNGROUPED,
+		{"cfs_gc_delay", PGC_SIGHUP, UNGROUPED,
 		 gettext_noop("Delay in milliseconds between files defragmentation"),
 		 NULL,
 		 GUC_UNIT_MS
@@ -10864,7 +10864,7 @@ static void set_cfs_gc_enabled(bool newval, void* extra)
 
 static char const* show_cfs_gc_enabled(void)
 {
-	return (cfs_state ? cfs_state->gc_enabled : cfs_gc_enabled) ? "on" : "off";
+	return cfs_gc_enabled ? "on" : "off";
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1693,7 +1693,7 @@ static struct config_bool ConfigureNamesBool[] =`
`1693`	`1693`	`},`
`1694`	`1694`
`1695`	`1695`	`{`
`1696`		`- {"cfs_gc", PGC_USERSET, UNGROUPED,`
	`1696`	`+ {"cfs_gc", PGC_SIGHUP, UNGROUPED,`
`1697`	`1697`	`gettext_noop("Enable garbage collection of compressed pages"),`
`1698`	`1698`	`NULL,`
`1699`	`1699`	`},`
`@@ -1703,7 +1703,7 @@ static struct config_bool ConfigureNamesBool[] =`
`1703`	`1703`	`},`
`1704`	`1704`
`1705`	`1705`	`{`
`1706`		`- {"cfs_gc_verify_file", PGC_USERSET, UNGROUPED,`
	`1706`	`+ {"cfs_gc_verify_file", PGC_SIGHUP, UNGROUPED,`
`1707`	`1707`	`gettext_noop("Verify correctness of data written by GC"),`
`1708`	`1708`	`NULL,`
`1709`	`1709`	`},`
`@@ -2826,7 +2826,7 @@ static struct config_int ConfigureNamesInt[] =`
`2826`	`2826`	`},`
`2827`	`2827`
`2828`	`2828`	`{`
`2829`		`- {"cfs_level", PGC_USERSET, UNGROUPED,`
	`2829`	`+ {"cfs_level", PGC_SIGHUP, UNGROUPED,`
`2830`	`2830`	`gettext_noop("CFS compression level: 0 - no compression, 1 - maximal speed,"`
`2831`	`2831`	`"other possible values depend on the specific algorithm."),`
`2832`	`2832`	`NULL,`
`@@ -2838,7 +2838,7 @@ static struct config_int ConfigureNamesInt[] =`
`2838`	`2838`	`},`
`2839`	`2839`
`2840`	`2840`	`{`
`2841`		`- {"cfs_gc_threshold", PGC_USERSET, UNGROUPED,`
	`2841`	`+ {"cfs_gc_threshold", PGC_SIGHUP, UNGROUPED,`
`2842`	`2842`	`gettext_noop("Minimum percent of garbage blocks in the file prior to garbage collection"),`
`2843`	`2843`	`NULL,`
`2844`	`2844`	`0`
`@@ -2849,7 +2849,7 @@ static struct config_int ConfigureNamesInt[] =`
`2849`	`2849`	`},`
`2850`	`2850`
`2851`	`2851`	`{`
`2852`		`- {"cfs_gc_period", PGC_USERSET, UNGROUPED,`
	`2852`	`+ {"cfs_gc_period", PGC_SIGHUP, UNGROUPED,`
`2853`	`2853`	`gettext_noop("Time to sleep between GC runs in milliseconds"),`
`2854`	`2854`	`NULL,`
`2855`	`2855`	`GUC_UNIT_MS`
`@@ -2860,7 +2860,7 @@ static struct config_int ConfigureNamesInt[] =`
`2860`	`2860`	`},`
`2861`	`2861`
`2862`	`2862`	`{`
`2863`		`- {"cfs_gc_delay", PGC_USERSET, UNGROUPED,`
	`2863`	`+ {"cfs_gc_delay", PGC_SIGHUP, UNGROUPED,`
`2864`	`2864`	`gettext_noop("Delay in milliseconds between files defragmentation"),`
`2865`	`2865`	`NULL,`
`2866`	`2866`	`GUC_UNIT_MS`
`@@ -10864,7 +10864,7 @@ static void set_cfs_gc_enabled(bool newval, void* extra)`
`10864`	`10864`
`10865`	`10865`	`static char const* show_cfs_gc_enabled(void)`
`10866`	`10866`	`{`
`10867`		`- return (cfs_state ? cfs_state->gc_enabled : cfs_gc_enabled) ? "on" : "off";`
	`10867`	`+ return cfs_gc_enabled ? "on" : "off";`
`10868`	`10868`	`}`
`10869`	`10869`
`10870`	`10870`