summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch2020-08-15 23:15:59 +0000
committerNoah Misch2020-08-15 23:16:34 +0000
commit85aa22cb120d0ee91d41dfa27d307a95f01df89f (patch)
tree1b1541fd6439b2da4645ec05f133d97e3b3e2256
parent5ae01df6f6ef590fd73299050c7112f69c03f3de (diff)
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/[email protected]
-rw-r--r--src/backend/utils/adt/lockfuncs.c4
-rw-r--r--src/include/storage/lock.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c
index 3b5627d887..a11c711d72 100644
--- 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 f425c3b56e..6071a75600 100644
--- 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[];