database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-28 05:21:27 +03:00
Code

Drop "Lock" suffix from LWLock wait event names

Browse Source 
Commit da952b415f44 unintentially reverted the SQL-visible part of
commit 14a910109126, which breaks queries joining pg_wait_events with
pg_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.org
Discussion: https://postgr.es/m/Z01w1+LihtRiS0Te@ip-10-97-1-34.eu-west-3.compute.internal
This commit is contained in:
Álvaro Herrera 2024-12-03 15:50:03 +01:00
parent 7a35052a2b
commit 5ffbbcfa16
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/backend/storage/lmgr/generate-lwlocknames.pl
View File

@ -107,6 +107,7 @@ while (<$lwlocklist>)
$lastlockidx = $lockidx; $lastlockidx = $lockidx;
$continue = ",\n"; $continue = ",\n";
# Add a "Lock" suffix to each lock name, as the C code depends on that
print $h "#define ${lockname}Lock (&MainLWLockArray[$lockidx].lock)\n"; print $h "#define ${lockname}Lock (&MainLWLockArray[$lockidx].lock)\n";
} }

4
src/backend/storage/lmgr/lwlock.c
View File

@ -111,7 +111,7 @@ StaticAssertDecl(LW_VAL_EXCLUSIVE > (uint32) MAX_BACKENDS,
/* /*
* There are three sorts of LWLock "tranches": * There are three sorts of LWLock "tranches":
* *
* 1. The individually-named locks defined in lwlocknames.h each have their * 1. The individually-named locks defined in lwlocklist.h each have their
* own tranche. We absorb the names of these tranches from there into * own tranche. We absorb the names of these tranches from there into
* BuiltinTrancheNames here. * BuiltinTrancheNames here.
* *
@ -127,7 +127,7 @@ StaticAssertDecl(LW_VAL_EXCLUSIVE > (uint32) MAX_BACKENDS,
* ... and do not forget to update the documentation's list of wait events. * ... and do not forget to update the documentation's list of wait events.
*/ */
static const char *const BuiltinTrancheNames[] = { static const char *const BuiltinTrancheNames[] = {
#define PG_LWLOCK(id, lockname) [id] = CppAsString(lockname) "Lock", #define PG_LWLOCK(id, lockname) [id] = CppAsString(lockname),
#include "storage/lwlocklist.h" #include "storage/lwlocklist.h"
#undef PG_LWLOCK #undef PG_LWLOCK
[LWTRANCHE_XACT_BUFFER] = "XactBuffer", [LWTRANCHE_XACT_BUFFER] = "XactBuffer",