mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tie loose ends in psql's new \dP command

Browse Source 
* Remove one unnecessary pg_class join in SQL command.  Not needed,
  because we use a regclass cast instead.

* Doc: refer to "partitioned relations" rather than specifically tables,
  since indexes are also displayed.

* Rename "On table" column to "Table", for consistency with \di.

Author: Justin Pryzby
Discussion: https://postgr.es/m/20190407212525.GB10080@telsasoft.com
This commit is contained in:
Alvaro Herrera 2019-04-17 18:35:41 -04:00
parent b036982db7
commit 421a2c4832
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/src/sgml/ref/psql-ref.sgml
View File

@ -1675,15 +1675,15 @@ testdb=>
<para> <para>
If the modifier <literal>n</literal> (<quote>nested</quote>) is used, If the modifier <literal>n</literal> (<quote>nested</quote>) is used,
or a pattern is specified, then non-root partitioned tables are or a pattern is specified, then non-root partitioned relations are
included, and a column is shown displaying the parent of each included, and a column is shown displaying the parent of each
partitioned relation. partitioned relation.
</para> </para>
<para> <para>
If <literal>+</literal> is appended to the command, the sum of sizes of If <literal>+</literal> is appended to the command name, the sum of the
table's partitions (including that of their indexes) is also displayed, sizes of each relation's partitions is also displayed, along with the
along with the associated description. relation's description.
If <literal>n</literal> is combined with <literal>+</literal>, two If <literal>n</literal> is combined with <literal>+</literal>, two
sizes are shown: one including the total size of directly-attached sizes are shown: one including the total size of directly-attached
leaf partitions, and another showing the total size of all partitions, leaf partitions, and another showing the total size of all partitions,

7
src/bin/psql/describe.c
View File

