Rename cfs_enable_gc option to cfs_gc

knizhnik · knizhnik · commit 8e534ccfb09e · 2017-03-21T11:42:24.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -396,7 +396,7 @@ void cfs_initialize()
 	pg_atomic_init_flag(&cfs_state->gc_started);
 	pg_atomic_init_u32(&cfs_state->n_active_gc, 0);
 	cfs_state->n_workers = 0;
-	cfs_state->gc_enabled = true;
+	cfs_state->gc_enabled = cfs_gc_enabled;
 	cfs_state->max_iterations = 0;
 	
 	if (cfs_encryption)
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_enable_gc", PGC_USERSET, UNGROUPED,
+		{"cfs_gc", PGC_USERSET, UNGROUPED,
 		 gettext_noop("Enable garbage collection of compressed pages"),
 		 NULL,
 		},
@@ -10857,12 +10857,14 @@ show_log_file_mode(void)
 
 static void set_cfs_gc_enabled(bool newval, void* extra)
 {
-	cfs_control_gc(newval);
+	cfs_gc_enabled = newval;
+	if (cfs_state) 
+		cfs_control_gc(newval);
 }
 
 static char const* show_cfs_gc_enabled(void)
 {
-	return cfs_state && cfs_state->gc_enabled ? "true" : "false";
+	return (cfs_state ? cfs_state->gc_enabled : cfs_gc_enabled) ? "true" : "false";
 }
 
 
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
@@ -244,6 +244,8 @@ extern bool log_executor_stats;
 extern bool log_statement_stats;
 extern bool log_btree_build_stats;
 
+extern bool cfs_gc_enabled;
+
 extern PGDLLIMPORT bool check_function_bodies;
 extern bool default_with_oids;
 extern bool SQL_inheritance;

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_enable_gc", PGC_USERSET, UNGROUPED,`
	`1696`	`+ {"cfs_gc", PGC_USERSET, UNGROUPED,`
`1697`	`1697`	`gettext_noop("Enable garbage collection of compressed pages"),`
`1698`	`1698`	`NULL,`
`1699`	`1699`	`},`
`@@ -10857,12 +10857,14 @@ show_log_file_mode(void)`
`10857`	`10857`
`10858`	`10858`	`static void set_cfs_gc_enabled(bool newval, void* extra)`
`10859`	`10859`	`{`
`10860`		`- cfs_control_gc(newval);`
	`10860`	`+ cfs_gc_enabled = newval;`
	`10861`	`+ if (cfs_state)`
	`10862`	`+ cfs_control_gc(newval);`
`10861`	`10863`	`}`
`10862`	`10864`
`10863`	`10865`	`static char const* show_cfs_gc_enabled(void)`
`10864`	`10866`	`{`
`10865`		`- return cfs_state && cfs_state->gc_enabled ? "true" : "false";`
	`10867`	`+ return (cfs_state ? cfs_state->gc_enabled : cfs_gc_enabled) ? "true" : "false";`
`10866`	`10868`	`}`
`10867`	`10869`
`10868`	`10870`