Skip to content

Commit 091c02a

Browse files
MasaoFujiiMasaoFujii
committed
Fix alphabetization in catalogs.sgml.
System catalogs and views should be listed alphabetically in catalog.sgml, but only pg_file_settings view not. This patch also fixes typos in pg_file_settings comments.
1 parent cd3cff4 commit 091c02a

File tree

2 files changed

+81
-82
lines changed

2 files changed

+81
-82
lines changed

‎doc/src/sgml/catalogs.sgml

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -7624,6 +7624,11 @@
76247624
<entry>open cursors</entry>
76257625
</row>
76267626

7627+
<row>
7628+
<entry><link linkend="view-pg-file-settings"><structname>pg_file_settings</structname></link></entry>
7629+
<entry>file location of parameter settings</entry>
7630+
</row>
7631+
76277632
<row>
76287633
<entry><link linkend="view-pg-group"><structname>pg_group</structname></link></entry>
76297634
<entry>groups of database users</entry>
@@ -7679,11 +7684,6 @@
76797684
<entry>parameter settings</entry>
76807685
</row>
76817686

7682-
<row>
7683-
<entry><link linkend="view-pg-file-settings"><structname>pg_file_settings</structname></link></entry>
7684-
<entry>file location of parameter settings</entry>
7685-
</row>
7686-
76877687
<row>
76887688
<entry><link linkend="view-pg-shadow"><structname>pg_shadow</structname></link></entry>
76897689
<entry>database users</entry>
@@ -7999,6 +7999,79 @@
79997999

80008000
</sect1>
80018001

8002+
<sect1 id="view-pg-file-settings">
8003+
<title><structname>pg_file_settings</structname></title>
8004+
8005+
<indexterm zone="view-pg-file-settings">
8006+
<primary>pg_file_settings</primary>
8007+
</indexterm>
8008+
8009+
<para>
8010+
The view <structname>pg_file_settings</structname> provides the file
8011+
name, line number and value of all parameters which are set through
8012+
configuration files.
8013+
In contrast to <structname>pg_settings</structname>, a row is provided for
8014+
each occurrence of the parameter across all configuration files. This is helpful
8015+
for discovering why one value may have been used in preference to another
8016+
when the parameters were loaded.
8017+
</para>
8018+
8019+
<table>
8020+
<title><structname>pg_file_settings</> Columns</title>
8021+
8022+
<tgroup cols="3">
8023+
<thead>
8024+
<row>
8025+
<entry>Name</entry>
8026+
<entry>Type</entry>
8027+
<entry>Description</entry>
8028+
</row>
8029+
</thead>
8030+
<tbody>
8031+
<row>
8032+
<entry><structfield>sourcefile</structfield></entry>
8033+
<entry><structfield>text</structfield></entry>
8034+
<entry>Path to and name of the configration file</entry>
8035+
</row>
8036+
<row>
8037+
<entry><structfield>sourceline</structfield></entry>
8038+
<entry><structfield>integer</structfield></entry>
8039+
<entry>
8040+
Line number within the configuration file where the value was set
8041+
</entry>
8042+
</row>
8043+
<row>
8044+
<entry><structfield>seqno</structfield></entry>
8045+
<entry><structfield>integer</structfield></entry>
8046+
<entry>Order in which the setting was loaded</entry>
8047+
</row>
8048+
<row>
8049+
<entry><structfield>name</structfield></entry>
8050+
<entry><structfield>text</structfield></entry>
8051+
<entry>Run-time configuration parameter name</entry>
8052+
</row>
8053+
<row>
8054+
<entry><structfield>setting</structfield></entry>
8055+
<entry><structfield>text</structfield></entry>
8056+
<entry>value of the parameter</entry>
8057+
</row>
8058+
</tbody>
8059+
</tgroup>
8060+
</table>
8061+
8062+
<para>
8063+
See <xref linkend="config-setting"> for more information about the various
8064+
ways to change these parameters.
8065+
</para>
8066+
8067+
<para>
8068+
The <structname>pg_file_settings</structname> view cannot be modified
8069+
directly as it represents information, as read in at server start or
8070+
reload time, about all parameter settings across all configuration files.
8071+
</para>
8072+
8073+
</sect1>
8074+
80028075
<sect1 id="view-pg-group">
80038076
<title><structname>pg_group</structname></title>
80048077

