From c8e318b1b8d9b699a96b96db861b362550456108 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Wed, 4 Oct 2023 16:16:50 +0900 Subject: [PATCH] worker_spi: Rename custom wait event to "WorkerSpiMain" This naming is more consistent with all the other user-facing wait event strings. Other in-core modules will use the same naming convention, so let's be consistent here as well. Extracted from a larger patch by the same author. Author: Masahiro Ikeda Discussion: https://postgr.es/m/197bce267fa691a0ac62c86c4ab904c4@oss.nttdata.com --- doc/src/sgml/xfunc.sgml | 6 +++--- src/test/modules/worker_spi/t/001_worker_spi.pl | 12 ++++++------ src/test/modules/worker_spi/worker_spi.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml index 281c178b0e..96ba95818c 100644 --- a/doc/src/sgml/xfunc.sgml +++ b/doc/src/sgml/xfunc.sgml @@ -3472,9 +3472,9 @@ uint32 WaitEventExtensionNew(const char *wait_event_name) =# SELECT wait_event_type, wait_event FROM pg_stat_activity WHERE backend_type ~ 'worker_spi'; - wait_event_type | wait_event ------------------+----------------- - Extension | worker_spi_main + wait_event_type | wait_event +-----------------+--------------- + Extension | WorkerSpiMain (1 row) diff --git a/src/test/modules/worker_spi/t/001_worker_spi.pl b/src/test/modules/worker_spi/t/001_worker_spi.pl index 2965acd789..f3ef395554 100644 --- a/src/test/modules/worker_spi/t/001_worker_spi.pl +++ b/src/test/modules/worker_spi/t/001_worker_spi.pl @@ -43,15 +43,15 @@ is($result, qq(total|1), 'dynamic bgworker correctly consumed tuple data'); $result = $node->poll_query_until( 'postgres', qq[SELECT wait_event FROM pg_stat_activity WHERE backend_type ~ 'worker_spi';], - qq[worker_spi_main]); + qq[WorkerSpiMain]); is($result, 1, - 'dynamic bgworker has reported "worker_spi_main" as wait event'); + 'dynamic bgworker has reported "WorkerSpiMain" as wait event'); # Check the wait event used by the dynamic bgworker appears in pg_wait_events $result = $node->safe_psql('postgres', - q[SELECT count(*) > 0 from pg_wait_events where type = 'Extension' and name = 'worker_spi_main';] + q[SELECT count(*) > 0 from pg_wait_events where type = 'Extension' and name = 'WorkerSpiMain';] ); -is($result, 't', '"worker_spi_main" is reported in pg_wait_events'); +is($result, 't', '"WorkerSpiMain" is reported in pg_wait_events'); note "testing bgworkers loaded with shared_preload_libraries"; @@ -74,7 +74,7 @@ ok( $node->poll_query_until( 'mydb', qq[SELECT datname, count(datname), wait_event FROM pg_stat_activity WHERE backend_type = 'worker_spi' GROUP BY datname, wait_event;], - 'mydb|3|worker_spi_main'), + 'mydb|3|WorkerSpiMain'), 'bgworkers all launched' ) or die "Timed out while waiting for bgworkers to be launched"; @@ -89,7 +89,7 @@ ok( $node->poll_query_until( qq[SELECT datname, count(datname), wait_event FROM pg_stat_activity WHERE backend_type = 'worker_spi dynamic' AND pid IN ($worker1_pid, $worker2_pid) GROUP BY datname, wait_event;], - 'mydb|2|worker_spi_main'), + 'mydb|2|WorkerSpiMain'), 'dynamic bgworkers all launched' ) or die "Timed out while waiting for dynamic bgworkers to be launched"; diff --git a/src/test/modules/worker_spi/worker_spi.c b/src/test/modules/worker_spi/worker_spi.c index 98f8d4194b..2e3114990e 100644 --- a/src/test/modules/worker_spi/worker_spi.c +++ b/src/test/modules/worker_spi/worker_spi.c @@ -194,7 +194,7 @@ worker_spi_main(Datum main_arg) /* First time, allocate or get the custom wait event */ if (worker_spi_wait_event_main == 0) - worker_spi_wait_event_main = WaitEventExtensionNew("worker_spi_main"); + worker_spi_wait_event_main = WaitEventExtensionNew("WorkerSpiMain"); /* * Background workers mustn't call usleep() or any direct equivalent: -- 2.39.5