From 1d5d95c9146f75f012f0b3df133f0e82859c0bde Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Sun, 26 Dec 2021 20:12:16 -0600 Subject: [PATCH v3 3/3] f!pg_get_guc_flags --- src/backend/utils/misc/guc.c | 26 +++++++++++++++++++------- src/include/catalog/pg_proc.dat | 10 +++++++--- src/test/regress/expected/guc.out | 2 +- src/test/regress/expected/rules.out | 5 ++--- src/test/regress/sql/guc.sql | 2 +- 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 822dfed2b6c..91ff2a18875 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -9849,10 +9849,6 @@ GetConfigOptionByNum(int varnum, const char **values, bool *noshow) } values[16] = (conf->status & GUC_PENDING_RESTART) ? "t" : "f"; - - /* flags */ - snprintf(buffer, sizeof(buffer), "%d", conf->flags); - values[17] = pstrdup(buffer); } /* @@ -9904,11 +9900,29 @@ show_config_by_name_missing_ok(PG_FUNCTION_ARGS) PG_RETURN_TEXT_P(cstring_to_text(varval)); } +/* + * Return the flags for the specified GUC, or NULL if it doesn't exist. + */ +Datum +pg_get_guc_flags(PG_FUNCTION_ARGS) +{ + char *varname = TextDatumGetCString(PG_GETARG_DATUM(0)); + struct config_generic *record; + + record = find_option(varname, false, true, ERROR); + + /* return NULL if no such variable */ + if (record == NULL) + PG_RETURN_NULL(); + + PG_RETURN_INT32(record->flags); +} + /* * show_all_settings - equiv to SHOW ALL command but implemented as * a Table Function. */ -#define NUM_PG_SETTINGS_ATTS 18 +#define NUM_PG_SETTINGS_ATTS 17 Datum show_all_settings(PG_FUNCTION_ARGS) @@ -9970,8 +9984,6 @@ show_all_settings(PG_FUNCTION_ARGS) INT4OID, -1, 0); TupleDescInitEntry(tupdesc, (AttrNumber) 17, "pending_restart", BOOLOID, -1, 0); - TupleDescInitEntry(tupdesc, (AttrNumber) 18, "flags", - INT4OID, -1, 0); /* * Generate attribute metadata needed later to produce tuples from raw diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index ee86d869057..7fa701fe815 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -6092,10 +6092,14 @@ { oid => '2084', descr => 'SHOW ALL as a function', proname => 'pg_show_all_settings', prorows => '1000', proretset => 't', provolatile => 's', prorettype => 'record', proargtypes => '', - proallargtypes => '{text,text,text,text,text,text,text,text,text,text,text,_text,text,text,text,int4,bool,int4}', - proargmodes => '{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}', - proargnames => '{name,setting,unit,category,short_desc,extra_desc,context,vartype,source,min_val,max_val,enumvals,boot_val,reset_val,sourcefile,sourceline,pending_restart,flags}', + proallargtypes => '{text,text,text,text,text,text,text,text,text,text,text,_text,text,text,text,int4,bool}', + proargmodes => '{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}', + proargnames => '{name,setting,unit,category,short_desc,extra_desc,context,vartype,source,min_val,max_val,enumvals,boot_val,reset_val,sourcefile,sourceline,pending_restart}', prosrc => 'show_all_settings' }, +{ oid => '6116', descr => 'return flags for specified GUC', + proname => 'pg_get_guc_flags', provolatile => 's', + prorettype => 'int4', proargtypes => 'text', + prosrc => 'pg_get_guc_flags' }, { oid => '3329', descr => 'show config file settings', proname => 'pg_show_all_file_settings', prorows => '1000', proretset => 't', provolatile => 'v', prorettype => 'record', proargtypes => '', diff --git a/src/test/regress/expected/guc.out b/src/test/regress/expected/guc.out index d0f3cda22c8..f7dd6c0b299 100644 --- a/src/test/regress/expected/guc.out +++ b/src/test/regress/expected/guc.out @@ -823,7 +823,7 @@ CREATE TEMP TABLE pg_settings AS SELECT name, category, (flags&32) != 0 AS not_in_sample, (flags&1048576) != 0 AS guc_explain, (flags&2097152) != 0 AS guc_computed - FROM pg_settings; + FROM pg_settings, pg_get_guc_flags(name) AS flags; -- test that GUCS are in postgresql.conf SELECT lower(name) FROM pg_settings WHERE NOT not_in_sample EXCEPT SELECT regexp_replace(ln, '^#?([_[:alpha:]]+) = .*', '\1') AS guc diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index 2db00f2a8df..b58b062b10d 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -1724,9 +1724,8 @@ pg_settings| SELECT a.name, a.reset_val, a.sourcefile, a.sourceline, - a.pending_restart, - a.flags - 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, flags); + 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, diff --git a/src/test/regress/sql/guc.sql b/src/test/regress/sql/guc.sql index 66eb28823b3..81eac9b8ed2 100644 --- a/src/test/regress/sql/guc.sql +++ b/src/test/regress/sql/guc.sql @@ -322,7 +322,7 @@ CREATE TEMP TABLE pg_settings AS SELECT name, category, (flags&32) != 0 AS not_in_sample, (flags&1048576) != 0 AS guc_explain, (flags&2097152) != 0 AS guc_computed - FROM pg_settings; + FROM pg_settings, pg_get_guc_flags(name) AS flags; -- test that GUCS are in postgresql.conf SELECT lower(name) FROM pg_settings WHERE NOT not_in_sample EXCEPT -- 2.17.1