@ -3861,13 +3861,13 @@ listPartitionedTables(const char *reltypes, const char *pattern, bool verbose)
if (showNested || pattern) if (showNested || pattern)
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
",\n c3.oid::regclass as \"%s\"", ",\n inh.inhparent::regclass as \"%s\"",
gettext_noop("Parent name")); gettext_noop("Parent name"));
if (showIndexes) if (showIndexes)
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
",\n c2.oid::regclass as \"%s\"", ",\n c2.oid::regclass as \"%s\"",
gettext_noop("On table")); gettext_noop("Table"));
if (verbose) if (verbose)
{ {
@ -3902,8 +3902,7 @@ listPartitionedTables(const char *reltypes, const char *pattern, bool verbose)
if (showNested || pattern) if (showNested || pattern)
appendPQExpBufferStr(&buf, appendPQExpBufferStr(&buf,
"\n LEFT JOIN pg_catalog.pg_inherits inh ON c.oid = inh.inhrelid" "\n LEFT JOIN pg_catalog.pg_inherits inh ON c.oid = inh.inhrelid");
"\n LEFT JOIN pg_catalog.pg_class c3 ON c3.oid = inh.inhparent");
if (verbose) if (verbose)
{ {

16
src/test/regress/expected/psql.out
View File

@ -4615,7 +4615,7 @@ create index testpart_orange_index on testpart_orange(logdate);
-- only partition related object should be displayed -- only partition related object should be displayed
\dP test*apple* \dP test*apple*
List of partitioned relations List of partitioned relations
Schema | Name | Owner | Type | Parent name | On table Schema | Name | Owner | Type | Parent name | Table
----------+----------------------+-----------------------+-------------------+-------------+---------------- ----------+----------------------+-----------------------+-------------------+-------------+----------------
testpart | testpart_apple | testrole_partitioning | partitioned table | | testpart | testpart_apple | testrole_partitioning | partitioned table | |
testpart | testpart_apple_index | testrole_partitioning | partitioned index | | testpart_apple testpart | testpart_apple_index | testrole_partitioning | partitioned index | | testpart_apple
@ -4630,7 +4630,7 @@ create index testpart_orange_index on testpart_orange(logdate);
\dPi test*apple* \dPi test*apple*
List of partitioned indexes List of partitioned indexes
Schema | Name | Owner | Parent name | On table Schema | Name | Owner | Parent name | Table
----------+----------------------+-----------------------+-------------+---------------- ----------+----------------------+-----------------------+-------------+----------------
testpart | testpart_apple_index | testrole_partitioning | | testpart_apple testpart | testpart_apple_index | testrole_partitioning | | testpart_apple
(1 row) (1 row)
@ -4665,14 +4665,14 @@ insert into parent_tab values (generate_series(30,39));
\dPi \dPi
List of partitioned indexes List of partitioned indexes
Schema | Name | Owner | On table Schema | Name | Owner | Table
----------+--------------+-----------------------+------------ ----------+--------------+-----------------------+------------
testpart | parent_index | testrole_partitioning | parent_tab testpart | parent_index | testrole_partitioning | parent_tab
(1 row) (1 row)
\dP testpart.* \dP testpart.*
List of partitioned relations List of partitioned relations
Schema | Name | Owner | Type | Parent name | On table Schema | Name | Owner | Type | Parent name | Table
----------+--------------------+-----------------------+-------------------+--------------+------------- ----------+--------------------+-----------------------+-------------------+--------------+-------------
testpart | parent_tab | testrole_partitioning | partitioned table | | testpart | parent_tab | testrole_partitioning | partitioned table | |
testpart | child_30_40 | testrole_partitioning | partitioned table | parent_tab | testpart | child_30_40 | testrole_partitioning | partitioned table | parent_tab |
@ -4682,7 +4682,7 @@ insert into parent_tab values (generate_series(30,39));
\dP \dP
List of partitioned relations List of partitioned relations
Schema | Name | Owner | Type | On table Schema | Name | Owner | Type | Table
----------+--------------+-----------------------+-------------------+------------ ----------+--------------+-----------------------+-------------------+------------
testpart | parent_tab | testrole_partitioning | partitioned table | testpart | parent_tab | testrole_partitioning | partitioned table |
testpart | parent_index | testrole_partitioning | partitioned index | parent_tab testpart | parent_index | testrole_partitioning | partitioned index | parent_tab
@ -4698,7 +4698,7 @@ insert into parent_tab values (generate_series(30,39));
\dPin \dPin
List of partitioned indexes List of partitioned indexes
Schema | Name | Owner | Parent name | On table Schema | Name | Owner | Parent name | Table
----------+--------------------+-----------------------+--------------+------------- ----------+--------------------+-----------------------+--------------+-------------
testpart | parent_index | testrole_partitioning | | parent_tab testpart | parent_index | testrole_partitioning | | parent_tab
testpart | child_30_40_id_idx | testrole_partitioning | parent_index | child_30_40 testpart | child_30_40_id_idx | testrole_partitioning | parent_index | child_30_40
@ -4706,7 +4706,7 @@ insert into parent_tab values (generate_series(30,39));
\dPn \dPn
List of partitioned relations List of partitioned relations
Schema | Name | Owner | Type | Parent name | On table Schema | Name | Owner | Type | Parent name | Table
----------+--------------------+-----------------------+-------------------+--------------+------------- ----------+--------------------+-----------------------+-------------------+--------------+-------------
testpart | parent_tab | testrole_partitioning | partitioned table | | testpart | parent_tab | testrole_partitioning | partitioned table | |
testpart | child_30_40 | testrole_partitioning | partitioned table | parent_tab | testpart | child_30_40 | testrole_partitioning | partitioned table | parent_tab |
@ -4716,7 +4716,7 @@ insert into parent_tab values (generate_series(30,39));
\dPn testpart.* \dPn testpart.*
List of partitioned relations List of partitioned relations
Schema | Name | Owner | Type | Parent name | On table Schema | Name | Owner | Type | Parent name | Table
----------+--------------------+-----------------------+-------------------+--------------+------------- ----------+--------------------+-----------------------+-------------------+--------------+-------------
testpart | parent_tab | testrole_partitioning | partitioned table | | testpart | parent_tab | testrole_partitioning | partitioned table | |
testpart | child_30_40 | testrole_partitioning | partitioned table | parent_tab | testpart | child_30_40 | testrole_partitioning | partitioned table | parent_tab |