Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q2Bsw-0002TF-8L for pgsql-hackers@arkaria.postgresql.org; Thu, 25 May 2023 14:24:10 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1q2Bsu-0007eF-Li for pgsql-hackers@arkaria.postgresql.org; Thu, 25 May 2023 14:24:08 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q2Bsu-0007e6-6E for pgsql-hackers@lists.postgresql.org; Thu, 25 May 2023 14:24:08 +0000 Received: from mail-oa1-x32.google.com ([2001:4860:4864:20::32]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1q2Bsr-001pjQ-I8 for pgsql-hackers@lists.postgresql.org; Thu, 25 May 2023 14:24:06 +0000 Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-19b3d4ac35cso1238909fac.1 for ; Thu, 25 May 2023 07:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685024644; x=1687616644; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=ewp53Q/+NcCq+9E45IIYHPobkqvnwBKxfbNyatnHPXY=; b=EjdCbbDroOsRRFoLNQooX6Guf0y12X6r0fCHynArNa2POz3F27+ho2DHb5cKL+ZaO5 sTAiVg9WF+5iYSOWa3hU++diRrRkIRK8hXH9ynOPuInNU+maU3GbDviGRtX3XwR8Zboc 8xLJ1kJvdUh4GNW+8ORCYYclMCHXgCEpSa3iwafoj7uQsqokI/exUEeb/95jF7IZznMY 6yZIkYfVfqgPZwawa4dWL9wdIv5J12YM//oBj3PzK8EZ1pAnLtakPZVmyWRYYnErTbEz BBPookKghR4o4hb0Kp579LJvS1IcD4QcHAaloSbNmwrjl4RgVYjt7EpDUi1R4mxN4BUB Vh+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685024644; x=1687616644; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ewp53Q/+NcCq+9E45IIYHPobkqvnwBKxfbNyatnHPXY=; b=YuaRl0bDQF0MI5dH2uwWNLS9nfLqGh9eIIfJenTPyIuCrqIKDfdk18nLqHYO4qmN+i 0kOnIceQ+WpcPWW0LHmL8tscLjjWhpDoCNvGVoNs5fwz+CP+JDPLBjW0v4zQuhzr6/xy LEInTnoqCtRN4Q8NWibOmQ4Ay8F7W2grl0o+JJcRUwJxPK03vjhxhdDgh+62+R+6Oglu qQBJD9rxm9Jb9FTlI7YFgE9V/i0SR3z/hRlQEMe3HJGM4o6QMl8LN9R78UT13ELiATaP U9GgP7teXC/odAq0zME2M23k1OuvtGy2eqBgu5KIbSPJ6qitVVw1pzH62e2/J0ahXVLe TEXw== X-Gm-Message-State: AC+VfDyHpOfWUCjCrCMxqfAm7bH/TipIuYjZ48pobotqDms3Did1+WIa 0GpuDFDVmSX8dUd6uYjlxZrP9zv7xdTCIF3eryLcvxeFiyU= X-Google-Smtp-Source: ACHHUZ6f1VDgfmBsKlPwh9resBnHGC30XVGDKpNdTLcunfoDospVDmbCDeO1phP4yVGa7O5TZwhZN2lONs1Hpzzwh2Q= X-Received: by 2002:aca:917:0:b0:398:24c5:790 with SMTP id 23-20020aca0917000000b0039824c50790mr5630991oij.7.1685024644496; Thu, 25 May 2023 07:24:04 -0700 (PDT) MIME-Version: 1.0 From: vignesh C Date: Thu, 25 May 2023 19:53:51 +0530 Message-ID: Subject: Implement generalized sub routine find_in_log for tap test To: PostgreSQL Hackers Content-Type: multipart/mixed; boundary="0000000000005fcc9605fc855f1d" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --0000000000005fcc9605fc855f1d Content-Type: text/plain; charset="UTF-8" Hi, The recovery tap test has 4 implementations of find_in_log sub routine for various uses, I felt we can generalize these and have a single function for the same. The attached patch is an attempt to have a generalized sub routine find_in_log which can be used by all of them. Thoughts? Regards, VIgnesh --0000000000005fcc9605fc855f1d Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Remove-duplicate-find_in_log-sub-routines-from-tap-t.patch" Content-Disposition: attachment; filename="0001-Remove-duplicate-find_in_log-sub-routines-from-tap-t.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_li383mue0 RnJvbSA3YzRiNjczMWEyN2MwMzFhZDI3ZjZmODgxNTBjMWRmYWFlMWY0NmZlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBWaWduZXNoIEMgPHZpZ25lc2gyMUBnbWFpbC5jb20+CkRhdGU6 IFRodSwgMjUgTWF5IDIwMjMgMTA6NDc6MTYgKzA1MzAKU3ViamVjdDogW1BBVENIXSBSZW1vdmUg ZHVwbGljYXRlIGZpbmRfaW5fbG9nIHN1YiByb3V0aW5lcyBmcm9tIHRhcCB0ZXN0cy4KClJlbW92 ZSBkdXBsaWNhdGUgZmluZF9pbl9sb2cgc3ViIHJvdXRpbmVzIGZyb20gdGFwIHRlc3RzLgotLS0K IHNyYy90ZXN0L2F1dGhlbnRpY2F0aW9uL3QvMDAzX3BlZXIucGwgICAgICAgICB8IDE1ICsrLS0t LS0tLS0tLQogc3JjL3Rlc3QvcGVybC9Qb3N0Z3JlU1FML1Rlc3QvVXRpbHMucG0gICAgICAgIHwg MjMgKysrKysrKysrKysrKysrKysrKwogc3JjL3Rlc3QvcmVjb3ZlcnkvdC8wMTlfcmVwbHNsb3Rf bGltaXQucGwgICAgIHwgMTQgLS0tLS0tLS0tLS0KIHNyYy90ZXN0L3JlY292ZXJ5L3QvMDMzX3Jl cGxheV90c3BfZHJvcHMucGwgICB8IDEyICstLS0tLS0tLS0KIC4uLi90LzAzNV9zdGFuZGJ5X2xv Z2ljYWxfZGVjb2RpbmcucGwgICAgICAgICB8IDE0IC0tLS0tLS0tLS0tCiA1IGZpbGVzIGNoYW5n ZWQsIDI2IGluc2VydGlvbnMoKyksIDUyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy90 ZXN0L2F1dGhlbnRpY2F0aW9uL3QvMDAzX3BlZXIucGwgYi9zcmMvdGVzdC9hdXRoZW50aWNhdGlv bi90LzAwM19wZWVyLnBsCmluZGV4IDMyNzJlNTJjYWUuLmE4ZmY2ZTg2NDIgMTAwNjQ0Ci0tLSBh L3NyYy90ZXN0L2F1dGhlbnRpY2F0aW9uL3QvMDAzX3BlZXIucGwKKysrIGIvc3JjL3Rlc3QvYXV0 aGVudGljYXRpb24vdC8wMDNfcGVlci5wbApAQCAtNjksMTcgKzY5LDYgQEAgc3ViIHRlc3Rfcm9s ZQogCX0KIH0KIAotIyBGaW5kICRwYXR0ZXJuIGluIGxvZyBmaWxlIG9mICRub2RlLgotc3ViIGZp bmRfaW5fbG9nCi17Ci0JbXkgKCRub2RlLCAkb2Zmc2V0LCAkcGF0dGVybikgPSBAXzsKLQotCW15 ICRsb2cgPSBQb3N0Z3JlU1FMOjpUZXN0OjpVdGlsczo6c2x1cnBfZmlsZSgkbm9kZS0+bG9nZmls ZSwgJG9mZnNldCk7Ci0JcmV0dXJuIDAgaWYgKGxlbmd0aCgkbG9nKSA8PSAwKTsKLQotCXJldHVy biAkbG9nID1+IG0vJHBhdHRlcm4vOwotfQotCiBteSAkbm9kZSA9IFBvc3RncmVTUUw6OlRlc3Q6 OkNsdXN0ZXItPm5ldygnbm9kZScpOwogJG5vZGUtPmluaXQ7CiAkbm9kZS0+YXBwZW5kX2NvbmYo J3Bvc3RncmVzcWwuY29uZicsICJsb2dfY29ubmVjdGlvbnMgPSBvblxuIik7CkBAIC05Miw4ICs4 MSw4IEBAIHJlc2V0X3BnX2hiYSgkbm9kZSwgJ3BlZXInKTsKIG15ICRsb2dfb2Zmc2V0ID0gLXMg JG5vZGUtPmxvZ2ZpbGU7CiAkbm9kZS0+cHNxbCgncG9zdGdyZXMnKTsKIGlmIChmaW5kX2luX2xv ZygKLQkJJG5vZGUsICRsb2dfb2Zmc2V0LAotCQlxci9wZWVyIGF1dGhlbnRpY2F0aW9uIGlzIG5v dCBzdXBwb3J0ZWQgb24gdGhpcyBwbGF0Zm9ybS8pKQorCQkkbm9kZSwgcXIvcGVlciBhdXRoZW50 aWNhdGlvbiBpcyBub3Qgc3VwcG9ydGVkIG9uIHRoaXMgcGxhdGZvcm0vKSwKKwkJJGxvZ19vZmZz ZXQsKQogewogCXBsYW4gc2tpcF9hbGwgPT4gJ3BlZXIgYXV0aGVudGljYXRpb24gaXMgbm90IHN1 cHBvcnRlZCBvbiB0aGlzIHBsYXRmb3JtJzsKIH0KZGlmZiAtLWdpdCBhL3NyYy90ZXN0L3Blcmwv UG9zdGdyZVNRTC9UZXN0L1V0aWxzLnBtIGIvc3JjL3Rlc3QvcGVybC9Qb3N0Z3JlU1FML1Rlc3Qv VXRpbHMucG0KaW5kZXggYTI3ZmFjODNkMi4uNWM5YjJmNmMwMyAxMDA2NDQKLS0tIGEvc3JjL3Rl c3QvcGVybC9Qb3N0Z3JlU1FML1Rlc3QvVXRpbHMucG0KKysrIGIvc3JjL3Rlc3QvcGVybC9Qb3N0 Z3JlU1FML1Rlc3QvVXRpbHMucG0KQEAgLTY3LDYgKzY3LDcgQEAgb3VyIEBFWFBPUlQgPSBxdygK ICAgc2x1cnBfZmlsZQogICBhcHBlbmRfdG9fZmlsZQogICBzdHJpbmdfcmVwbGFjZV9maWxlCisg IGZpbmRfaW5fbG9nCiAgIGNoZWNrX21vZGVfcmVjdXJzaXZlCiAgIGNobW9kX3JlY3Vyc2l2ZQog ICBjaGVja19wZ19jb25maWcKQEAgLTU3OSw2ICs1ODAsMjggQEAgc3ViIHN0cmluZ19yZXBsYWNl X2ZpbGUKIAogPXBvZAogCisKKz1pdGVtIGZpbmRfaW5fbG9nKG5vZGUsIHBhdHRlcm4sIG9mZnNl dCkKKworRmluZCBwYXR0ZXJuIGluIGxvZ2ZpbGUgb2Ygbm9kZSBhZnRlciBvZmZzZXQgYnl0ZS4K KworPWN1dAorCitzdWIgZmluZF9pbl9sb2cKK3sKKwlteSAoJG5vZGUsICRwYXR0ZXJuLCAkb2Zm c2V0KSA9IEBfOworCisJJG9mZnNldCA9IDAgdW5sZXNzIGRlZmluZWQgJG9mZnNldDsKKwlteSAk bG9nID0gUG9zdGdyZVNRTDo6VGVzdDo6VXRpbHM6OnNsdXJwX2ZpbGUoJG5vZGUtPmxvZ2ZpbGUp OworCisJcmV0dXJuIDAgaWYgKGxlbmd0aCgkbG9nKSA8PSAwIHx8IGxlbmd0aCgkbG9nKSA8PSAk b2Zmc2V0KTsKKworCSRsb2cgPSBzdWJzdHIoJGxvZywgJG9mZnNldCk7CisJcmV0dXJuICRsb2cg PX4gbS8kcGF0dGVybi87Cit9CisKKz1wb2QKKwogPWl0ZW0gY2hlY2tfbW9kZV9yZWN1cnNpdmUo ZGlyLCBleHBlY3RlZF9kaXJfbW9kZSwgZXhwZWN0ZWRfZmlsZV9tb2RlLCBpZ25vcmVfbGlzdCkK IAogQ2hlY2sgdGhhdCBhbGwgZmlsZS9kaXIgbW9kZXMgaW4gYSBkaXJlY3RvcnkgbWF0Y2ggdGhl IGV4cGVjdGVkIHZhbHVlcywKZGlmZiAtLWdpdCBhL3NyYy90ZXN0L3JlY292ZXJ5L3QvMDE5X3Jl cGxzbG90X2xpbWl0LnBsIGIvc3JjL3Rlc3QvcmVjb3ZlcnkvdC8wMTlfcmVwbHNsb3RfbGltaXQu cGwKaW5kZXggYTFhYmExNmUxNC4uZWJkMTVhMGVjNCAxMDA2NDQKLS0tIGEvc3JjL3Rlc3QvcmVj b3ZlcnkvdC8wMTlfcmVwbHNsb3RfbGltaXQucGwKKysrIGIvc3JjL3Rlc3QvcmVjb3ZlcnkvdC8w MTlfcmVwbHNsb3RfbGltaXQucGwKQEAgLTQ0NiwxOCArNDQ2LDQgQEAgc3ViIGdldF9sb2dfc2l6 ZQogCXJldHVybiAoc3RhdCAkbm9kZS0+bG9nZmlsZSlbN107CiB9CiAKLSMgZmluZCAkcGF0IGlu IGxvZ2ZpbGUgb2YgJG5vZGUgYWZ0ZXIgJG9mZi10aCBieXRlCi1zdWIgZmluZF9pbl9sb2cKLXsK LQlteSAoJG5vZGUsICRwYXQsICRvZmYpID0gQF87Ci0KLQkkb2ZmID0gMCB1bmxlc3MgZGVmaW5l ZCAkb2ZmOwotCW15ICRsb2cgPSBQb3N0Z3JlU1FMOjpUZXN0OjpVdGlsczo6c2x1cnBfZmlsZSgk bm9kZS0+bG9nZmlsZSk7Ci0JcmV0dXJuIDAgaWYgKGxlbmd0aCgkbG9nKSA8PSAkb2ZmKTsKLQot CSRsb2cgPSBzdWJzdHIoJGxvZywgJG9mZik7Ci0KLQlyZXR1cm4gJGxvZyA9fiBtLyRwYXQvOwot fQotCiBkb25lX3Rlc3RpbmcoKTsKZGlmZiAtLWdpdCBhL3NyYy90ZXN0L3JlY292ZXJ5L3QvMDMz X3JlcGxheV90c3BfZHJvcHMucGwgYi9zcmMvdGVzdC9yZWNvdmVyeS90LzAzM19yZXBsYXlfdHNw X2Ryb3BzLnBsCmluZGV4IDBhMzVhN2JkYTYuLjVmMTI4N2NkOTAgMTAwNjQ0Ci0tLSBhL3NyYy90 ZXN0L3JlY292ZXJ5L3QvMDMzX3JlcGxheV90c3BfZHJvcHMucGwKKysrIGIvc3JjL3Rlc3QvcmVj b3ZlcnkvdC8wMzNfcmVwbGF5X3RzcF9kcm9wcy5wbApAQCAtMTQzLDE0ICsxNDMsNCBAQCB3aGls ZSAoJG1heF9hdHRlbXB0cy0tID49IDApCiB9CiBvaygkbWF4X2F0dGVtcHRzID4gMCwgImludmFs aWQgZGlyZWN0b3J5IGNyZWF0aW9uIGlzIGRldGVjdGVkIik7CiAKLWRvbmVfdGVzdGluZygpOwot Ci0jIGZpbmQgJHBhdCBpbiBsb2dmaWxlIG9mICRub2RlIGFmdGVyICRvZmYtdGggYnl0ZQotc3Vi IGZpbmRfaW5fbG9nCi17Ci0JbXkgKCRub2RlLCAkcGF0LCAkb2ZmKSA9IEBfOwotCi0JbXkgJGxv ZyA9IFBvc3RncmVTUUw6OlRlc3Q6OlV0aWxzOjpzbHVycF9maWxlKCRub2RlLT5sb2dmaWxlLCAk b2ZmKTsKLQotCXJldHVybiAkbG9nID1+IG0vJHBhdC87Ci19Citkb25lX3Rlc3RpbmcoKTsKXCBO byBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9zcmMvdGVzdC9yZWNvdmVyeS90 LzAzNV9zdGFuZGJ5X2xvZ2ljYWxfZGVjb2RpbmcucGwgYi9zcmMvdGVzdC9yZWNvdmVyeS90LzAz NV9zdGFuZGJ5X2xvZ2ljYWxfZGVjb2RpbmcucGwKaW5kZXggNjRiZWVjNGJkMy4uMzFlMzQ3Y2U5 MCAxMDA2NDQKLS0tIGEvc3JjL3Rlc3QvcmVjb3ZlcnkvdC8wMzVfc3RhbmRieV9sb2dpY2FsX2Rl Y29kaW5nLnBsCisrKyBiL3NyYy90ZXN0L3JlY292ZXJ5L3QvMDM1X3N0YW5kYnlfbG9naWNhbF9k ZWNvZGluZy5wbApAQCAtMjgsMjAgKzI4LDYgQEAgbXkgJHJlczsKIG15ICRwcmltYXJ5X3Nsb3Ru YW1lID0gJ3ByaW1hcnlfcGh5c2ljYWwnOwogbXkgJHN0YW5kYnlfcGh5c2ljYWxfc2xvdG5hbWUg PSAnc3RhbmRieV9waHlzaWNhbCc7CiAKLSMgZmluZCAkcGF0IGluIGxvZ2ZpbGUgb2YgJG5vZGUg YWZ0ZXIgJG9mZi10aCBieXRlCi1zdWIgZmluZF9pbl9sb2cKLXsKLQlteSAoJG5vZGUsICRwYXQs ICRvZmYpID0gQF87Ci0KLQkkb2ZmID0gMCB1bmxlc3MgZGVmaW5lZCAkb2ZmOwotCW15ICRsb2cg PSBQb3N0Z3JlU1FMOjpUZXN0OjpVdGlsczo6c2x1cnBfZmlsZSgkbm9kZS0+bG9nZmlsZSk7Ci0J cmV0dXJuIDAgaWYgKGxlbmd0aCgkbG9nKSA8PSAkb2ZmKTsKLQotCSRsb2cgPSBzdWJzdHIoJGxv ZywgJG9mZik7Ci0KLQlyZXR1cm4gJGxvZyA9fiBtLyRwYXQvOwotfQotCiAjIEZldGNoIHhtaW4g Y29sdW1ucyBmcm9tIHNsb3QncyBwZ19yZXBsaWNhdGlvbl9zbG90cyByb3csIGFmdGVyIHdhaXRp bmcgZm9yCiAjIGdpdmVuIGJvb2xlYW4gY29uZGl0aW9uIHRvIGJlIHRydWUgdG8gZW5zdXJlIHdl J3ZlIHJlYWNoZWQgYSBxdWllc2NlbnQgc3RhdGUuCiBzdWIgd2FpdF9mb3JfeG1pbnMKLS0gCjIu MzQuMQoK --0000000000005fcc9605fc855f1d--