Sort syscache identifiers into alphabetical order.

Not much point in having a convention about this if we don't enforce it.

Mark Dilger

Discussion: https://postgr.es/m/7F67FBEF-C3B3-404E-8EC6-E02ACB15D894@gmail.com

diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 922718c9d17378d4fb230c775a5c7bf1c86e27c4..e66bb03ea57ffcb776de3b09c3c730dcc6b85010 100644 (file)
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -606,30 +606,30 @@ static const struct cachedesc cacheinfo[] = {
        },
        128
    },
-   {RangeRelationId,           /* RANGETYPE */
-       RangeTypidIndexId,
+   {PublicationRelationId,     /* PUBLICATIONNAME */
+       PublicationNameIndexId,
        1,
        {
-           Anum_pg_range_rngtypid,
+           Anum_pg_publication_pubname,
            0,
            0,
            0
        },
-       4
+       8
    },
-   {RelationRelationId,        /* RELNAMENSP */
-       ClassNameNspIndexId,
-       2,
+   {PublicationRelationId,     /* PUBLICATIONOID */
+       PublicationObjectIndexId,
+       1,
        {
-           Anum_pg_class_relname,
-           Anum_pg_class_relnamespace,
+           ObjectIdAttributeNumber,
+           0,
            0,
            0
        },
-       128
+       8
    },
-   {RelationRelationId,        /* RELOID */
-       ClassOidIndexId,
+   {PublicationRelRelationId,  /* PUBLICATIONREL */
+       PublicationRelObjectIndexId,
        1,
        {
            ObjectIdAttributeNumber,
@@ -637,73 +637,73 @@ static const struct cachedesc cacheinfo[] = {
            0,
            0
        },
-       128
+       64
    },
-   {ReplicationOriginRelationId,       /* REPLORIGIDENT */
-       ReplicationOriginIdentIndex,
-       1,
+   {PublicationRelRelationId,  /* PUBLICATIONRELMAP */
+       PublicationRelPrrelidPrpubidIndexId,
+       2,
        {
-           Anum_pg_replication_origin_roident,
-           0,
+           Anum_pg_publication_rel_prrelid,
+           Anum_pg_publication_rel_prpubid,
            0,
            0
        },
-       16
+       64
    },
-   {ReplicationOriginRelationId,       /* REPLORIGNAME */
-       ReplicationOriginNameIndex,
+   {RangeRelationId,           /* RANGETYPE */
+       RangeTypidIndexId,
        1,
        {
-           Anum_pg_replication_origin_roname,
+           Anum_pg_range_rngtypid,
            0,
            0,
            0
        },
-       16
+       4
    },
-   {PublicationRelationId,     /* PUBLICATIONOID */
-       PublicationObjectIndexId,
-       1,
+   {RelationRelationId,        /* RELNAMENSP */
+       ClassNameNspIndexId,
+       2,
        {
-           ObjectIdAttributeNumber,
-           0,
+           Anum_pg_class_relname,
+           Anum_pg_class_relnamespace,
            0,
            0
        },
-       8
+       128
    },
-   {PublicationRelationId,     /* PUBLICATIONNAME */
-       PublicationNameIndexId,
+   {RelationRelationId,        /* RELOID */
+       ClassOidIndexId,
        1,
        {
-           Anum_pg_publication_pubname,
+           ObjectIdAttributeNumber,
            0,
            0,
            0
        },
-       8
+       128
    },
-   {PublicationRelRelationId,  /* PUBLICATIONREL */
-       PublicationRelObjectIndexId,
+   {ReplicationOriginRelationId,       /* REPLORIGIDENT */
+       ReplicationOriginIdentIndex,
        1,
        {
-           ObjectIdAttributeNumber,
+           Anum_pg_replication_origin_roident,
            0,
            0,
            0
        },
-       64
+       16
    },
-   {PublicationRelRelationId,  /* PUBLICATIONRELMAP */
-       PublicationRelPrrelidPrpubidIndexId,
-       2,
+   {ReplicationOriginRelationId,       /* REPLORIGNAME */
+       ReplicationOriginNameIndex,
+       1,
        {
-           Anum_pg_publication_rel_prrelid,
-           Anum_pg_publication_rel_prpubid,
+           Anum_pg_replication_origin_roname,
+           0,
            0,
            0
        },
-       64
+       16
    },
    {RewriteRelationId,         /* RULERELNAME */
        RewriteRelRulenameIndexId,
@@ -760,23 +760,23 @@ static const struct cachedesc cacheinfo[] = {
        },
        128
    },
-   {SubscriptionRelationId,    /* SUBSCRIPTIONOID */
-       SubscriptionObjectIndexId,
-       1,
+   {SubscriptionRelationId,    /* SUBSCRIPTIONNAME */
+       SubscriptionNameIndexId,
+       2,
        {
-           ObjectIdAttributeNumber,
-           0,
+           Anum_pg_subscription_subdbid,
+           Anum_pg_subscription_subname,
            0,
            0
        },
        4
    },
-   {SubscriptionRelationId,    /* SUBSCRIPTIONNAME */
-       SubscriptionNameIndexId,
-       2,
+   {SubscriptionRelationId,    /* SUBSCRIPTIONOID */
+       SubscriptionObjectIndexId,
+       1,
        {
-           Anum_pg_subscription_subdbid,
-           Anum_pg_subscription_subname,
+           ObjectIdAttributeNumber,
+           0,
            0,
            0
        },

diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index e20284d06155aa3407086aaacfd5c2c329a6b92c..246601c90dbd05882f3d68512a5c6b92b0b0bc20 100644 (file)
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -75,22 +75,22 @@ enum SysCacheIdentifier
    PARTRELID,
    PROCNAMEARGSNSP,
    PROCOID,
+   PUBLICATIONNAME,
+   PUBLICATIONOID,
+   PUBLICATIONREL,
+   PUBLICATIONRELMAP,
    RANGETYPE,
    RELNAMENSP,
    RELOID,
    REPLORIGIDENT,
    REPLORIGNAME,
-   PUBLICATIONOID,
-   PUBLICATIONNAME,
-   PUBLICATIONREL,
-   PUBLICATIONRELMAP,
    RULERELNAME,
    SEQRELID,
    STATEXTNAMENSP,
    STATEXTOID,
    STATRELATTINH,
-   SUBSCRIPTIONOID,
    SUBSCRIPTIONNAME,
+   SUBSCRIPTIONOID,
    SUBSCRIPTIONRELMAP,
    TABLESPACEOID,
    TRFOID,