Move new LOCKTAG_DATABASE_FROZEN_IDS to end of enum LockTagType.

Several PGXN modules reference LockTagType values; renumbering would
force a recompile of those modules.  Oversight in back-patch of today's
commit 566372b3d6435639e4cc4476d79b8505a0297c87.  Back-patch to released
branches, v12 through 9.5.

Reported by Tom Lane.

Discussion: https://postgr.es/m/921383.1597523945@sss.pgh.pa.us

diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c
index 3b5627d8879a6a172d10e8801e3035f303de5d0c..a11c711d725c293a4a9bbbf5ee634a5d5144c86c 100644 (file)
--- a/src/backend/utils/adt/lockfuncs.c
+++ b/src/backend/utils/adt/lockfuncs.c
@@ -26,7 +26,6 @@
 const char *const LockTagTypeNames[] = {
    "relation",
    "extend",
-   "frozenid",
    "page",
    "tuple",
    "transactionid",
@@ -34,7 +33,8 @@ const char *const LockTagTypeNames[] = {
    "speculative token",
    "object",
    "userlock",
-   "advisory"
+   "advisory",
+   "frozenid"
 };
 
 /* This must match enum PredicateLockTargetType (predicate_internals.h) */

diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index f425c3b56e0a394425b029f6719ffffa1cc29cf7..6071a75600690c16fedff7fc0ff1ba49dd37a22e 100644 (file)
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -142,8 +142,6 @@ typedef enum LockTagType
    /* ID info for a relation is DB OID + REL OID; DB OID = 0 if shared */
    LOCKTAG_RELATION_EXTEND,    /* the right to extend a relation */
    /* same ID info as RELATION */
-   LOCKTAG_DATABASE_FROZEN_IDS,    /* pg_database.datfrozenxid */
-   /* ID info for frozen IDs is DB OID */
    LOCKTAG_PAGE,               /* one page of a relation */
    /* ID info for a page is RELATION info + BlockNumber */
    LOCKTAG_TUPLE,              /* one physical tuple */
@@ -163,10 +161,12 @@ typedef enum LockTagType
     * Also, we use DB OID = 0 for shared objects such as tablespaces.
     */
    LOCKTAG_USERLOCK,           /* reserved for old contrib/userlock code */
-   LOCKTAG_ADVISORY            /* advisory user locks */
+   LOCKTAG_ADVISORY,           /* advisory user locks */
+   LOCKTAG_DATABASE_FROZEN_IDS /* pg_database.datfrozenxid */
+   /* ID info for frozen IDs is DB OID */
 } LockTagType;
 
-#define LOCKTAG_LAST_TYPE  LOCKTAG_ADVISORY
+#define LOCKTAG_LAST_TYPE  LOCKTAG_DATABASE_FROZEN_IDS
 
 extern const char *const LockTagTypeNames[];