MIME-Version: 1.0
From: Xuneng Zhou <xunengzhou@gmail.com>
Date: Fri, 17 Apr 2026 20:25:35 +0800
Message-ID: 
 <CABPTF7WZ1yuYz8V=xsbghg8e7qaAm5MpyNw6BthWcbN7+P6biw@mail.gmail.com>
Subject: test: avoid redundant standby catchup in 049_wait_for_lsn
To: pgsql-hackers <pgsql-hackers@lists.postgresql.org>,
	Alexander Korotkov <aekorotkov@gmail.com>
Content-Type: multipart/mixed; boundary="0000000000009a26a2064fa70cb3"
Archived-At: 
 <https://www.postgresql.org/message-id/CABPTF7WZ1yuYz8V%3Dxsbghg8e7qaAm5MpyNw6BthWcbN7%2BP6biw%40mail.gmail.com>
Precedence: bulk

--0000000000009a26a2064fa70cb3
Content-Type: text/plain; charset="UTF-8"

Hi Alexander, Hackers,

While working on adding more edge-case tests and fixing the timeline
handling for WAIT FOR LSN, I noticed that the overall runtime of the
test had increased by about 7 seconds since a8b61c23c5ff. I looked
into the slowdown and found a potential source.

Currently, the test creates the function, waits for the standby to
catch up, tests it, then creates the procedure and waits for the
standby to catch up again. Since both objects are only used by the
same block of top-level statement checks, we can create them together
in a single primary-side transaction and perform just one
wait_for_catchup() before running both standby-side calls.

This small TAP cleanup merges the creation of the PL/pgSQL wrapper
function and procedure used for the top-level WAIT FOR checks in
049_wait_for_lsn.pl.

The change preserves the same coverage while removing one redundant
replay catch-up on the delayed standby. It appears to reduce the test
runtime by about 7 seconds, though I have looked into why much of the
improvement comes from this change alone.

Patch attached.

Thanks.
--
Best,
Xuneng

--0000000000009a26a2064fa70cb3
Content-Type: application/x-patch;
	name="v1-0001-test-merge-wrapper-DDL-and-catchup-in-wait_for_ls.patch"
Content-Disposition: attachment;
	filename="v1-0001-test-merge-wrapper-DDL-and-catchup-in-wait_for_ls.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_mo2vpl7w0>
X-Attachment-Id: f_mo2vpl7w0

