Commit80d2f4c

committed

Fix ADVISORY lock test fail. Reordering enum.

1 parent4ee2ad8 commit80d2f4cCopy full SHA for 80d2f4c

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1011,6 +1011,11 @@ DescribeLockTag(StringInfo buf, const LOCKTAG *tag)`
`1011`	`1011`	`tag->locktag_field3,`
`1012`	`1012`	`tag->locktag_field4);`
`1013`	`1013`	`break;`
	`1014`	`+caseLOCKTAG_SMGR:`
	`1015`	`+appendStringInfo(buf,`
	`1016`	`+_("smgr lock %u"),`
	`1017`	`+tag->locktag_field1);`
	`1018`	`+break;`
`1014`	`1019`	`default:`
`1015`	`1020`	`appendStringInfo(buf,`
`1016`	`1021`	`_("unrecognized locktag type %d"),`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,6 @@ typedef enum LockTagType`
`168`	`168`	`/* ID info for a relation is DB OID + REL OID; DB OID = 0 if shared */`
`169`	`169`	`LOCKTAG_RELATION_EXTEND,/* the right to extend a relation */`
`170`	`170`	`/* same ID info as RELATION */`
`171`		`-LOCKTAG_SMGR,/**/`
`172`		`-/**/`
`173`	`171`	`LOCKTAG_PAGE,/* one page of a relation */`
`174`	`172`	`/* ID info for a page is RELATION info + BlockNumber */`
`175`	`173`	`LOCKTAG_TUPLE,/* one physical tuple */`
`@@ -189,7 +187,8 @@ typedef enum LockTagType`
`189`	`187`	`* Also, we use DB OID = 0 for shared objects such as tablespaces.`
`190`	`188`	`*/`
`191`	`189`	`LOCKTAG_USERLOCK,/* reserved for old contrib/userlock code */`
`192`		`-LOCKTAG_ADVISORY/* advisory user locks */`
	`190`	`+LOCKTAG_ADVISORY,/* advisory user locks */`
	`191`	`+LOCKTAG_SMGR/**/`
`193`	`192`	`}LockTagType;`
`194`	`193`
`195`	`194`	`#defineLOCKTAG_LAST_TYPELOCKTAG_ADVISORY`

Comments

(0)