upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-05-26 19:28:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

049_wait_for_lsn.pl: create function and procedure at once

Browse source 
Create the PL/pgSQL function and procedure for the top-level WAIT FOR
checks in a single transaction, then wait once for standby replay before
running both tests.  Also revise some surrounding comments.

This avoids an extra 'wait_for_catchup()' on the delayed standby without
changing the test coverage.

Discussion: https://postgr.es/m/CABPTF7WZ1yuYz8V%3Dxsbghg8e7qaAm5MpyNw6BthWcbN7%2BP6biw%40mail.gmail.com
Author: Xuneng Zhou <xunengzhou@gmail.com>
Reviewed-by: Alexander Korotkov <aekorotkov@gmail.com>
This commit is contained in:
Alexander Korotkov 2026-04-20 13:05:55 +03:00
parent 20efbdffeb
commit 23cbadeeb4
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/test/recovery/t/049_wait_for_lsn.pl
View file

@ -172,8 +172,8 @@ ok($output eq "timeout", "WAIT FOR returns correct status after timeout");
# 5. Check mode validation: standby modes error on primary, primary mode errors
# on standby, and primary_flush works on primary. Also check that WAIT FOR
# triggers an error if called within another function or inside a transaction
# with an isolation level higher than READ COMMITTED.
# triggers an error if called within a function, procedure, anonymous DO block,
# or inside a transaction with an isolation level higher than READ COMMITTED.
# Test standby_flush on primary - should error
$node_primary->psql(
@ -200,6 +200,8 @@ ok( $stderr =~
"get an error when running in a transaction with an isolation level higher than REPEATABLE READ"
);
# Test wrapping WAIT FOR into function, procedure, and anonymous DO block --
# should error
$node_primary->safe_psql(
'postgres', qq[
CREATE FUNCTION pg_wal_replay_wait_wrap(target_lsn pg_lsn) RETURNS void AS \$\$
@ -208,6 +210,13 @@ CREATE FUNCTION pg_wal_replay_wait_wrap(target_lsn pg_lsn) RETURNS void AS \$\$
END
\$\$
LANGUAGE plpgsql;
CREATE PROCEDURE pg_wal_replay_wait_proc(target_lsn pg_lsn) AS \$\$
BEGIN
EXECUTE format('WAIT FOR LSN %L;', target_lsn);
END
\$\$
LANGUAGE plpgsql;
]);
$node_primary->wait_for_catchup($node_standby);
@ -218,17 +227,6 @@ $node_standby->psql(
ok($stderr =~ /WAIT FOR can only be executed as a top-level statement/,
"get an error when running within a function");
$node_primary->safe_psql(
'postgres', qq[
CREATE PROCEDURE pg_wal_replay_wait_proc(target_lsn pg_lsn) AS \$\$
BEGIN
EXECUTE format('WAIT FOR LSN %L;', target_lsn);
END
\$\$
LANGUAGE plpgsql;
]);
$node_primary->wait_for_catchup($node_standby);
$node_standby->psql(
'postgres',
"CALL pg_wal_replay_wait_proc('${lsn3}');",