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

3 files changed, 20 insertions, 20 deletions

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index e978b3a8a5..ab92fd88ed 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	201704141
+#define CATALOG_VERSION_NO	201704171
 
 #endif
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index a7266860ce..07300f8a2b 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -184,9 +184,9 @@ DECLARE_UNIQUE_INDEX(pg_largeobject_metadata_oid_index, 2996, on pg_largeobject_
 
 DECLARE_UNIQUE_INDEX(pg_statistic_ext_oid_index, 3380, on pg_statistic_ext using btree(oid oid_ops));
 #define StatisticExtOidIndexId	3380
-DECLARE_UNIQUE_INDEX(pg_statistic_ext_name_index, 3997, on pg_statistic_ext using btree(staname name_ops, stanamespace oid_ops));
+DECLARE_UNIQUE_INDEX(pg_statistic_ext_name_index, 3997, on pg_statistic_ext using btree(stxname name_ops, stxnamespace oid_ops));
 #define StatisticExtNameIndexId 3997
-DECLARE_INDEX(pg_statistic_ext_relid_index, 3379, on pg_statistic_ext using btree(starelid oid_ops));
+DECLARE_INDEX(pg_statistic_ext_relid_index, 3379, on pg_statistic_ext using btree(stxrelid oid_ops));
 #define StatisticExtRelidIndexId 3379
 
 DECLARE_UNIQUE_INDEX(pg_namespace_nspname_index, 2684, on pg_namespace using btree(nspname name_ops));
diff --git a/src/include/catalog/pg_statistic_ext.h b/src/include/catalog/pg_statistic_ext.h
index 0a1cc0446e..b0fda076fe 100644
--- a/src/include/catalog/pg_statistic_ext.h
+++ b/src/include/catalog/pg_statistic_ext.h
@@ -31,22 +31,22 @@
 CATALOG(pg_statistic_ext,3381)
 {
 	/* These fields form the unique key for the entry: */
-	Oid			starelid;		/* relation containing attributes */
-	NameData	staname;		/* statistics name */
-	Oid			stanamespace;	/* OID of namespace containing this statistics */
-	Oid			staowner;		/* statistics owner */
+	Oid			stxrelid;		/* relation containing attributes */
+	NameData	stxname;		/* statistics name */
+	Oid			stxnamespace;	/* OID of namespace containing this statistics */
+	Oid			stxowner;		/* statistics owner */
 
 	/*
 	 * variable-length fields start here, but we allow direct access to
-	 * stakeys
+	 * stxkeys
 	 */
-	int2vector	stakeys;		/* array of column keys */
+	int2vector	stxkeys;		/* array of column keys */
 
 #ifdef CATALOG_VARLEN
-	char		staenabled[1] BKI_FORCE_NOT_NULL;	/* statistic types
+	char		stxkind[1] BKI_FORCE_NOT_NULL;		/* statistic types
 													 * requested to build */
-	pg_ndistinct standistinct;	/* ndistinct coefficients (serialized) */
-	pg_dependencies stadependencies;	/* dependencies (serialized) */
+	pg_ndistinct stxndistinct;	/* ndistinct coefficients (serialized) */
+	pg_dependencies stxdependencies;	/* dependencies (serialized) */
 #endif
 
 } FormData_pg_statistic_ext;
@@ -63,14 +63,14 @@ typedef FormData_pg_statistic_ext *Form_pg_statistic_ext;
  * ----------------
  */
 #define Natts_pg_statistic_ext					8
-#define Anum_pg_statistic_ext_starelid			1
-#define Anum_pg_statistic_ext_staname			2
-#define Anum_pg_statistic_ext_stanamespace		3
-#define Anum_pg_statistic_ext_staowner			4
-#define Anum_pg_statistic_ext_stakeys			5
-#define Anum_pg_statistic_ext_staenabled		6
-#define Anum_pg_statistic_ext_standistinct		7
-#define Anum_pg_statistic_ext_stadependencies	8
+#define Anum_pg_statistic_ext_stxrelid			1
+#define Anum_pg_statistic_ext_stxname			2
+#define Anum_pg_statistic_ext_stxnamespace		3
+#define Anum_pg_statistic_ext_stxowner			4
+#define Anum_pg_statistic_ext_stxkeys			5
+#define Anum_pg_statistic_ext_stxkind			6
+#define Anum_pg_statistic_ext_stxndistinct		7
+#define Anum_pg_statistic_ext_stxdependencies	8
 
 #define STATS_EXT_NDISTINCT			'd'
 #define STATS_EXT_DEPENDENCIES		'f'