Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1u0qRY-00951i-AW for pgsql-hackers@arkaria.postgresql.org; Fri, 04 Apr 2025 23:27:26 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1u0qRW-006Fr9-TG for pgsql-hackers@arkaria.postgresql.org; Fri, 04 Apr 2025 23:27:22 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1u0qRW-006Fr1-BV for pgsql-hackers@lists.postgresql.org; Fri, 04 Apr 2025 23:27:22 +0000 Received: from mail.postgrespro.ru ([93.174.132.70]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1u0qRS-0030Aq-2s for pgsql-hackers@postgresql.org; Fri, 04 Apr 2025 23:27:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=postgrespro.ru; s=mx2023; t=1743809235; bh=b/qSMWpnzT5TnxjXM/EsWLMvdncQTwgXNIlNqIDmx5M=; h=Message-ID:Date:User-Agent:Subject:To:Cc:References:From: In-Reply-To:From; b=6NlfcJP0OXB83nkkc/SHErkALkwm8O09Ky4Gnr/fHt4M1RByQQhyGDj3D4Mjz5R0K ZqGgsoeWty5Uu/lq+4GjagyZHhsVdFXAjgz5s786Odfow9oLE0zhe4KAVog2/UTqXf LmaYYXTO+KMHWUlY3miyQq8RMSgOON/ZkAcPnzFdmUdjgWEfwKKxDxw9e+E24H9ph3 RGQqkKLohfoWfthHms1yeE6wRXSYzG2cwDi1/UP6iabuhylUqTTDPEbPma6mrhaKWh 91nMQ7BQkxYMk8VVeLG8kGMrI3NWwTjIzORHbIzDWuBNIHxbCYGfEZYRwcFTwhDNo6 i7ywM+HrBHdjw== Received: from [172.30.48.114] (unknown [93.174.131.138]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: a.melnikov@postgrespro.ru) by mail.postgrespro.ru (Postfix/587) with ESMTPSA id 40973606B2; Sat, 5 Apr 2025 02:27:15 +0300 (MSK) Content-Type: multipart/mixed; boundary="------------mySceTlTmmzkVnFNxjJ5t90j" Message-ID: Date: Sat, 5 Apr 2025 02:27:14 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Use XLOG_CONTROL_FILE macro everywhere? To: Fujii Masao , Kyotaro Horiguchi Cc: daniel@yesql.se, peter@eisentraut.org, tgl@sss.pgh.pa.us, robertmhaas@gmail.com, michael@paquier.xyz, pgsql-hackers@postgresql.org References: <54B16BF2-6979-4BB0-BE39-118D32B1BC58@yesql.se> <20240903.143756.562059416508617821.horikyota.ntt@gmail.com> <20240904.170927.1051663922860738119.horikyota.ntt@gmail.com> <359568e0-cffc-4f64-b84c-eee76ba229b8@postgrespro.ru> <2883bd25-f362-41ed-8d41-b6e0aac8fa27@postgrespro.ru> <18d80eb9-1e7a-4ead-98fe-60efc988954b@oss.nttdata.com> Content-Language: en-US From: "Anton A. Melnikov" In-Reply-To: <18d80eb9-1e7a-4ead-98fe-60efc988954b@oss.nttdata.com> X-KSMG-AntiPhishing: NotDetected, bases: 2025/04/04 22:26:00 X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.1.0.7854, bases: 2025/04/04 21:32:00 #27856333 X-KSMG-AntiVirus-Status: NotDetected, skipped X-KSMG-LinksScanning: not scanned, disabled by settings X-KSMG-Message-Action: skipped X-KSMG-Rule-ID: 1 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------mySceTlTmmzkVnFNxjJ5t90j Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi! On 04.04.2025 19:32, Fujii Masao wrote: > I'm not sure there's clear consensus yet on the changes in the 0001 and > 0002 patches, and it might not be worth rushing them in right before > the feature freeze. So for now, I reviewed and updated only the 0003 patch, > since there seems to be agreement on that one. > > I've attached the updated version. It fixes a typo and replaces > the remaining hardcoded control file name with the XLOG_CONTROL_FILE macro. Thanks! Looks good for me. Maybe extend this to perl tests since there are several hardcoded names too? The patch attached tries to do this. > How about committing the attached patch first? We can consider applying > the others later if consensus is reached Yes, of cause. IMO, this is the best way now. Best wishes, -- Anton A. Melnikov Postgres Professional: http://www.postgrespro.com The Russian Postgres Company --------------mySceTlTmmzkVnFNxjJ5t90j Content-Type: text/x-patch; charset=UTF-8; name="0004-Use-XLOG_CONTROL_FILE-macro-in-TAP-tests.patch" Content-Disposition: attachment; filename="0004-Use-XLOG_CONTROL_FILE-macro-in-TAP-tests.patch" Content-Transfer-Encoding: base64 RnJvbSAzNzAxMzdhZjBkYmEzOTBkYTgyNWE0YzU1NmY3ZGM5MWU2YzZiMDBhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiAiQW50b24gQS4gTWVsbmlrb3YiIDxhLm1lbG5pa292 QHBvc3RncmVzcHJvLnJ1PgpEYXRlOiBTYXQsIDUgQXByIDIwMjUgMDE6Mzg6NDUgKzAzMDAK U3ViamVjdDogW1BBVENIXSBVc2UgWExPR19DT05UUk9MX0ZJTEUgbWFjcm8gaW4gVEFQIHRl c3RzLgoKLS0tCiAuLi4vcGdfY29udHJvbGRhdGEvdC8wMDFfcGdfY29udHJvbGRhdGEucGwg ICAgfCAgMiArLQogc3JjL2Jpbi9wZ19yZXNldHdhbC90LzAwMl9jb3JydXB0ZWQucGwgICAg ICAgIHwgIDIgKy0KIHNyYy9iaW4vcGdfdmVyaWZ5YmFja3VwL3QvMDAzX2NvcnJ1cHRpb24u cGwgICB8ICAzICsrLQogc3JjL3Rlc3QvcGVybC9Qb3N0Z3JlU1FML1Rlc3QvQ2x1c3Rlci5w bSAgICAgIHwgMjEgKysrKysrKysrKysrKysrKysrLQogc3JjL3Rlc3QvcmVjb3ZlcnkvdC8w NDJfbG93X2xldmVsX2JhY2t1cC5wbCAgIHwgMTEgKysrKystLS0tLQogNSBmaWxlcyBjaGFu Z2VkLCAzMCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Ny Yy9iaW4vcGdfY29udHJvbGRhdGEvdC8wMDFfcGdfY29udHJvbGRhdGEucGwgYi9zcmMvYmlu L3BnX2NvbnRyb2xkYXRhL3QvMDAxX3BnX2NvbnRyb2xkYXRhLnBsCmluZGV4IDRhZWEwMGQ2 ZDVhLi43NDEyYzc2ZTgzNyAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ19jb250cm9sZGF0YS90 LzAwMV9wZ19jb250cm9sZGF0YS5wbAorKysgYi9zcmMvYmluL3BnX2NvbnRyb2xkYXRhL3Qv MDAxX3BnX2NvbnRyb2xkYXRhLnBsCkBAIC0yMyw3ICsyMyw3IEBAIGNvbW1hbmRfbGlrZShb ICdwZ19jb250cm9sZGF0YScsICRub2RlLT5kYXRhX2RpciBdLAogCiAjIGNoZWNrIHdpdGgg YSBjb3JydXB0ZWQgcGdfY29udHJvbAogCi1teSAkcGdfY29udHJvbCA9ICRub2RlLT5kYXRh X2RpciAuICcvZ2xvYmFsL3BnX2NvbnRyb2wnOworbXkgJHBnX2NvbnRyb2wgPSAkbm9kZS0+ ZGF0YV9kaXIgLiAnLycgLiAkbm9kZS0+Y29udHJvbGZpbGU7CiBteSAkc2l6ZSA9IC1zICRw Z19jb250cm9sOwogCiBvcGVuIG15ICRmaCwgJz4nLCAkcGdfY29udHJvbCBvciBCQUlMX09V VCgkISk7CmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX3Jlc2V0d2FsL3QvMDAyX2NvcnJ1cHRl ZC5wbCBiL3NyYy9iaW4vcGdfcmVzZXR3YWwvdC8wMDJfY29ycnVwdGVkLnBsCmluZGV4IDNj ODBmNjMwOWM5Li4zYmYwODAzMDQ0MyAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ19yZXNldHdh bC90LzAwMl9jb3JydXB0ZWQucGwKKysrIGIvc3JjL2Jpbi9wZ19yZXNldHdhbC90LzAwMl9j b3JydXB0ZWQucGwKQEAgLTEzLDcgKzEzLDcgQEAgdXNlIFRlc3Q6Ok1vcmU7CiBteSAkbm9k ZSA9IFBvc3RncmVTUUw6OlRlc3Q6OkNsdXN0ZXItPm5ldygnbWFpbicpOwogJG5vZGUtPmlu aXQ7CiAKLW15ICRwZ19jb250cm9sID0gJG5vZGUtPmRhdGFfZGlyIC4gJy9nbG9iYWwvcGdf Y29udHJvbCc7CitteSAkcGdfY29udHJvbCA9ICRub2RlLT5kYXRhX2RpciAuICcvJyAuICRu b2RlLT5jb250cm9sZmlsZTsKIG15ICRzaXplID0gLXMgJHBnX2NvbnRyb2w7CiAKICMgUmVh ZCBvdXQgdGhlIGhlYWQgb2YgdGhlIGZpbGUgdG8gZ2V0IFBHX0NPTlRST0xfVkVSU0lPTiBp bgpkaWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ192ZXJpZnliYWNrdXAvdC8wMDNfY29ycnVwdGlv bi5wbCBiL3NyYy9iaW4vcGdfdmVyaWZ5YmFja3VwL3QvMDAzX2NvcnJ1cHRpb24ucGwKaW5k ZXggODRmMjNiOGJjM2QuLmFmMzlkNTdmYmM2IDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX3Zl cmlmeWJhY2t1cC90LzAwM19jb3JydXB0aW9uLnBsCisrKyBiL3NyYy9iaW4vcGdfdmVyaWZ5 YmFja3VwL3QvMDAzX2NvcnJ1cHRpb24ucGwKQEAgLTIzLDYgKzIzLDcgQEAgJHByaW1hcnkt PnN0YXJ0OwogbXkgJHNvdXJjZV90c19wYXRoID0gUG9zdGdyZVNRTDo6VGVzdDo6VXRpbHM6 OnRlbXBkaXJfc2hvcnQoKTsKIG15ICRzb3VyY2VfdHNfcHJlZml4ID0gJHNvdXJjZV90c19w YXRoOwogJHNvdXJjZV90c19wcmVmaXggPX4gcyEoXltBLVpdOi9bXi9dKikvLiohJDEhOwor bXkgJGNvbnRyb2xmaWxlID0gJHByaW1hcnktPmNvbnRyb2xmaWxlOwogCiAkcHJpbWFyeS0+ c2FmZV9wc3FsKCdwb3N0Z3JlcycsIDw8RU9NKTsKIENSRUFURSBUQUJMRSB4MSAoYSBpbnQp OwpAQCAtMjgwLDcgKzI4MSw3IEBAIHN1YiBtdXRpbGF0ZV9taXNzaW5nX3RhYmxlc3BhY2UK IHN1YiBtdXRpbGF0ZV9hcHBlbmRfdG9fZmlsZQogewogCW15ICgkYmFja3VwX3BhdGgpID0g QF87Ci0JYXBwZW5kX3RvX2ZpbGUgIiRiYWNrdXBfcGF0aC9nbG9iYWwvcGdfY29udHJvbCIs ICd4JzsKKwlhcHBlbmRfdG9fZmlsZSAiJGJhY2t1cF9wYXRoLyRjb250cm9sZmlsZSIsICd4 JzsKIAlyZXR1cm47CiB9CiAKZGlmZiAtLWdpdCBhL3NyYy90ZXN0L3BlcmwvUG9zdGdyZVNR TC9UZXN0L0NsdXN0ZXIucG0gYi9zcmMvdGVzdC9wZXJsL1Bvc3RncmVTUUwvVGVzdC9DbHVz dGVyLnBtCmluZGV4IDg3NTllZDJjYmJhLi4xN2ZmOGNlOGZhMyAxMDA2NDQKLS0tIGEvc3Jj L3Rlc3QvcGVybC9Qb3N0Z3JlU1FML1Rlc3QvQ2x1c3Rlci5wbQorKysgYi9zcmMvdGVzdC9w ZXJsL1Bvc3RncmVTUUwvVGVzdC9DbHVzdGVyLnBtCkBAIC0yNjMsNiArMjYzLDIwIEBAIHN1 YiBsb2dmaWxlCiAKID1wb2QKIAorPWl0ZW0gJG5vZGUtPmNvbnRyb2xmaWxlKCkKKworUGF0 aCB0byB0aGUgUG9zdGdyZVNRTCBjb250cm9sIGZpbGUgZm9yIHRoaXMgaW5zdGFuY2UuCisK Kz1jdXQKKworc3ViIGNvbnRyb2xmaWxlCit7CisJbXkgKCRzZWxmKSA9IEBfOworCXJldHVy biAkc2VsZi0+e19jb250cm9sZmlsZX07Cit9CisKKz1wb2QKKwogPWl0ZW0gJG5vZGUtPmNv bm5zdHIoKQogCiBHZXQgYSBsaWJwcSBjb25uZWN0aW9uIHN0cmluZyB0aGF0IHdpbGwgZXN0 YWJsaXNoIGEgY29ubmVjdGlvbiB0bwpAQCAtMTU5NSw2ICsxNjA5LDEwIEBAIHN1YiBuZXcK IAkJfQogCX0KIAorCW15IEBzY2FuX3Jlc3VsdCA9IFBvc3RncmVTUUw6OlRlc3Q6OlV0aWxz OjpzY2FuX3NlcnZlcl9oZWFkZXIoCisJCQkJCQknYWNjZXNzL3hsb2dfaW50ZXJuYWwuaCcs CisJCQkJCQknI2RlZmluZVxzK1hMT0dfQ09OVFJPTF9GSUxFXHMrIiguKikiJyk7CisJbXkg JGNvbnRyb2xmaWxlID0gJHNjYW5fcmVzdWx0WzBdOwogCW15ICR0ZXN0bmFtZSA9IGJhc2Vu YW1lKCQwKTsKIAkkdGVzdG5hbWUgPX4gcy9cLlteLl0rJC8vOwogCW15ICRub2RlID0gewpA QCAtMTYwNyw3ICsxNjI1LDggQEAgc3ViIG5ldwogCQlfbG9nZmlsZV9iYXNlID0+CiAJCSAg IiRQb3N0Z3JlU1FMOjpUZXN0OjpVdGlsczo6bG9nX3BhdGgvJHt0ZXN0bmFtZX1fJHtuYW1l fSIsCiAJCV9sb2dmaWxlID0+Ci0JCSAgIiRQb3N0Z3JlU1FMOjpUZXN0OjpVdGlsczo6bG9n X3BhdGgvJHt0ZXN0bmFtZX1fJHtuYW1lfS5sb2ciCisJCSAgIiRQb3N0Z3JlU1FMOjpUZXN0 OjpVdGlsczo6bG9nX3BhdGgvJHt0ZXN0bmFtZX1fJHtuYW1lfS5sb2ciLAorCQlfY29udHJv bGZpbGUgPT4gJGNvbnRyb2xmaWxlCiAJfTsKIAogCWlmICgkcGFyYW1ze2luc3RhbGxfcGF0 aH0pCmRpZmYgLS1naXQgYS9zcmMvdGVzdC9yZWNvdmVyeS90LzA0Ml9sb3dfbGV2ZWxfYmFj a3VwLnBsIGIvc3JjL3Rlc3QvcmVjb3ZlcnkvdC8wNDJfbG93X2xldmVsX2JhY2t1cC5wbApp bmRleCA1NzQ5YTFkZjUzMy4uZTI5NjI1MzZiMmIgMTAwNjQ0Ci0tLSBhL3NyYy90ZXN0L3Jl Y292ZXJ5L3QvMDQyX2xvd19sZXZlbF9iYWNrdXAucGwKKysrIGIvc3JjL3Rlc3QvcmVjb3Zl cnkvdC8wNDJfbG93X2xldmVsX2JhY2t1cC5wbApAQCAtNDEsOCArNDEsOSBAQCB1bmxpbmso IiRiYWNrdXBfZGlyL3Bvc3RtYXN0ZXIucGlkIikKICAgb3IgQkFJTF9PVVQoInVuYWJsZSB0 byB1bmxpbmsgJGJhY2t1cF9kaXIvcG9zdG1hc3Rlci5waWQiKTsKIHVubGluaygiJGJhY2t1 cF9kaXIvcG9zdG1hc3Rlci5vcHRzIikKICAgb3IgQkFJTF9PVVQoInVuYWJsZSB0byB1bmxp bmsgJGJhY2t1cF9kaXIvcG9zdG1hc3Rlci5vcHRzIik7Ci11bmxpbmsoIiRiYWNrdXBfZGly L2dsb2JhbC9wZ19jb250cm9sIikKLSAgb3IgQkFJTF9PVVQoInVuYWJsZSB0byB1bmxpbmsg JGJhY2t1cF9kaXIvZ2xvYmFsL3BnX2NvbnRyb2wiKTsKK215ICRjb250cm9sZmlsZSA9ICRu b2RlX3ByaW1hcnktPmNvbnRyb2xmaWxlOwordW5saW5rKCIkYmFja3VwX2Rpci8kY29udHJv bGZpbGUiKQorICBvciBCQUlMX09VVCgidW5hYmxlIHRvIHVubGluayAkYmFja3VwX2Rpci8k Y29udHJvbGZpbGUiKTsKIAogcm10cmVlKCIkYmFja3VwX2Rpci9wZ193YWwiKQogICBvciBC QUlMX09VVCgidW5hYmxlIHRvIHVubGluayBjb250ZW50cyBvZiAkYmFja3VwX2Rpci9wZ193 YWwiKTsKQEAgLTY5LDkgKzcwLDkgQEAgJG5vZGVfcHJpbWFyeS0+cG9sbF9xdWVyeV91bnRp bCgncG9zdGdyZXMnLAogJG5vZGVfcHJpbWFyeS0+c2FmZV9wc3FsKCdwb3N0Z3JlcycsICJj aGVja3BvaW50Iik7CiAKICMgQ29weSBwZ19jb250cm9sIGxhc3Qgc28gaXQgY29udGFpbnMg dGhlIG5ldyBjaGVja3BvaW50LgotY29weSgkbm9kZV9wcmltYXJ5LT5kYXRhX2RpciAuICcv Z2xvYmFsL3BnX2NvbnRyb2wnLAotCSIkYmFja3VwX2Rpci9nbG9iYWwvcGdfY29udHJvbCIp Ci0gIG9yIEJBSUxfT1VUKCJ1bmFibGUgdG8gY29weSBnbG9iYWwvcGdfY29udHJvbCIpOwor Y29weSgkbm9kZV9wcmltYXJ5LT5kYXRhX2RpciAuICcvJyAuICRjb250cm9sZmlsZSwKKwki JGJhY2t1cF9kaXIvJGNvbnRyb2xmaWxlIikKKyAgb3IgQkFJTF9PVVQoInVuYWJsZSB0byBj b3B5ICRjb250cm9sZmlsZSIpOwogCiAjIFNhdmUgdGhlIG5hbWUgc2VnbWVudCB0aGF0IHdp bGwgYmUgYXJjaGl2ZWQgYnkgcGdfYmFja3VwX3N0b3AoKS4KICMgVGhpcyBpcyBjb3BpZWQg dG8gdGhlIHBnX3dhbCBkaXJlY3Rvcnkgb2YgdGhlIG5vZGUgd2hvc2UgcmVjb3ZlcnkKLS0g CjIuNDguMQoK --------------mySceTlTmmzkVnFNxjJ5t90j--