@@ -9306,79 +9379,6 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
93069379

93079380
</sect1>
93089381

9309-
<sect1 id="view-pg-file-settings">
9310-
<title><structname>pg_file_settings</structname></title>
9311-
9312-
<indexterm zone="view-pg-file-settings">
9313-
<primary>pg_file_settings</primary>
9314-
</indexterm>
9315-
9316-
<para>
9317-
The view <structname>pg_file_settings</structname> provides the file
9318-
name, line number and value of all parameters which are set through
9319-
configuration files.
9320-
In contrast to <structname>pg_settings</structname>, a row is provided for
9321-
each occurrence of the parameter across all configuration files. This is helpful
9322-
for discovering why one value may have been used in preference to another
9323-
when the parameters were loaded.
9324-
</para>
9325-
9326-
<table>
9327-
<title><structname>pg_file_settings</> Columns</title>
9328-
9329-
<tgroup cols="3">
9330-
<thead>
9331-
<row>
9332-
<entry>Name</entry>
9333-
<entry>Type</entry>
9334-
<entry>Description</entry>
9335-
</row>
9336-
</thead>
9337-
<tbody>
9338-
<row>
9339-
<entry><structfield>sourcefile</structfield></entry>
9340-
<entry><structfield>text</structfield></entry>
9341-
<entry>Path to and name of the configration file</entry>
9342-
</row>
9343-
<row>
9344-
<entry><structfield>sourceline</structfield></entry>
9345-
<entry><structfield>integer</structfield></entry>
9346-
<entry>
9347-
Line number within the configuration file where the value was set
9348-
</entry>
9349-
</row>
9350-
<row>
9351-
<entry><structfield>seqno</structfield></entry>
9352-
<entry><structfield>integer</structfield></entry>
9353-
<entry>Order in which the setting was loaded</entry>
9354-
</row>
9355-
<row>
9356-
<entry><structfield>name</structfield></entry>
9357-
<entry><structfield>text</structfield></entry>
9358-
<entry>Run-time configuration parameter name</entry>
9359-
</row>
9360-
<row>
9361-
<entry><structfield>setting</structfield></entry>
9362-
<entry><structfield>text</structfield></entry>
9363-
<entry>value of the parameter</entry>
9364-
</row>
9365-
</tbody>
9366-
</tgroup>
9367-
</table>
9368-
9369-
<para>
9370-
See <xref linkend="config-setting"> for more information about the various
9371-
ways to change these parameters.
9372-
</para>
9373-
9374-
<para>
9375-
The <structname>pg_file_settings</structname> view cannot be modified
9376-
directly as it represents information, as read in at server start or
9377-
reload time, about all parameter settings across all configuration files.
9378-
</para>
9379-
9380-
</sect1>
9381-
93829382
<sect1 id="view-pg-shadow">
93839383
<title><structname>pg_shadow</structname></title>
93849384

‎src/backend/utils/misc/guc.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8182,7 +8182,7 @@ show_all_settings(PG_FUNCTION_ARGS)
81828182
* show_all_file_settings
81838183
*
81848184
* returns a table of all parameter settings in all configuration files
8185-
* which includes the config file path/name, filename, a sequence number
8185+
* which includes the config file path/name, the line number, a sequence number
81868186
* indicating when we loaded it, the parameter name, and the value it is
81878187
* set to.
81888188
*
@@ -8208,8 +8208,8 @@ show_all_file_settings(PG_FUNCTION_ARGS)
82088208
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
82098209

82108210
/*
8211-
* need a tuple descriptor representing NUM_PG_SETTINGS_ATTS columns
8212-
* of the appropriate types
8211+
* need a tuple descriptor representing NUM_PG_FILE_SETTINGS_ATTS
8212+
* columns of the appropriate types
82138213
*/
82148214

82158215
tupdesc = CreateTemplateTupleDesc(NUM_PG_FILE_SETTINGS_ATTS, false);
@@ -8279,7 +8279,6 @@ show_all_file_settings(PG_FUNCTION_ARGS)
82798279
{
82808280
SRF_RETURN_DONE(funcctx);
82818281
}
8282-
82838282
}
82848283

82858284
static char *

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy