Move new LOCKTAG_DATABASE_FROZEN_IDS to end of enum LockTagType.

nmisch · nmisch · commit e8e44e890906 · 2020-08-15T16:16:29.000-07:00
Several PGXN modules reference LockTagType values; renumbering would force a recompile of those modules. Oversight in back-patch of today's commit 566372b. 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
@@ -26,15 +26,15 @@
 const char *const LockTagTypeNames[] = {
 	"relation",
 	"extend",
-	"frozenid",
 	"page",
 	"tuple",
 	"transactionid",
 	"virtualxid",
 	"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
@@ -141,8 +141,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 */
@@ -162,10 +160,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[];
 
