Commit1e5ef3a

committed

Drop "Lock" suffix from LWLock wait event names

Commitda952b4 unintentially reverted the SQL-visible part ofcommit14a9101, which breaks queries joining pg_wait_events withpg_stat_acivity. Remove the suffix again.Backpatch to 17.Reported-by: Christophe Courtois <christophe.courtois@dalibo.com>Author: Bertrand Drouvot <bertranddrouvot.pg@gmail.com>Discussion:https://postgr.es/m/18728-450924477056a339%40postgresql.orgDiscussion:https://postgr.es/m/Z01w1+LihtRiS0Te@ip-10-97-1-34.eu-west-3.compute.internal

1 parent4cc2a44 commit1e5ef3aCopy full SHA for 1e5ef3a

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@`
`107`	`107`	`$lastlockidx =$lockidx;`
`108`	`108`	`$continue =",\n";`
`109`	`109`
	`110`	`+# Add a "Lock" suffix to each lock name, as the C code depends on that`
`110`	`111`	`print$h"#define${lockname}Lock (&MainLWLockArray[$lockidx].lock)\n";`
`111`	`112`	`}`
`112`	`113`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ StaticAssertDecl(LW_VAL_EXCLUSIVE > (uint32) MAX_BACKENDS,`
`108`	`108`	`/*`
`109`	`109`	`* There are three sorts of LWLock "tranches":`
`110`	`110`	`*`
`111`		`- * 1. The individually-named locks defined inlwlocknames.h each have their`
	`111`	`+ * 1. The individually-named locks defined inlwlocklist.h each have their`
`112`	`112`	`* own tranche. We absorb the names of these tranches from there into`
`113`	`113`	`* BuiltinTrancheNames here.`
`114`	`114`	`*`
`@@ -124,7 +124,7 @@ StaticAssertDecl(LW_VAL_EXCLUSIVE > (uint32) MAX_BACKENDS,`
`124`	`124`	`* ... and do not forget to update the documentation's list of wait events.`
`125`	`125`	`*/`
`126`	`126`	`staticconstchar*constBuiltinTrancheNames[]= {`
`127`		`-#definePG_LWLOCK(id,lockname) [id]=CppAsString(lockname)"Lock",`
	`127`	`+#definePG_LWLOCK(id,lockname) [id]=CppAsString(lockname),`
`128`	`128`	`#include"storage/lwlocklist.h"`
`129`	`129`	`#undefPG_LWLOCK`
`130`	`130`	`[LWTRANCHE_XACT_BUFFER]="XactBuffer",`

Comments

(0)