diff options
| author | Noah Misch | 2020-08-15 23:15:59 +0000 |
|---|---|---|
| committer | Noah Misch | 2020-08-15 23:16:42 +0000 |
| commit | d8a22a387b484e73e5a938874dc3a737452c4f1a (patch) | |
| tree | 1b7b555138cbf8b7fe47fcc8b41838911e12e8aa | |
| parent | 3fbbf64ceecbd0fe675850070ea1e5d77c401c4f (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 430e8c8703..95155d689e 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -25,7 +25,6 @@ static const char *const LockTagTypeNames[] = { "relation", "extend", - "frozenid", "page", "tuple", "transactionid", @@ -33,7 +32,8 @@ static 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 9019ae8dcd..60aaf78d9c 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -168,8 +168,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 */ @@ -189,10 +187,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 /* * The LOCKTAG struct is defined with malice aforethought to fit into 16 |