Add pg_settings.pending_restart column

petere · petere · commit a486e35706ea · 2015-05-14T20:08:51.000-04:00
with input from David G. Johnston, Robert Haas, Michael Paquier
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
@@ -9042,6 +9042,14 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       or when examined by a non-superuser)
       </entry>
      </row>
+     <row>
+      <entry><structfield>pending_restart</structfield></entry>
+      <entry><type>boolean</type></entry>
+      <entry><literal>true</literal> if the value has been changed in the
+      configuration file but needs a restart; or <literal>false</literal>
+      otherwise.
+      </entry>
+     </row>
     </tbody>
    </tgroup>
   </table>
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -5927,12 +5927,14 @@ set_config_option(const char *name, const char *value,
 				{
 					if (*conf->variable != newval)
 					{
+						record->status |= GUC_PENDING_RESTART;
 						ereport(elevel,
 								(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
 								 errmsg("parameter \"%s\" cannot be changed without restarting the server",
 										name)));
 						return 0;
 					}
+					record->status &= ~GUC_PENDING_RESTART;
 					return -1;
 				}
 
@@ -6015,12 +6017,14 @@ set_config_option(const char *name, const char *value,
 				{
 					if (*conf->variable != newval)
 					{
+						record->status |= GUC_PENDING_RESTART;
 						ereport(elevel,
 								(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
 								 errmsg("parameter \"%s\" cannot be changed without restarting the server",
 										name)));
 						return 0;
 					}
+					record->status &= ~GUC_PENDING_RESTART;
 					return -1;
 				}
 
@@ -6103,12 +6107,14 @@ set_config_option(const char *name, const char *value,
 				{
 					if (*conf->variable != newval)
 					{
+						record->status |= GUC_PENDING_RESTART;
 						ereport(elevel,
 								(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
 								 errmsg("parameter \"%s\" cannot be changed without restarting the server",
 										name)));
 						return 0;
 					}
+					record->status &= ~GUC_PENDING_RESTART;
 					return -1;
 				}
 
@@ -6209,12 +6215,14 @@ set_config_option(const char *name, const char *value,
 					if (*conf->variable == NULL || newval == NULL ||
 						strcmp(*conf->variable, newval) != 0)
 					{
+						record->status |= GUC_PENDING_RESTART;
 						ereport(elevel,
 								(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
 								 errmsg("parameter \"%s\" cannot be changed without restarting the server",
 										name)));
 						return 0;
 					}
+					record->status &= ~GUC_PENDING_RESTART;
 					return -1;
 				}
 
@@ -6302,12 +6310,14 @@ set_config_option(const char *name, const char *value,
 				{
 					if (*conf->variable != newval)
 					{
+						record->status |= GUC_PENDING_RESTART;
 						ereport(elevel,
 								(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
 								 errmsg("parameter \"%s\" cannot be changed without restarting the server",
 										name)));
 						return 0;
 					}
+					record->status &= ~GUC_PENDING_RESTART;
 					return -1;
 				}
 
@@ -8009,6 +8019,8 @@ GetConfigOptionByNum(int varnum, const char **values, bool *noshow)
 		values[14] = NULL;
 		values[15] = NULL;
 	}
+
+	values[16] = (conf->status & GUC_PENDING_RESTART) ? "t" : "f";
 }
 
 /*
@@ -8044,7 +8056,7 @@ show_config_by_name(PG_FUNCTION_ARGS)
  * show_all_settings - equiv to SHOW ALL command but implemented as
  * a Table Function.
  */
-#define NUM_PG_SETTINGS_ATTS	16
+#define NUM_PG_SETTINGS_ATTS	17
 
 Datum
 show_all_settings(PG_FUNCTION_ARGS)
@@ -8104,6 +8116,8 @@ show_all_settings(PG_FUNCTION_ARGS)
 						   TEXTOID, -1, 0);
 		TupleDescInitEntry(tupdesc, (AttrNumber) 16, "sourceline",
 						   INT4OID, -1, 0);
+		TupleDescInitEntry(tupdesc, (AttrNumber) 17, "pending_restart",
+						   BOOLOID, -1, 0);
 
 		/*
 		 * Generate attribute metadata needed later to produce tuples from raw
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	201505121
+#define CATALOG_VERSION_NO	201505141
 
 #endif
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
@@ -3067,7 +3067,7 @@ DATA(insert OID = 2077 (  current_setting	PGNSP PGUID 12 1 0 0 0 f f f f t f s 1
 DESCR("SHOW X as a function");
 DATA(insert OID = 2078 (  set_config		PGNSP PGUID 12 1 0 0 0 f f f f f f v 3 0 25 "25 25 16" _null_ _null_ _null_ _null_ _null_ set_config_by_name _null_ _null_ _null_ ));
 DESCR("SET X as a function");
-DATA(insert OID = 2084 (  pg_show_all_settings	PGNSP PGUID 12 1 1000 0 0 f f f f t t s 0 0 2249 "" "{25,25,25,25,25,25,25,25,25,25,25,1009,25,25,25,23}" "{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{name,setting,unit,category,short_desc,extra_desc,context,vartype,source,min_val,max_val,enumvals,boot_val,reset_val,sourcefile,sourceline}" _null_ _null_ show_all_settings _null_ _null_ _null_ ));
+DATA(insert OID = 2084 (  pg_show_all_settings	PGNSP PGUID 12 1 1000 0 0 f f f f t t s 0 0 2249 "" "{25,25,25,25,25,25,25,25,25,25,25,1009,25,25,25,23,16}" "{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{name,setting,unit,category,short_desc,extra_desc,context,vartype,source,min_val,max_val,enumvals,boot_val,reset_val,sourcefile,sourceline,pending_restart}" _null_ _null_ show_all_settings _null_ _null_ _null_ ));
 DESCR("SHOW ALL as a function");
 DATA(insert OID = 3329 (  pg_show_all_file_settings	PGNSP PGUID 12 1 1000 0 0 f f f f t t s 0 0 2249 "" "{25,23,23,25,25}" "{o,o,o,o,o}" "{sourcefile,sourceline,seqno,name,setting}" _null_ _null_ show_all_file_settings _null_ _null_ _null_ ));
 DESCR("show config file settings");
diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
@@ -167,6 +167,7 @@ struct config_generic
  * Caution: the GUC_IS_IN_FILE bit is transient state for ProcessConfigFile.
  * Do not assume that its value represents useful information elsewhere.
  */
+#define GUC_PENDING_RESTART	0x0002
 
 
 /* GUC records for specific variable types */
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
@@ -1616,8 +1616,9 @@ pg_settings| SELECT a.name,
     a.boot_val,
     a.reset_val,
     a.sourcefile,
-    a.sourceline
-   FROM pg_show_all_settings() a(name, setting, unit, category, short_desc, extra_desc, context, vartype, source, min_val, max_val, enumvals, boot_val, reset_val, sourcefile, sourceline);
+    a.sourceline,
+    a.pending_restart
+   FROM pg_show_all_settings() a(name, setting, unit, category, short_desc, extra_desc, context, vartype, source, min_val, max_val, enumvals, boot_val, reset_val, sourcefile, sourceline, pending_restart);
 pg_shadow| SELECT pg_authid.rolname AS usename,
     pg_authid.oid AS usesysid,
     pg_authid.rolcreatedb AS usecreatedb,

Original file line number	Diff line number	Diff line change
`@@ -5927,12 +5927,14 @@ set_config_option(const char name, const char value,`
`5927`	`5927`	`{`
`5928`	`5928`	`if (*conf->variable != newval)`
`5929`	`5929`	`{`
	`5930`	`+ record->status \|= GUC_PENDING_RESTART;`
`5930`	`5931`	`ereport(elevel,`
`5931`	`5932`	`(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),`
`5932`	`5933`	`errmsg("parameter \"%s\" cannot be changed without restarting the server",`
`5933`	`5934`	`name)));`
`5934`	`5935`	`return 0;`
`5935`	`5936`	`}`
	`5937`	`+ record->status &= ~GUC_PENDING_RESTART;`
`5936`	`5938`	`return -1;`
`5937`	`5939`	`}`
`5938`	`5940`
`@@ -6015,12 +6017,14 @@ set_config_option(const char name, const char value,`
`6015`	`6017`	`{`
`6016`	`6018`	`if (*conf->variable != newval)`
`6017`	`6019`	`{`
	`6020`	`+ record->status \|= GUC_PENDING_RESTART;`
`6018`	`6021`	`ereport(elevel,`
`6019`	`6022`	`(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),`
`6020`	`6023`	`errmsg("parameter \"%s\" cannot be changed without restarting the server",`
`6021`	`6024`	`name)));`
`6022`	`6025`	`return 0;`
`6023`	`6026`	`}`
	`6027`	`+ record->status &= ~GUC_PENDING_RESTART;`
`6024`	`6028`	`return -1;`
`6025`	`6029`	`}`
`6026`	`6030`
`@@ -6103,12 +6107,14 @@ set_config_option(const char name, const char value,`
`6103`	`6107`	`{`
`6104`	`6108`	`if (*conf->variable != newval)`
`6105`	`6109`	`{`
	`6110`	`+ record->status \|= GUC_PENDING_RESTART;`
`6106`	`6111`	`ereport(elevel,`
`6107`	`6112`	`(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),`
`6108`	`6113`	`errmsg("parameter \"%s\" cannot be changed without restarting the server",`
`6109`	`6114`	`name)));`
`6110`	`6115`	`return 0;`
`6111`	`6116`	`}`
	`6117`	`+ record->status &= ~GUC_PENDING_RESTART;`
`6112`	`6118`	`return -1;`
`6113`	`6119`	`}`
`6114`	`6120`
`@@ -6209,12 +6215,14 @@ set_config_option(const char name, const char value,`
`6209`	`6215`	`if (*conf->variable == NULL \|\| newval == NULL \|\|`
`6210`	`6216`	`strcmp(*conf->variable, newval) != 0)`
`6211`	`6217`	`{`
	`6218`	`+ record->status \|= GUC_PENDING_RESTART;`
`6212`	`6219`	`ereport(elevel,`
`6213`	`6220`	`(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),`
`6214`	`6221`	`errmsg("parameter \"%s\" cannot be changed without restarting the server",`
`6215`	`6222`	`name)));`
`6216`	`6223`	`return 0;`
`6217`	`6224`	`}`
	`6225`	`+ record->status &= ~GUC_PENDING_RESTART;`
`6218`	`6226`	`return -1;`
`6219`	`6227`	`}`
`6220`	`6228`
`@@ -6302,12 +6310,14 @@ set_config_option(const char name, const char value,`
`6302`	`6310`	`{`
`6303`	`6311`	`if (*conf->variable != newval)`
`6304`	`6312`	`{`
	`6313`	`+ record->status \|= GUC_PENDING_RESTART;`
`6305`	`6314`	`ereport(elevel,`
`6306`	`6315`	`(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),`
`6307`	`6316`	`errmsg("parameter \"%s\" cannot be changed without restarting the server",`
`6308`	`6317`	`name)));`
`6309`	`6318`	`return 0;`
`6310`	`6319`	`}`
	`6320`	`+ record->status &= ~GUC_PENDING_RESTART;`
`6311`	`6321`	`return -1;`
`6312`	`6322`	`}`
`6313`	`6323`
`@@ -8009,6 +8019,8 @@ GetConfigOptionByNum(int varnum, const char *values, bool noshow)`
`8009`	`8019`	`values[14] = NULL;`
`8010`	`8020`	`values[15] = NULL;`
`8011`	`8021`	`}`
	`8022`	`+`
	`8023`	`+ values[16] = (conf->status & GUC_PENDING_RESTART) ? "t" : "f";`
`8012`	`8024`	`}`
`8013`	`8025`
`8014`	`8026`	`/*`
`@@ -8044,7 +8056,7 @@ show_config_by_name(PG_FUNCTION_ARGS)`
`8044`	`8056`	`* show_all_settings - equiv to SHOW ALL command but implemented as`
`8045`	`8057`	`* a Table Function.`
`8046`	`8058`	`*/`
`8047`		`-#define NUM_PG_SETTINGS_ATTS 16`
	`8059`	`+#define NUM_PG_SETTINGS_ATTS 17`
`8048`	`8060`
`8049`	`8061`	`Datum`
`8050`	`8062`	`show_all_settings(PG_FUNCTION_ARGS)`
`@@ -8104,6 +8116,8 @@ show_all_settings(PG_FUNCTION_ARGS)`
`8104`	`8116`	`TEXTOID, -1, 0);`
`8105`	`8117`	`TupleDescInitEntry(tupdesc, (AttrNumber) 16, "sourceline",`
`8106`	`8118`	`INT4OID, -1, 0);`
	`8119`	`+ TupleDescInitEntry(tupdesc, (AttrNumber) 17, "pending_restart",`
	`8120`	`+ BOOLOID, -1, 0);`
`8107`	`8121`
`8108`	`8122`	`/*`
`8109`	`8123`	`* Generate attribute metadata needed later to produce tuples from raw`