From 85aa22cb120d0ee91d41dfa27d307a95f01df89f Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Sat, 15 Aug 2020 16:15:59 -0700 Subject: 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 --- src/include/storage/lock.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/include/storage') diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index f425c3b56e0..6071a756006 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[]; -- cgit v1.2.3