From a9ba6195f12d9b89e103c1b043cc6958e40b1ef0 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 5 May 2016 12:33:12 -0400 Subject: [PATCH] Fix ordering/categorization of some recently-added system views. Somebody added pg_replication_origin, pg_replication_origin_status and pg_replication_slots to catalogs.sgml without a whole lot of concern for either alphabetical order or the difference between a table and a view. Clean up the mess. Back-patch to 9.5, not so much because this is critical as because if I don't it will result in a cross-branch divergence in release-9.5.sgml, which would be a maintenance hazard. --- doc/src/sgml/catalogs.sgml | 515 +++++++++++++------------- doc/src/sgml/high-availability.sgml | 2 +- doc/src/sgml/logicaldecoding.sgml | 2 +- doc/src/sgml/release-9.5.sgml | 2 +- doc/src/sgml/replication-origins.sgml | 2 +- 5 files changed, 261 insertions(+), 262 deletions(-) diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index d6b60db074..0a37cde420 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -238,24 +238,14 @@ information about range types - - pg_rewrite - query rewrite rules - - pg_replication_origin registered replication origins - pg_replication_origin_status - information about replication origins, including replication progress - - - - pg_replication_slots - replication slot information + pg_rewrite + query rewrite rules @@ -5208,6 +5198,54 @@ + + <structname>pg_replication_origin</structname> + + + pg_replication_origin + + + + The pg_replication_origin catalog contains + all replication origins created. For more on replication origins + see . + + + + + <structname>pg_replication_origin</structname> Columns + + + + + Name + Type + References + Description + + + + + + roident + Oid + + A unique, cluster-wide identifier for the replication + origin. Should never leave the system. + + + + roname + text + + The external, user defined, name of a replication + origin. + + + +
+ + <structname>pg_rewrite</structname> @@ -5320,252 +5358,6 @@ - - <structname>pg_replication_origin</structname> - - - pg_replication_origin - - - - The pg_replication_origin catalog contains - all replication origins created. For more on replication origins - see . - - - - - <structname>pg_replication_origin</structname> Columns - - - - - Name - Type - References - Description - - - - - - roident - Oid - - A unique, cluster-wide identifier for the replication - origin. Should never leave the system. - - - - roname - text - - The external, user defined, name of a replication - origin. - - - -
- - - - <structname>pg_replication_origin_status</structname> - - - pg_replication_origin_status - - - - The pg_replication_origin_status view - contains information about how far replay for a certain origin has - progressed. For more on replication origins - see . - - - - - <structname>pg_replication_origin_status</structname> Columns - - - - - Name - Type - References - Description - - - - - - local_id - Oid - pg_replication_origin.roident - internal node identifier - - - - external_id - text - pg_replication_origin.roname - external node identifier - - - - remote_lsn - pg_lsn - - The origin node's LSN up to which data has been replicated. - - - - - local_lsn - pg_lsn - - - This node's LSN at which remote_lsn has - been replicated. Used to flush commit records before persisting - data to disk when using asynchronous commits. - - - - -
- - - - <structname>pg_replication_slots</structname> - - - pg_replication_slots - - - - The pg_replication_slots view provides a listing - of all replication slots that currently exist on the database cluster, - along with their current state. - - - - For more on replication slots, - see and . - - - - - <structname>pg_replication_slots</structname> Columns - - - - - Name - Type - References - Description - - - - - - slot_name - name - - A unique, cluster-wide identifier for the replication slot - - - - plugin - name - - The base name of the shared object containing the output plugin this logical slot is using, or null for physical slots. - - - - slot_type - text - - The slot type - physical or logical - - - - datoid - oid - pg_database.oid - The OID of the database this slot is associated with, or - null. Only logical slots have an associated database. - - - - database - text - pg_database.datname - The name of the database this slot is associated with, or - null. Only logical slots have an associated database. - - - - active - boolean - - True if this slot is currently actively being used - - - - active_pid - integer - - The process ID of the session using this slot if the slot - is currently actively being used. NULL if - inactive. - - - - - xmin - xid - - The oldest transaction that this slot needs the database to - retain. VACUUM cannot remove tuples deleted - by any later transaction. - - - - - catalog_xmin - xid - - The oldest transaction affecting the system catalogs that this - slot needs the database to retain. VACUUM cannot - remove catalog tuples deleted by any later transaction. - - - - - restart_lsn - pg_lsn - - The address (LSN) of oldest WAL which still - might be required by the consumer of this slot and thus won't be - automatically removed during checkpoints. - - - - - confirmed_flush_lsn - pg_lsn - - The address (LSN) up to which the logical - slot's consumer has confirmed receiving data. Data older than this is - not available anymore. NULL for physical slots. - - - - - -
- - <structname>pg_seclabel</structname> @@ -7544,6 +7336,16 @@ prepared transactions + + pg_replication_origin_status + information about replication origins, including replication progress + + + + pg_replication_slots + replication slot information + + pg_roles database roles @@ -8800,6 +8602,203 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx + + <structname>pg_replication_origin_status</structname> + + + pg_replication_origin_status + + + + The pg_replication_origin_status view + contains information about how far replay for a certain origin has + progressed. For more on replication origins + see . + + + + + <structname>pg_replication_origin_status</structname> Columns + + + + + Name + Type + References + Description + + + + + + local_id + Oid + pg_replication_origin.roident + internal node identifier + + + + external_id + text + pg_replication_origin.roname + external node identifier + + + + remote_lsn + pg_lsn + + The origin node's LSN up to which data has been replicated. + + + + local_lsn + pg_lsn + + + This node's LSN at which remote_lsn has + been replicated. Used to flush commit records before persisting + data to disk when using asynchronous commits. + + + + +
+ + + + <structname>pg_replication_slots</structname> + + + pg_replication_slots + + + + The pg_replication_slots view provides a listing + of all replication slots that currently exist on the database cluster, + along with their current state. + + + + For more on replication slots, + see and . + + + + + <structname>pg_replication_slots</structname> Columns + + + + + Name + Type + References + Description + + + + + + slot_name + name + + A unique, cluster-wide identifier for the replication slot + + + + plugin + name + + The base name of the shared object containing the output plugin this logical slot is using, or null for physical slots. + + + + slot_type + text + + The slot type - physical or logical + + + + datoid + oid + pg_database.oid + The OID of the database this slot is associated with, or + null. Only logical slots have an associated database. + + + + database + text + pg_database.datname + The name of the database this slot is associated with, or + null. Only logical slots have an associated database. + + + + active + boolean + + True if this slot is currently actively being used + + + + active_pid + integer + + The process ID of the session using this slot if the slot + is currently actively being used. NULL if + inactive. + + + + + xmin + xid + + The oldest transaction that this slot needs the database to + retain. VACUUM cannot remove tuples deleted + by any later transaction. + + + + + catalog_xmin + xid + + The oldest transaction affecting the system catalogs that this + slot needs the database to retain. VACUUM cannot + remove catalog tuples deleted by any later transaction. + + + + + restart_lsn + pg_lsn + + The address (LSN) of oldest WAL which still + might be required by the consumer of this slot and thus won't be + automatically removed during checkpoints. + + + + + confirmed_flush_lsn + pg_lsn + + The address (LSN) up to which the logical + slot's consumer has confirmed receiving data. Data older than this is + not available anymore. NULL for physical slots. + + + + + +
+ + <structname>pg_roles</structname> diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml index 7ceb588140..8834a42976 100644 --- a/doc/src/sgml/high-availability.sgml +++ b/doc/src/sgml/high-availability.sgml @@ -914,7 +914,7 @@ primary_conninfo = 'host=192.168.1.50 port=5432 user=foo password=foopass' Existing replication slots and their state can be seen in the - pg_replication_slots + pg_replication_slots view. diff --git a/doc/src/sgml/logicaldecoding.sgml b/doc/src/sgml/logicaldecoding.sgml index 109f76c165..b29a90ac7c 100644 --- a/doc/src/sgml/logicaldecoding.sgml +++ b/doc/src/sgml/logicaldecoding.sgml @@ -324,7 +324,7 @@ $ pg_recvlogical -d postgres --slot test --drop-slot System Catalogs Related to Logical Decoding - The pg_replication_slots + The pg_replication_slots view and the pg_stat_replication view provide information about the current state of replication slots and diff --git a/doc/src/sgml/release-9.5.sgml b/doc/src/sgml/release-9.5.sgml index d64655b007..a66b4fcfcf 100644 --- a/doc/src/sgml/release-9.5.sgml +++ b/doc/src/sgml/release-9.5.sgml @@ -2176,7 +2176,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list. --> Report the processes holding replication slots in pg_replication_slots + linkend="view-pg-replication-slots">pg_replication_slots (Craig Ringer) diff --git a/doc/src/sgml/replication-origins.sgml b/doc/src/sgml/replication-origins.sgml index fdc41c99d7..317ca9a1df 100644 --- a/doc/src/sgml/replication-origins.sgml +++ b/doc/src/sgml/replication-origins.sgml @@ -66,7 +66,7 @@ pg_replication_origin_xact_setup(). If that's done replication progress will persist in a crash safe manner. Replay progress for all replication origins can be seen in the - + pg_replication_origin_status view. An individual origin's progress, e.g. when resuming replication, can be acquired using