RnJvbSA1ZDY3YTViMmYzNzQyM2U2OWYzYTcxZDM1MWZlYWUzNDlhYWYyNWE5IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBhbHRlcmVnbzY1NSA8ODI0NjYyNTI2QHFxLmNvbT4KRGF0ZTog
RnJpLCAxNyBBcHIgMjAyNiAyMDowODo1OSArMDgwMApTdWJqZWN0OiBbUEFUQ0ggdjFdIHRlc3Q6
IG1lcmdlIHdyYXBwZXIgRERMIGFuZCBjYXRjaHVwIGluIHdhaXRfZm9yX2xzbiBUQVAKCkNyZWF0
ZSB0aGUgUEwvcGdTUUwgZnVuY3Rpb24gYW5kIHByb2NlZHVyZSBmb3IgdGhlIHRvcC1sZXZlbCBX
QUlUIEZPUgpjaGVja3MgaW4gYSBzaW5nbGUgdHJhbnNhY3Rpb24sIHRoZW4gd2FpdCBvbmNlIGZv
ciBzdGFuZGJ5IHJlcGxheSBiZWZvcmUKcnVubmluZyBib3RoIHRlc3RzLgoKVGhpcyBhdm9pZHMg
YW4gZXh0cmEgJ3dhaXRfZm9yX2NhdGNodXAoKScgb24gdGhlIGRlbGF5ZWQgc3RhbmRieSB3aXRo
b3V0CmNoYW5naW5nIHRoZSB0ZXN0IGNvdmVyYWdlLgotLS0KIHNyYy90ZXN0L3JlY292ZXJ5L3Qv
MDQ5X3dhaXRfZm9yX2xzbi5wbCB8IDE4ICsrKysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n
ZWQsIDcgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL3Rl
c3QvcmVjb3ZlcnkvdC8wNDlfd2FpdF9mb3JfbHNuLnBsIGIvc3JjL3Rlc3QvcmVjb3ZlcnkvdC8w
NDlfd2FpdF9mb3JfbHNuLnBsCmluZGV4IDgzNThjNTdmN2I3Li4xMWFkY2RhMWU5YSAxMDA2NDQK
LS0tIGEvc3JjL3Rlc3QvcmVjb3ZlcnkvdC8wNDlfd2FpdF9mb3JfbHNuLnBsCisrKyBiL3NyYy90
ZXN0L3JlY292ZXJ5L3QvMDQ5X3dhaXRfZm9yX2xzbi5wbApAQCAtMjA4LDE4ICsyMDgsNyBAQCBD
UkVBVEUgRlVOQ1RJT04gcGdfd2FsX3JlcGxheV93YWl0X3dyYXAodGFyZ2V0X2xzbiBwZ19sc24p
IFJFVFVSTlMgdm9pZCBBUyBcJFwkCiAgIEVORAogXCRcJAogTEFOR1VBR0UgcGxwZ3NxbDsKLV0p
OwotCi0kbm9kZV9wcmltYXJ5LT53YWl0X2Zvcl9jYXRjaHVwKCRub2RlX3N0YW5kYnkpOwotJG5v
ZGVfc3RhbmRieS0+cHNxbCgKLQkncG9zdGdyZXMnLAotCSJTRUxFQ1QgcGdfd2FsX3JlcGxheV93
YWl0X3dyYXAoJyR7bHNuM30nKTsiLAotCXN0ZGVyciA9PiBcJHN0ZGVycik7Ci1vaygkc3RkZXJy
ID1+IC9XQUlUIEZPUiBjYW4gb25seSBiZSBleGVjdXRlZCBhcyBhIHRvcC1sZXZlbCBzdGF0ZW1l
bnQvLAotCSJnZXQgYW4gZXJyb3Igd2hlbiBydW5uaW5nIHdpdGhpbiBhIGZ1bmN0aW9uIik7CiAK
LSRub2RlX3ByaW1hcnktPnNhZmVfcHNxbCgKLQkncG9zdGdyZXMnLCBxcVsKIENSRUFURSBQUk9D
RURVUkUgcGdfd2FsX3JlcGxheV93YWl0X3Byb2ModGFyZ2V0X2xzbiBwZ19sc24pIEFTIFwkXCQK
ICAgQkVHSU4KICAgICBFWEVDVVRFIGZvcm1hdCgnV0FJVCBGT1IgTFNOICVMOycsIHRhcmdldF9s
c24pOwpAQCAtMjI5LDYgKzIxOCwxMyBAQCBMQU5HVUFHRSBwbHBnc3FsOwogXSk7CiAKICRub2Rl
X3ByaW1hcnktPndhaXRfZm9yX2NhdGNodXAoJG5vZGVfc3RhbmRieSk7Ciskbm9kZV9zdGFuZGJ5
LT5wc3FsKAorCSdwb3N0Z3JlcycsCisJIlNFTEVDVCBwZ193YWxfcmVwbGF5X3dhaXRfd3JhcCgn
JHtsc24zfScpOyIsCisJc3RkZXJyID0+IFwkc3RkZXJyKTsKK29rKCRzdGRlcnIgPX4gL1dBSVQg
Rk9SIGNhbiBvbmx5IGJlIGV4ZWN1dGVkIGFzIGEgdG9wLWxldmVsIHN0YXRlbWVudC8sCisJImdl
dCBhbiBlcnJvciB3aGVuIHJ1bm5pbmcgd2l0aGluIGEgZnVuY3Rpb24iKTsKKwogJG5vZGVfc3Rh
bmRieS0+cHNxbCgKIAkncG9zdGdyZXMnLAogCSJDQUxMIHBnX3dhbF9yZXBsYXlfd2FpdF9wcm9j
KCcke2xzbjN9Jyk7IiwKLS0gCjIuNTEuMAoK
--0000000000009a26a2064fa70cb3--