From ee6922112e9b3c02b995bd1d838c9a261f060133 Mon Sep 17 00:00:00 2001
From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Mon, 17 Apr 2017 18:34:29 -0300
Subject: Rename columns in new pg_statistic_ext catalog

The new catalog reused a column prefix "sta" from pg_statistic, but this
is undesirable, so change the catalog to use prefix "stx" instead.
Also, rename the column that lists enabled statistic kinds as "stxkind"
rather than "enabled".

Discussion: https://postgr.es/m/CAKJS1f_2t5jhSN7huYRFH3w3rrHfG2QU7hiUHsu-Vdjd1rYT3w@mail.gmail.com
---
 doc/src/sgml/catalogs.sgml  | 22 ++++++++++++----------
 doc/src/sgml/planstats.sgml |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'doc/src')

diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 5254bb3025a..ef36e87a720 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -4291,21 +4291,21 @@
     <tbody>
 
      <row>
-      <entry><structfield>starelid</structfield></entry>
+      <entry><structfield>stxrelid</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
       <entry>The table that the described columns belongs to</entry>
      </row>
 
      <row>
-      <entry><structfield>staname</structfield></entry>
+      <entry><structfield>stxname</structfield></entry>
       <entry><type>name</type></entry>
       <entry></entry>
       <entry>Name of the statistic.</entry>
      </row>
 
      <row>
-      <entry><structfield>stanamespace</structfield></entry>
+      <entry><structfield>stxnamespace</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-namespace"><structname>pg_namespace</structname></link>.oid</literal></entry>
       <entry>
@@ -4314,24 +4314,26 @@
      </row>
 
      <row>
-      <entry><structfield>staowner</structfield></entry>
+      <entry><structfield>stxowner</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-authid"><structname>pg_authid</structname></link>.oid</literal></entry>
       <entry>Owner of the statistic</entry>
      </row>
 
      <row>
-      <entry><structfield>staenabled</structfield></entry>
+      <entry><structfield>stxkind</structfield></entry>
       <entry><type>char[]</type></entry>
       <entry></entry>
       <entry>
-        An array with the modes of the enabled statistic types, encoded as
-        <literal>d</literal> for ndistinct coefficients.
+        An array with the modes of the enabled statistic types.  Valid values
+        are:
+        <literal>d</literal> for ndistinct coefficients,
+        <literal>f</literal> for functional dependencies.
       </entry>
      </row>
 
      <row>
-      <entry><structfield>stakeys</structfield></entry>
+      <entry><structfield>stxkeys</structfield></entry>
       <entry><type>int2vector</type></entry>
       <entry><literal><link linkend="catalog-pg-attribute"><structname>pg_attribute</structname></link>.attnum</literal></entry>
       <entry>
@@ -4342,7 +4344,7 @@
      </row>
 
      <row>
-      <entry><structfield>standistinct</structfield></entry>
+      <entry><structfield>stxndistinct</structfield></entry>
       <entry><type>pg_ndistinct</type></entry>
       <entry></entry>
       <entry>
@@ -4351,7 +4353,7 @@
      </row>
 
      <row>
-      <entry><structfield>stadependencies</structfield></entry>
+      <entry><structfield>stxdependencies</structfield></entry>
       <entry><type>pg_dependencies</type></entry>
       <entry></entry>
       <entry>
diff --git a/doc/src/sgml/planstats.sgml b/doc/src/sgml/planstats.sgml
index a4f91c737af..124e7e20ced 100644
--- a/doc/src/sgml/planstats.sgml
+++ b/doc/src/sgml/planstats.sgml
@@ -525,8 +525,8 @@ EXPLAIN ANALYZE SELECT * FROM t WHERE a = 1 AND b = 1;
     you may do this:
 
 <programlisting>
-SELECT staname,stadependencies FROM pg_statistic_ext WHERE staname = 's1';
- staname |              stadependencies
+SELECT stxname,stxdependencies FROM pg_statistic_ext WHERE stxname = 's1';
+ stxname |              stxdependencies
 ---------+--------------------------------------------
  s1      | [{1 => 2 : 1.000000}, {2 => 1 : 1.000000}]
 (1 row)
-- 
cgit v1.2.3