diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index 515a40e..94d4c04 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -7354,6 +7354,11 @@ + pg_file_settings + parameter settings of file + + + pg_shadow database users @@ -8953,6 +8958,74 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx + + <structname>pg_file_settings</structname> + + + pg_file_settings + + + + The view pg_file_settings provides access to + run-time parameters that are defined in configuration files via SQL. + In contrast to pg_settings a row is provided for + each occurrence of the parameter in a configuration file. This is helpful + for discovering why one value may have been used in preference to another + when the parameters were loaded. + + + + <structname>pg_file_settings</> Columns + + + + + Name + Type + Description + + + + + sourcefile + text + A path of configration file + + + sourceline + integer + + Line number within the configuration file the current value was + set at (null for values set from sources other than configuration files, + or when examined by a non-superuser) + + + + seqno + integer + Sequence number of current view + + + name + text + + Configuration file the current value was set in (null for values + set from sources other than configuration files, or when examined by a + non-superuser); helpful when using include directives in + configuration files + + + + setting + text + Run-time configuration parameter name + + + +
+ +
+ <structname>pg_shadow</structname> diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql index 5e69e2b..1f633e6 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -414,6 +414,12 @@ CREATE RULE pg_settings_n AS GRANT SELECT, UPDATE ON pg_settings TO PUBLIC; +CREATE VIEW pg_file_settings AS + SELECT * FROM pg_show_all_file_settings() AS A; + +REVOKE ALL on pg_file_settings FROM PUBLIC; +REVOKE EXECUTE ON FUNCTION pg_show_all_file_settings() FROM PUBLIC; + CREATE VIEW pg_timezone_abbrevs AS SELECT * FROM pg_timezone_abbrevs(); diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l index b2f04e5..9038f99 100644 --- a/src/backend/utils/misc/guc-file.l +++ b/src/backend/utils/misc/guc-file.l @@ -122,6 +122,8 @@ ProcessConfigFile(GucContext context) ConfigVariable *item, *head, *tail; + ConfigFileVariable *guc_array; + size_t guc_array_size; int i; /* @@ -220,6 +222,9 @@ ProcessConfigFile(GucContext context) gconf->status &= ~GUC_IS_IN_FILE; } + /* Reset number of guc_file_variables */ + num_guc_file_variables = 0; + /* * Check if all the supplied option names are valid, as an additional * quasi-syntactic check on the validity of the config file. It is @@ -258,6 +263,7 @@ ProcessConfigFile(GucContext context) error = true; ConfFileWithError = item->filename; } + num_guc_file_variables++; } /* @@ -345,6 +351,47 @@ ProcessConfigFile(GucContext context) } /* + * Calculate size of guc_array and allocate it. From the secound time to allcate memory, + * we should free old allocated memory. + */ + guc_array_size = num_guc_file_variables * sizeof(struct ConfigFileVariable); + if (!guc_file_variables) + { + /* For the first call */ + guc_file_variables = (ConfigFileVariable *) guc_malloc(FATAL, guc_array_size); + } + else + { + int i; + + for (i = 0; i < prev_num_guc_file_variables; i++) + { + free(guc_file_variables[i].name); + free(guc_file_variables[i].value); + free(guc_file_variables[i].filename); + } + + guc_file_variables = (ConfigFileVariable *) guc_realloc(FATAL, + guc_file_variables, + guc_array_size); + } + + /* Keep remember for reloading conf file */ + prev_num_guc_file_variables = num_guc_file_variables; + + /* + * Apply guc config parameters to guc_file_variable + */ + guc_array = guc_file_variables; + for (item = head; item; item = item->next, guc_array++) + { + guc_array->name = guc_strdup(FATAL, item->name); + guc_array->value = guc_strdup(FATAL, item->value); + guc_array->filename = guc_strdup(FATAL, item->filename); + guc_array->sourceline = item->sourceline; + } + + /* * Now apply the values from the config file. */ for (item = head; item; item = item->next) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index d84dba7..e868c8a 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -3664,6 +3664,24 @@ static struct config_generic **guc_variables; /* Current number of variables contained in the vector */ static int num_guc_variables; +/* + * Lookup of variables for pg_file_settings view. + * guc_file_variables is an array of length num_guc_file_variables. + */ +typedef struct ConfigFileVariable +{ + char *name; + char *value; + char *filename; + int sourceline; +} ConfigFileVariable; +static struct ConfigFileVariable *guc_file_variables; + +/* Number of file variables */ +static int num_guc_file_variables; +/* Number of before reload variables */ +static int prev_num_guc_file_variables; + /* Vector capacity */ static int size_guc_variables; @@ -8111,6 +8129,97 @@ show_all_settings(PG_FUNCTION_ARGS) } } +/* + * show_all_file_settings + */ + +#define NUM_PG_FILE_SETTINGS_ATTS 5 + +Datum +show_all_file_settings(PG_FUNCTION_ARGS) +{ + FuncCallContext *funcctx; + TupleDesc tupdesc; + int call_cntr; + int max_calls; + AttInMetadata *attinmeta; + MemoryContext oldcontext; + + if (SRF_IS_FIRSTCALL()) + { + funcctx = SRF_FIRSTCALL_INIT(); + + oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); + + /* + * need a tuple descriptor representing NUM_PG_SETTINGS_ATTS columns + * of the appropriate types + */ + + tupdesc = CreateTemplateTupleDesc(NUM_PG_FILE_SETTINGS_ATTS, false); + TupleDescInitEntry(tupdesc, (AttrNumber) 1, "sourcefile", + TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, (AttrNumber) 2, "sourceline", + INT4OID, -1, 0); + TupleDescInitEntry(tupdesc, (AttrNumber) 3, "seqno", + INT4OID, -1, 0); + TupleDescInitEntry(tupdesc, (AttrNumber) 4, "name", + TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, (AttrNumber) 5, "setting", + TEXTOID, -1, 0); + + attinmeta = TupleDescGetAttInMetadata(tupdesc); + funcctx->attinmeta = attinmeta; + funcctx->max_calls = num_guc_file_variables; + MemoryContextSwitchTo(oldcontext); + } + + funcctx = SRF_PERCALL_SETUP(); + + call_cntr = funcctx->call_cntr; + max_calls = funcctx->max_calls; + attinmeta = funcctx->attinmeta; + + if (call_cntr < max_calls) + { + char *values[NUM_PG_FILE_SETTINGS_ATTS]; + HeapTuple tuple; + Datum result; + ConfigFileVariable conf; + char buffer[8]; + + /* Check to avoid going past end of array */ + if (call_cntr > num_guc_file_variables) + SRF_RETURN_DONE(funcctx); + + conf = guc_file_variables[call_cntr]; + + values[0] = conf.filename; + + pg_ltoa(conf.sourceline, buffer); + values[1] = pstrdup(buffer); + + pg_ltoa(call_cntr + 1, buffer); + values[2] = pstrdup(buffer); + + values[3] = conf.name; + values[4] = conf.value; + + /* build a tuple */ + tuple = BuildTupleFromCStrings(attinmeta, values); + + /* make the tuple into a datum */ + result = HeapTupleGetDatum(tuple); + + SRF_RETURN_NEXT(funcctx, result); + } + else + { + SRF_RETURN_DONE(funcctx); + } + +} + static char * _ShowOption(struct config_generic * record, bool use_units) { diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index b8a3660..faa4d75 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -3023,6 +3023,8 @@ DATA(insert OID = 2078 ( set_config PGNSP PGUID 12 1 0 0 0 f f f f f f v 3 0 2 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_ 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_ show_all_file_settings _null_ _null_ _null_ )); +DESCR("show config file settings"); DATA(insert OID = 1371 ( pg_lock_status PGNSP PGUID 12 1 1000 0 0 f f f f t t v 0 0 2249 "" "{25,26,26,23,21,25,28,26,26,21,25,23,25,16,16}" "{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{locktype,database,relation,page,tuple,virtualxid,transactionid,classid,objid,objsubid,virtualtransaction,pid,mode,granted,fastpath}" _null_ pg_lock_status _null_ _null_ _null_ )); DESCR("view system lock information"); DATA(insert OID = 1065 ( pg_prepared_xact PGNSP PGUID 12 1 1000 0 0 f f f f t t v 0 0 2249 "" "{28,25,1184,26,26}" "{o,o,o,o,o}" "{transaction,gid,prepared,ownerid,dbid}" _null_ pg_prepared_xact _null_ _null_ _null_ )); diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index bc4517d..91c823f 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -1090,6 +1090,7 @@ extern Datum quote_nullable(PG_FUNCTION_ARGS); extern Datum show_config_by_name(PG_FUNCTION_ARGS); extern Datum set_config_by_name(PG_FUNCTION_ARGS); extern Datum show_all_settings(PG_FUNCTION_ARGS); +extern Datum show_all_file_settings(PG_FUNCTION_ARGS); /* lockfuncs.c */ extern Datum pg_lock_status(PG_FUNCTION_ARGS);