NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit06e50d8

committed

Move new LOCKTAG_DATABASE_FROZEN_IDS to end of enum LockTagType.

Several PGXN modules reference LockTagType values; renumbering wouldforce a recompile of those modules. Oversight in back-patch of today'scommit566372b. Back-patch to releasedbranches, v12 through 9.5.Reported by Tom Lane.Discussion:https://postgr.es/m/921383.1597523945@sss.pgh.pa.us

1 parent30e68a2 commit06e50d8Copy full SHA for 06e50d8

File tree

2 files changed

-5

lines changed

src
- backend/utils/adt
  - lockfuncs.c
- include/storage
  - lock.h

2 files changed

-5

lines changed

`‎src/backend/utils/adt/lockfuncs.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,15 @@`
`26`	`26`	`constchar*constLockTagTypeNames[]= {`
`27`	`27`	`"relation",`
`28`	`28`	`"extend",`
`29`		`-"frozenid",`
`30`	`29`	`"page",`
`31`	`30`	`"tuple",`
`32`	`31`	`"transactionid",`
`33`	`32`	`"virtualxid",`
`34`	`33`	`"speculative token",`
`35`	`34`	`"object",`
`36`	`35`	`"userlock",`
`37`		`-"advisory"`
	`36`	`+"advisory",`
	`37`	`+"frozenid"`
`38`	`38`	`};`
`39`	`39`
`40`	`40`	`/* This must match enum PredicateLockTargetType (predicate_internals.h) */`

`‎src/include/storage/lock.h`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,18 +139,18 @@ typedef enum LockTagType`
`139`	`139`	`{`
`140`	`140`	`LOCKTAG_RELATION,/* whole relation */`
`141`	`141`	`LOCKTAG_RELATION_EXTEND,/* the right to extend a relation */`
`142`		`-LOCKTAG_DATABASE_FROZEN_IDS,/* pg_database.datfrozenxid */`
`143`	`142`	`LOCKTAG_PAGE,/* one page of a relation */`
`144`	`143`	`LOCKTAG_TUPLE,/* one physical tuple */`
`145`	`144`	`LOCKTAG_TRANSACTION,/* transaction (for waiting for xact done) */`
`146`	`145`	`LOCKTAG_VIRTUALTRANSACTION,/* virtual transaction (ditto) */`
`147`	`146`	`LOCKTAG_SPECULATIVE_TOKEN,/* speculative insertion Xid and token */`
`148`	`147`	`LOCKTAG_OBJECT,/* non-relation database object */`
`149`	`148`	`LOCKTAG_USERLOCK,/* reserved for old contrib/userlock code */`
`150`		`-LOCKTAG_ADVISORY/* advisory user locks */`
	`149`	`+LOCKTAG_ADVISORY,/* advisory user locks */`
	`150`	`+LOCKTAG_DATABASE_FROZEN_IDS/* pg_database.datfrozenxid */`
`151`	`151`	`}LockTagType;`
`152`	`152`
`153`		`-#defineLOCKTAG_LAST_TYPELOCKTAG_ADVISORY`
	`153`	`+#defineLOCKTAG_LAST_TYPELOCKTAG_DATABASE_FROZEN_IDS`
`154`	`154`
`155`	`155`	`externconstchar*constLockTagTypeNames[];`
`156`	`156`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit06e50d8

File tree

2 files changed

2 files changed

`‎src/backend/utils/adt/lockfuncs.c`

`‎src/include/storage/lock.h`

0 commit comments