diff options
author | Noah Misch | 2020-08-15 23:15:59 +0000 |
---|---|---|
committer | Noah Misch | 2020-08-15 23:16:29 +0000 |
commit | e8e44e89090647f56bd62ce4f75ba11dd5bb77be (patch) | |
tree | 90c9c31807e6a086f825025a52a110d5833fa6fb | |
parent | e525770dd504e5f182229b9bee64430ebe71a2a8 (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.c | 4 | ||||
-rw-r--r-- | src/include/storage/lock.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index 4ed5bf15f9..b39b824ed7 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 cf1bed6ea4..5d1d2763bc 100644 --- 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[]; |