From 9e1e324d344a6526f1b8310ec3b7d6fb0845daeb Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 2 Aug 2016 00:59:25 +0300 Subject: [PATCH] Remove obsolete relaosegrelid and relaosegidxid fields from pg_class. They were not used for anything. Look at segrelid and segidxid in pg_appendonly instead. --- src/backend/catalog/cdb_util.sql | 18 ++--- src/backend/catalog/heap.c | 2 - src/include/access/aocssegfiles.h | 2 +- src/include/access/aosegfiles.h | 2 +- src/include/catalog/gp_global_sequence.h | 2 +- src/include/catalog/gp_persistent.h | 12 ++-- src/include/catalog/pg_appendonly.h | 2 +- src/include/catalog/pg_attribute.h | 72 +++++++++---------- src/include/catalog/pg_class.h | 54 +++++++------- .../regress/expected/information_schema.out | 2 +- .../expected/information_schema_optimizer.out | 2 +- 11 files changed, 75 insertions(+), 95 deletions(-) diff --git a/src/backend/catalog/cdb_util.sql b/src/backend/catalog/cdb_util.sql index 71729b906b..2fd4d840b6 100644 --- a/src/backend/catalog/cdb_util.sql +++ b/src/backend/catalog/cdb_util.sql @@ -73,7 +73,7 @@ DECLARE rec gp_type_aoseg_info; BEGIN select relstorage into relst from pg_class where oid = $1; if relst = 'a' then - select 'select gp_segment_id as segmentid, + sqlstr = 'select gp_segment_id as segmentid, segno::int as segno, -1::int as colno, eof::bigint as eof, @@ -81,15 +81,11 @@ BEGIN varblockcount::bigint as varblockcount, eofuncompressed::bigint as eofuncompressed from - gp_dist_random(''pg_aoseg.' || c2.relname || ''');' - into sqlstr - from pg_class c, pg_class c2 - where c.oid = $1 and c2.oid = c.relaosegrelid - ; + gp_dist_random(''pg_aoseg.pg_aoseg_' || $1 || ''');'; else if relst = 'c' then select relnatts into ncol from pg_class where oid = $1; - select 'select gp_segment_id as segmentid, + sqlstr = 'select gp_segment_id as segmentid, segno::int as segno, col::int as colno, aocsvpinfo_decode(vpinfo, col, 0) as eof, @@ -97,12 +93,8 @@ BEGIN varblockcount::bigint as varblockcount, aocsvpinfo_decode(vpinfo, col, 1) as eofuncompressed from - gp_dist_random(''pg_aoseg.' || c2.relname || '''), - generate_series(0, ' || (ncol-1)::varchar(100) || ') col;' - into sqlstr - from pg_class c, pg_class c2 - where c.oid = $1 and c2.oid = c.relaosegrelid - ; + gp_dist_random(''pg_aoseg.pg_aocsseg_' || $1 || '''), + generate_series(0, ' || (ncol-1)::varchar(100) || ') col;'; else raise exception '% is not a appendonly storage type', relst; end if; diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 6dbed6a288..43873d6022 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -1038,8 +1038,6 @@ InsertPgClassTuple(Relation pg_class_desc, values[Anum_pg_class_reltuples - 1] = Float4GetDatum(rd_rel->reltuples); values[Anum_pg_class_reltoastrelid - 1] = ObjectIdGetDatum(rd_rel->reltoastrelid); values[Anum_pg_class_reltoastidxid - 1] = ObjectIdGetDatum(rd_rel->reltoastidxid); - values[Anum_pg_class_relaosegrelid - 1] = ObjectIdGetDatum(rd_rel->relaosegrelid); - values[Anum_pg_class_relaosegidxid - 1] = ObjectIdGetDatum(rd_rel->relaosegidxid); values[Anum_pg_class_relhasindex - 1] = BoolGetDatum(rd_rel->relhasindex); values[Anum_pg_class_relisshared - 1] = BoolGetDatum(rd_rel->relisshared); values[Anum_pg_class_relkind - 1] = CharGetDatum(rd_rel->relkind); diff --git a/src/include/access/aocssegfiles.h b/src/include/access/aocssegfiles.h index 5e533216a7..d965835a16 100644 --- a/src/include/access/aocssegfiles.h +++ b/src/include/access/aocssegfiles.h @@ -40,7 +40,7 @@ #define Class_pg_aocsseg \ {"pg_appendonly"}, PG_CATALOG_NAMESPACE, -1, BOOTSTRAP_SUPERUSERID, 0, \ -1, DEFAULTTABLESPACE_OID, \ - 25, 10000, 0, 0, 0, 0, false, false, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_pg_aocsseg, \ + 25, 10000, 0, 0, false, false, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_pg_aocsseg, \ 0, 0, 0, 0, 0, false, false, false, false, FirstNormalTransactionId, {0}, {{{'\0','\0','\0','\0'},{'\0'}}} diff --git a/src/include/access/aosegfiles.h b/src/include/access/aosegfiles.h index 931a59c11c..263186f9e3 100644 --- a/src/include/access/aosegfiles.h +++ b/src/include/access/aosegfiles.h @@ -77,7 +77,7 @@ typedef enum FileSegInfoState #define Class_pg_aoseg \ {"pg_appendonly"}, PG_CATALOG_NAMESPACE, -1, BOOTSTRAP_SUPERUSERID, 0, \ -1, DEFAULTTABLESPACE_OID, \ - 25, 10000, 0, 0, 0, 0, false, false, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_pg_aoseg, \ + 25, 10000, 0, 0, false, false, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_pg_aoseg, \ 0, 0, 0, 0, 0, false, false, false, false, FirstNormalTransactionId, {0}, {{{'\0','\0','\0','\0'},{'\0'}}} diff --git a/src/include/catalog/gp_global_sequence.h b/src/include/catalog/gp_global_sequence.h index 5d292aa937..cf3e364dcc 100755 --- a/src/include/catalog/gp_global_sequence.h +++ b/src/include/catalog/gp_global_sequence.h @@ -55,7 +55,7 @@ typedef FormData_gp_global_sequence *Form_gp_global_sequence; #define Class_gp_global_sequence \ {"gp_global_sequence"}, PG_CATALOG_NAMESPACE, GP_GLOBAL_SEQUENCE_RELTYPE_OID, BOOTSTRAP_SUPERUSERID, 0, \ GpGlobalSequenceRelationId, GLOBALTABLESPACE_OID, \ - 25, 10000, 0, 0, 0, 0, false, true, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_gp_global_sequence, \ + 25, 10000, 0, 0, false, true, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_gp_global_sequence, \ 0, 0, 0, 0, 0, false, false, false, false, FirstNormalTransactionId, {0}, {{{'\0','\0','\0','\0'},{'\0'}}} diff --git a/src/include/catalog/gp_persistent.h b/src/include/catalog/gp_persistent.h index 3851478fd9..a4466e5d52 100755 --- a/src/include/catalog/gp_persistent.h +++ b/src/include/catalog/gp_persistent.h @@ -150,7 +150,7 @@ typedef FormData_gp_persistent_relation_node *Form_gp_persistent_relation_node; #define Class_gp_persistent_relation_node \ {"gp_persistent_relation_node"}, PG_CATALOG_NAMESPACE, GP_PERSISTENT_RELATION_NODE_OID, BOOTSTRAP_SUPERUSERID, 0, \ GpPersistentRelationNodeRelationId, GLOBALTABLESPACE_OID, \ - 25, 10000, 0, 0, 0, 0, false, true, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_gp_persistent_relation_node, \ + 25, 10000, 0, 0, false, true, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_gp_persistent_relation_node, \ 0, 0, 0, 0, 0, false, false, false, false, FirstNormalTransactionId, {0}, {{{'\0','\0','\0','\0'},{'\0'}}} @@ -217,7 +217,7 @@ typedef FormData_gp_relation_node *Form_gp_relation_node; #define Class_gp_relation_node \ {"gp_relation_node"}, PG_CATALOG_NAMESPACE, GP_RELATION_NODE_OID, BOOTSTRAP_SUPERUSERID, 0, \ GpRelationNodeRelationId, DEFAULTTABLESPACE_OID, \ - 25, 10000, 0, 0, 0, 0, true, false, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_gp_relation_node, \ + 25, 10000, 0, 0, true, false, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_gp_relation_node, \ 0, 0, 0, 0, 0, false, false, false, false, FirstNormalTransactionId, {0}, {{{'\0','\0','\0','\0'},{'\0'}}} /* @@ -241,7 +241,7 @@ typedef FormData_gp_relation_node *Form_gp_relation_node; #define Class_gp_relation_node_index \ {"gp_relation_node_index"}, PG_CATALOG_NAMESPACE, 0, BOOTSTRAP_SUPERUSERID, BTREE_AM_OID, \ GpRelationNodeOidIndexId, DEFAULTTABLESPACE_OID, \ - 25, 10000, 0, 0, 0, 0, false, false, RELKIND_INDEX, RELSTORAGE_HEAP, Natts_gp_relation_node_index, \ + 25, 10000, 0, 0, false, false, RELKIND_INDEX, RELSTORAGE_HEAP, Natts_gp_relation_node_index, \ 0, 0, 0, 0, 0, false, false, false, false, FirstNormalTransactionId, {0}, {{{'\0','\0','\0','\0'},{'\0'}}} /* @@ -347,7 +347,7 @@ typedef FormData_gp_persistent_database_node *Form_gp_persistent_database_node; #define Class_gp_persistent_database_node \ {"gp_persistent_database_node"}, PG_CATALOG_NAMESPACE, GP_PERSISTENT_DATABASE_NODE_OID, BOOTSTRAP_SUPERUSERID, 0, \ GpPersistentDatabaseNodeRelationId, GLOBALTABLESPACE_OID, \ - 2, 100, 0, 0, 0, 0, false, true, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_gp_persistent_database_node, \ + 2, 100, 0, 0, false, true, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_gp_persistent_database_node, \ 0, 0, 0, 0, 0, false, false, false, false, FirstNormalTransactionId, {0}, {{{'\0','\0','\0','\0'},{'\0'}}} @@ -428,7 +428,7 @@ typedef FormData_gp_persistent_tablespace_node *Form_gp_persistent_tablespace_no #define Class_gp_persistent_tablespace_node \ {"gp_persistent_tablespace_node"}, PG_CATALOG_NAMESPACE, GP_PERSISTENT_TABLESPACE_NODE_OID, BOOTSTRAP_SUPERUSERID, 0, \ GpPersistentTablespaceNodeRelationId, GLOBALTABLESPACE_OID, \ - 2, 100, 0, 0, 0, 0, false, true, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_gp_persistent_tablespace_node, \ + 2, 100, 0, 0, false, true, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_gp_persistent_tablespace_node, \ 0, 0, 0, 0, 0, false, false, false, false, FirstNormalTransactionId, {0}, {{{'\0','\0','\0','\0'},{'\0'}}} @@ -523,7 +523,7 @@ typedef FormData_gp_persistent_filespace_node *Form_gp_persistent_filespace_node #define Class_gp_persistent_filespace_node \ {"gp_persistent_filespace_node"}, PG_CATALOG_NAMESPACE, GP_PERSISTENT_FILESPACE_NODE_OID, BOOTSTRAP_SUPERUSERID, 0, \ GpPersistentFilespaceNodeRelationId, GLOBALTABLESPACE_OID, \ - 2, 100, 0, 0, 0, 0, false, true, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_gp_persistent_filespace_node, \ + 2, 100, 0, 0, false, true, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_gp_persistent_filespace_node, \ 0, 0, 0, 0, 0, false, false, false, false, FirstNormalTransactionId, {0}, {{{'\0','\0','\0','\0'},{'\0'}}} diff --git a/src/include/catalog/pg_appendonly.h b/src/include/catalog/pg_appendonly.h index d63c5f6028..a572a515c5 100644 --- a/src/include/catalog/pg_appendonly.h +++ b/src/include/catalog/pg_appendonly.h @@ -125,7 +125,7 @@ typedef FormData_pg_appendonly *Form_pg_appendonly; #define Class_pg_appendonly \ {"pg_appendonly"}, PG_CATALOG_NAMESPACE, 10293, BOOTSTRAP_SUPERUSERID, 0, \ AppendOnlyRelationId, DEFAULTTABLESPACE_OID, \ - 25, 10000, 0, 0, 0, 0, false, false, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_pg_appendonly, \ + 25, 10000, 0, 0, false, false, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_pg_appendonly, \ 0, 0, 0, 0, 0, false, false, false, false, FirstNormalTransactionId, {0}, {{{'\0','\0','\0','\0'},{'\0'}}} diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index 7f7501e0dc..7ea7d33482 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -458,25 +458,23 @@ DATA(insert ( 1249 gp_segment_id 23 0 4 -8 0 -1 -1 t p i t f f t 0)); { 1259, {"reltuples"}, 700, -1, 4, 9, 0, -1, -1, true, 'p', 'i', true, false, false, true, 0 }, \ { 1259, {"reltoastrelid"}, 26, -1, 4, 10, 0, -1, -1, true, 'p', 'i', true, false, false, true, 0 }, \ { 1259, {"reltoastidxid"}, 26, -1, 4, 11, 0, -1, -1, true, 'p', 'i', true, false, false, true, 0 }, \ -{ 1259, {"relaosegrelid"}, 26, -1, 4, 12, 0, -1, -1, true, 'p', 'i', true, false, false, true, 0 }, \ -{ 1259, {"relaosegidxid"}, 26, -1, 4, 13, 0, -1, -1, true, 'p', 'i', true, false, false, true, 0 }, \ -{ 1259, {"relhasindex"}, 16, -1, 1, 14, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ -{ 1259, {"relisshared"}, 16, -1, 1, 15, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ -{ 1259, {"relkind"}, 18, -1, 1, 16, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ -{ 1259, {"relstorage"}, 18, -1, 1, 17, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ -{ 1259, {"relnatts"}, 21, -1, 2, 18, 0, -1, -1, true, 'p', 's', true, false, false, true, 0 }, \ -{ 1259, {"relchecks"}, 21, -1, 2, 19, 0, -1, -1, true, 'p', 's', true, false, false, true, 0 }, \ -{ 1259, {"reltriggers"}, 21, -1, 2, 20, 0, -1, -1, true, 'p', 's', true, false, false, true, 0 }, \ -{ 1259, {"relukeys"}, 21, -1, 2, 21, 0, -1, -1, true, 'p', 's', true, false, false, true, 0 }, \ -{ 1259, {"relfkeys"}, 21, -1, 2, 22, 0, -1, -1, true, 'p', 's', true, false, false, true, 0 }, \ -{ 1259, {"relrefs"}, 21, -1, 2, 23, 0, -1, -1, true, 'p', 's', true, false, false, true, 0 }, \ -{ 1259, {"relhasoids"}, 16, -1, 1, 24, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ -{ 1259, {"relhaspkey"}, 16, -1, 1, 25, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ -{ 1259, {"relhasrules"}, 16, -1, 1, 26, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ -{ 1259, {"relhassubclass"},16, -1, 1, 27, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ -{ 1259, {"relfrozenxid"}, 28, -1, 4, 28, 0, -1, -1, true, 'p', 'i', true, false, false, true, 0 }, \ -{ 1259, {"relacl"}, 1034, -1, -1, 29, 1, -1, -1, false, 'x', 'i', false, false, false, true, 0 }, \ -{ 1259, {"reloptions"}, 1009, -1, -1, 30, 1, -1, -1, false, 'x', 'i', false, false, false, true, 0 } +{ 1259, {"relhasindex"}, 16, -1, 1, 12, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ +{ 1259, {"relisshared"}, 16, -1, 1, 13, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ +{ 1259, {"relkind"}, 18, -1, 1, 14, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ +{ 1259, {"relstorage"}, 18, -1, 1, 15, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ +{ 1259, {"relnatts"}, 21, -1, 2, 16, 0, -1, -1, true, 'p', 's', true, false, false, true, 0 }, \ +{ 1259, {"relchecks"}, 21, -1, 2, 17, 0, -1, -1, true, 'p', 's', true, false, false, true, 0 }, \ +{ 1259, {"reltriggers"}, 21, -1, 2, 18, 0, -1, -1, true, 'p', 's', true, false, false, true, 0 }, \ +{ 1259, {"relukeys"}, 21, -1, 2, 19, 0, -1, -1, true, 'p', 's', true, false, false, true, 0 }, \ +{ 1259, {"relfkeys"}, 21, -1, 2, 20, 0, -1, -1, true, 'p', 's', true, false, false, true, 0 }, \ +{ 1259, {"relrefs"}, 21, -1, 2, 21, 0, -1, -1, true, 'p', 's', true, false, false, true, 0 }, \ +{ 1259, {"relhasoids"}, 16, -1, 1, 22, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ +{ 1259, {"relhaspkey"}, 16, -1, 1, 23, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ +{ 1259, {"relhasrules"}, 16, -1, 1, 24, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ +{ 1259, {"relhassubclass"},16, -1, 1, 25, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ +{ 1259, {"relfrozenxid"}, 28, -1, 4, 26, 0, -1, -1, true, 'p', 'i', true, false, false, true, 0 }, \ +{ 1259, {"relacl"}, 1034, -1, -1, 27, 1, -1, -1, false, 'x', 'i', false, false, false, true, 0 }, \ +{ 1259, {"reloptions"}, 1009, -1, -1, 28, 1, -1, -1, false, 'x', 'i', false, false, false, true, 0 } DATA(insert ( 1259 relname 19 -1 NAMEDATALEN 1 0 -1 -1 f p i t f f t 0)); DATA(insert ( 1259 relnamespace 26 -1 4 2 0 -1 -1 t p i t f f t 0)); @@ -489,25 +487,23 @@ DATA(insert ( 1259 relpages 23 -1 4 8 0 -1 -1 t p i t f f t 0)); DATA(insert ( 1259 reltuples 700 -1 4 9 0 -1 -1 t p i t f f t 0)); DATA(insert ( 1259 reltoastrelid 26 -1 4 10 0 -1 -1 t p i t f f t 0)); DATA(insert ( 1259 reltoastidxid 26 -1 4 11 0 -1 -1 t p i t f f t 0)); -DATA(insert ( 1259 relaosegrelid 26 -1 4 12 0 -1 -1 t p i t f f t 0)); -DATA(insert ( 1259 relaosegidxid 26 -1 4 13 0 -1 -1 t p i t f f t 0)); -DATA(insert ( 1259 relhasindex 16 -1 1 14 0 -1 -1 t p c t f f t 0)); -DATA(insert ( 1259 relisshared 16 -1 1 15 0 -1 -1 t p c t f f t 0)); -DATA(insert ( 1259 relkind 18 -1 1 16 0 -1 -1 t p c t f f t 0)); -DATA(insert ( 1259 relstorage 18 -1 1 17 0 -1 -1 t p c t f f t 0)); -DATA(insert ( 1259 relnatts 21 -1 2 18 0 -1 -1 t p s t f f t 0)); -DATA(insert ( 1259 relchecks 21 -1 2 19 0 -1 -1 t p s t f f t 0)); -DATA(insert ( 1259 reltriggers 21 -1 2 20 0 -1 -1 t p s t f f t 0)); -DATA(insert ( 1259 relukeys 21 -1 2 21 0 -1 -1 t p s t f f t 0)); -DATA(insert ( 1259 relfkeys 21 -1 2 22 0 -1 -1 t p s t f f t 0)); -DATA(insert ( 1259 relrefs 21 -1 2 23 0 -1 -1 t p s t f f t 0)); -DATA(insert ( 1259 relhasoids 16 -1 1 24 0 -1 -1 t p c t f f t 0)); -DATA(insert ( 1259 relhaspkey 16 -1 1 25 0 -1 -1 t p c t f f t 0)); -DATA(insert ( 1259 relhasrules 16 -1 1 26 0 -1 -1 t p c t f f t 0)); -DATA(insert ( 1259 relhassubclass 16 -1 1 27 0 -1 -1 t p c t f f t 0)); -DATA(insert ( 1259 relfrozenxid 28 -1 4 28 0 -1 -1 t p i t f f t 0)); -DATA(insert ( 1259 relacl 1034 -1 -1 29 1 -1 -1 f x i f f f t 0)); -DATA(insert ( 1259 reloptions 1009 -1 -1 30 1 -1 -1 f x i f f f t 0)); +DATA(insert ( 1259 relhasindex 16 -1 1 12 0 -1 -1 t p c t f f t 0)); +DATA(insert ( 1259 relisshared 16 -1 1 13 0 -1 -1 t p c t f f t 0)); +DATA(insert ( 1259 relkind 18 -1 1 14 0 -1 -1 t p c t f f t 0)); +DATA(insert ( 1259 relstorage 18 -1 1 15 0 -1 -1 t p c t f f t 0)); +DATA(insert ( 1259 relnatts 21 -1 2 16 0 -1 -1 t p s t f f t 0)); +DATA(insert ( 1259 relchecks 21 -1 2 17 0 -1 -1 t p s t f f t 0)); +DATA(insert ( 1259 reltriggers 21 -1 2 18 0 -1 -1 t p s t f f t 0)); +DATA(insert ( 1259 relukeys 21 -1 2 19 0 -1 -1 t p s t f f t 0)); +DATA(insert ( 1259 relfkeys 21 -1 2 20 0 -1 -1 t p s t f f t 0)); +DATA(insert ( 1259 relrefs 21 -1 2 21 0 -1 -1 t p s t f f t 0)); +DATA(insert ( 1259 relhasoids 16 -1 1 22 0 -1 -1 t p c t f f t 0)); +DATA(insert ( 1259 relhaspkey 16 -1 1 23 0 -1 -1 t p c t f f t 0)); +DATA(insert ( 1259 relhasrules 16 -1 1 24 0 -1 -1 t p c t f f t 0)); +DATA(insert ( 1259 relhassubclass 16 -1 1 25 0 -1 -1 t p c t f f t 0)); +DATA(insert ( 1259 relfrozenxid 28 -1 4 26 0 -1 -1 t p i t f f t 0)); +DATA(insert ( 1259 relacl 1034 -1 -1 27 1 -1 -1 f x i f f f t 0)); +DATA(insert ( 1259 reloptions 1009 -1 -1 28 1 -1 -1 f x i f f f t 0)); DATA(insert ( 1259 ctid 27 0 6 -1 0 -1 -1 f p s t f f t 0)); DATA(insert ( 1259 oid 26 0 4 -2 0 -1 -1 t p i t f f t 0)); DATA(insert ( 1259 xmin 28 0 4 -3 0 -1 -1 t p i t f f t 0)); diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h index 1cc51526c2..6d329a1d56 100644 --- a/src/include/catalog/pg_class.h +++ b/src/include/catalog/pg_class.h @@ -45,8 +45,6 @@ reltuples real , reltoastrelid oid , reltoastidxid oid , - relaosegrelid oid , - relaosegidxid oid , relhasindex boolean , relisshared boolean , relkind "char" , @@ -101,8 +99,6 @@ CATALOG(pg_class,1259) BKI_BOOTSTRAP float4 reltuples; /* # of tuples (not always up-to-date) */ Oid reltoastrelid; /* OID of toast table; 0 if none */ Oid reltoastidxid; /* if toast table, OID of chunk_id index */ - Oid relaosegrelid; /* OID of aoseg table; 0 if none */ - Oid relaosegidxid; /* if aoseg table, OID of segno index */ bool relhasindex; /* T if has (or has had) any indexes */ bool relisshared; /* T if shared across databases */ char relkind; /* see RELKIND_xxx constants below */ @@ -152,7 +148,7 @@ typedef FormData_pg_class *Form_pg_class; * ---------------- */ -#define Natts_pg_class 30 +#define Natts_pg_class 28 #define Anum_pg_class_relname 1 #define Anum_pg_class_relnamespace 2 #define Anum_pg_class_reltype 3 @@ -164,25 +160,23 @@ typedef FormData_pg_class *Form_pg_class; #define Anum_pg_class_reltuples 9 #define Anum_pg_class_reltoastrelid 10 #define Anum_pg_class_reltoastidxid 11 -#define Anum_pg_class_relaosegrelid 12 -#define Anum_pg_class_relaosegidxid 13 -#define Anum_pg_class_relhasindex 14 -#define Anum_pg_class_relisshared 15 -#define Anum_pg_class_relkind 16 -#define Anum_pg_class_relstorage 17 -#define Anum_pg_class_relnatts 18 -#define Anum_pg_class_relchecks 19 -#define Anum_pg_class_reltriggers 20 -#define Anum_pg_class_relukeys 21 -#define Anum_pg_class_relfkeys 22 -#define Anum_pg_class_relrefs 23 -#define Anum_pg_class_relhasoids 24 -#define Anum_pg_class_relhaspkey 25 -#define Anum_pg_class_relhasrules 26 -#define Anum_pg_class_relhassubclass 27 -#define Anum_pg_class_relfrozenxid 28 -#define Anum_pg_class_relacl 29 -#define Anum_pg_class_reloptions 30 +#define Anum_pg_class_relhasindex 12 +#define Anum_pg_class_relisshared 13 +#define Anum_pg_class_relkind 14 +#define Anum_pg_class_relstorage 15 +#define Anum_pg_class_relnatts 16 +#define Anum_pg_class_relchecks 17 +#define Anum_pg_class_reltriggers 18 +#define Anum_pg_class_relukeys 19 +#define Anum_pg_class_relfkeys 20 +#define Anum_pg_class_relrefs 21 +#define Anum_pg_class_relhasoids 22 +#define Anum_pg_class_relhaspkey 23 +#define Anum_pg_class_relhasrules 24 +#define Anum_pg_class_relhassubclass 25 +#define Anum_pg_class_relfrozenxid 26 +#define Anum_pg_class_relacl 27 +#define Anum_pg_class_reloptions 28 /* ---------------- @@ -195,17 +189,17 @@ typedef FormData_pg_class *Form_pg_class; */ /* Note: "3" in the relfrozenxid column stands for FirstNormalTransactionId */ -DATA(insert OID = 1247 ( pg_type PGNSP 71 PGUID 0 1247 0 0 0 0 0 0 0 f f r h 26 0 0 0 0 0 t f f f 3 _null_ _null_ )); +DATA(insert OID = 1247 ( pg_type PGNSP 71 PGUID 0 1247 0 0 0 0 0 f f r h 26 0 0 0 0 0 t f f f 3 _null_ _null_ )); DESCR(""); -DATA(insert OID = 1249 ( pg_attribute PGNSP 75 PGUID 0 1249 0 0 0 0 0 0 0 f f r h 17 0 0 0 0 0 f f f f 3 _null_ _null_ )); +DATA(insert OID = 1249 ( pg_attribute PGNSP 75 PGUID 0 1249 0 0 0 0 0 f f r h 17 0 0 0 0 0 f f f f 3 _null_ _null_ )); DESCR(""); -DATA(insert OID = 1255 ( pg_proc PGNSP 81 PGUID 0 1255 0 0 0 0 0 0 0 f f r h 26 0 0 0 0 0 t f f f 3 _null_ _null_ )); +DATA(insert OID = 1255 ( pg_proc PGNSP 81 PGUID 0 1255 0 0 0 0 0 f f r h 26 0 0 0 0 0 t f f f 3 _null_ _null_ )); DESCR(""); -DATA(insert OID = 1259 ( pg_class PGNSP 83 PGUID 0 1259 0 0 0 0 0 0 0 f f r h 30 0 0 0 0 0 t f f f 3 _null_ _null_ )); +DATA(insert OID = 1259 ( pg_class PGNSP 83 PGUID 0 1259 0 0 0 0 0 f f r h 28 0 0 0 0 0 t f f f 3 _null_ _null_ )); DESCR(""); /* abstract tuple types */ -DATA(insert OID = 3250 ( nb_classification PGNSP 3251 PGUID 0 3250 0 0 0 0 0 0 0 f f c v 3 0 0 0 0 0 f f f f 0 _null_ _null_ )); +DATA(insert OID = 3250 ( nb_classification PGNSP 3251 PGUID 0 3250 0 0 0 0 0 f f c v 3 0 0 0 0 0 f f f f 0 _null_ _null_ )); /* @@ -214,7 +208,7 @@ DATA(insert OID = 3250 ( nb_classification PGNSP 3251 PGUID 0 3250 0 0 0 0 0 #define Class_pg_class \ {"pg_class"}, PG_CATALOG_NAMESPACE, PG_CLASS_RELTYPE_OID, BOOTSTRAP_SUPERUSERID, 0, \ RelationRelationId, GLOBALTABLESPACE_OID, \ - 0, 0, 0, 0, 0, 0, false, false, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_pg_class, \ + 0, 0, 0, 0, false, false, RELKIND_RELATION, RELSTORAGE_HEAP, Natts_pg_class, \ 0, 0, 0, 0, 0, true, false, false, false, FirstNormalTransactionId, {0}, {{{'\0','\0','\0','\0'},{'\0'}}} diff --git a/src/test/regress/expected/information_schema.out b/src/test/regress/expected/information_schema.out index 6c107f15c8..2eb7ab2737 100644 --- a/src/test/regress/expected/information_schema.out +++ b/src/test/regress/expected/information_schema.out @@ -87,7 +87,7 @@ where ordinal_position = 20; information_schema | attributes | datetime_precision | 20 pg_catalog | pg_type | typstorage | 20 pg_catalog | pg_proc | proargnames | 20 - pg_catalog | pg_class | reltriggers | 20 + pg_catalog | pg_class | relfkeys | 20 pg_catalog | pg_am | amrestrpos | 20 information_schema | columns | collation_catalog | 20 information_schema | domains | udt_catalog | 20 diff --git a/src/test/regress/expected/information_schema_optimizer.out b/src/test/regress/expected/information_schema_optimizer.out index 3cdb6e1b25..333152b262 100644 --- a/src/test/regress/expected/information_schema_optimizer.out +++ b/src/test/regress/expected/information_schema_optimizer.out @@ -87,7 +87,7 @@ where ordinal_position = 20; information_schema | attributes | datetime_precision | 20 pg_catalog | pg_type | typstorage | 20 pg_catalog | pg_proc | proargnames | 20 - pg_catalog | pg_class | reltriggers | 20 + pg_catalog | pg_class | relfkeys | 20 pg_catalog | pg_am | amrestrpos | 20 information_schema | columns | collation_catalog | 20 information_schema | domains | udt_catalog | 20 -- GitLab