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 1t62hS-00AGpG-45 for pgsql-hackers@arkaria.postgresql.org; Wed, 30 Oct 2024 07:01:02 +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 1t62hP-006183-Kt for pgsql-hackers@arkaria.postgresql.org; Wed, 30 Oct 2024 07:01:00 +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 1t62hP-00617u-Bh for pgsql-hackers@lists.postgresql.org; Wed, 30 Oct 2024 07:00:59 +0000 Received: from oss.nttdata.com ([49.212.34.109]) by makus.postgresql.org with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1t62hM-003aBj-El for pgsql-hackers@postgresql.org; Wed, 30 Oct 2024 07:00:58 +0000 Received: from oss.nttdata.com (localhost [127.0.0.1]) by oss.nttdata.com (Postfix) with ESMTPA id BB39060998; Wed, 30 Oct 2024 16:00:52 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at oss.nttdata.com MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_9d0dab42fa3e9f9b15b11d243a84e689" Content-Transfer-Encoding: 7bit Date: Wed, 30 Oct 2024 16:00:52 +0900 From: Yushi Ogiwara To: Fujii Masao Cc: Masahiko Sawada , Pgsql Hackers Subject: Re: Fix for consume_xids advancing XIDs incorrectly In-Reply-To: References: <2a62f138c9dcb6fcf5889b076d123aa2@oss.nttdata.com> <50ee82a96ac0935de88f9a5ef021f04d@oss.nttdata.com> <57b588db6017ba20e67980fefa388b86@oss.nttdata.com> <88bed945-d8e3-4a28-ba9d-9eb3edde2d17@oss.nttdata.com> <710b46d68d053eac91c9c8ec9feea09d@oss.nttdata.com> User-Agent: Roundcube Webmail/1.4.11 Message-ID: <1ea3663012d0cafb5639290eb19e3f71@oss.nttdata.com> X-Sender: btogiwarayuushi@oss.nttdata.com List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --=_9d0dab42fa3e9f9b15b11d243a84e689 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed I made a new patch (skip_xid_correctly.diff) that incorporates the points we discussed: 1. Fix the issue that consume_xids consumes nxids+1 XIDs. 2. Update lastxid when calling GetTopFullTransactionId() to support nxids==1 case. 3. Forbid consume_xids when nxids==0. 4. Add comments explaining the return values of consume_xids and consume_xids_until, and the rationale for incrementing consumed++ when GetTopFullTransactionId() is called. Also, I made another patch (support_blksz_32k.diff) that supports the block size == 32K case. Best, Yushi Ogiwara --=_9d0dab42fa3e9f9b15b11d243a84e689 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=skip_xid_correctly.diff Content-Disposition: attachment; filename=skip_xid_correctly.diff; size=1619 ZGlmZiAtLWdpdCBhL3NyYy90ZXN0L21vZHVsZXMveGlkX3dyYXBhcm91bmQveGlkX3dyYXBhcm91 bmQuYyBiL3NyYy90ZXN0L21vZHVsZXMveGlkX3dyYXBhcm91bmQveGlkX3dyYXBhcm91bmQuYwpp bmRleCBkY2U4MWMwYzZkLi42M2YzMzA1ZWU5IDEwMDY0NAotLS0gYS9zcmMvdGVzdC9tb2R1bGVz L3hpZF93cmFwYXJvdW5kL3hpZF93cmFwYXJvdW5kLmMKKysrIGIvc3JjL3Rlc3QvbW9kdWxlcy94 aWRfd3JhcGFyb3VuZC94aWRfd3JhcGFyb3VuZC5jCkBAIC0yNiw2ICsyNiw3IEBAIHN0YXRpYyBG dWxsVHJhbnNhY3Rpb25JZCBjb25zdW1lX3hpZHNfY29tbW9uKEZ1bGxUcmFuc2FjdGlvbklkIHVu dGlseGlkLCB1aW50NjQKIAogLyoKICAqIENvbnN1bWUgdGhlIHNwZWNpZmllZCBudW1iZXIgb2Yg WElEcy4KKyAqIFJldHVybnMgdGhlIGxhc3QgWElEIGFzc2lnbmVkIGJ5IHRoaXMgZnVuY3Rpb24u CiAgKi8KIFBHX0ZVTkNUSU9OX0lORk9fVjEoY29uc3VtZV94aWRzKTsKIERhdHVtCkBAIC0zNCwx MSArMzUsOCBAQCBjb25zdW1lX3hpZHMoUEdfRlVOQ1RJT05fQVJHUykKIAlpbnQ2NAkJbnhpZHMg PSBQR19HRVRBUkdfSU5UNjQoMCk7CiAJRnVsbFRyYW5zYWN0aW9uSWQgbGFzdHhpZDsKIAotCWlm IChueGlkcyA8IDApCisJaWYgKG54aWRzIDw9IDApCiAJCWVsb2coRVJST1IsICJpbnZhbGlkIG54 aWRzIGFyZ3VtZW50OiAlbGxkIiwgKGxvbmcgbG9uZykgbnhpZHMpOwotCi0JaWYgKG54aWRzID09 IDApCi0JCWxhc3R4aWQgPSBSZWFkTmV4dEZ1bGxUcmFuc2FjdGlvbklkKCk7CiAJZWxzZQogCQls YXN0eGlkID0gY29uc3VtZV94aWRzX2NvbW1vbihJbnZhbGlkRnVsbFRyYW5zYWN0aW9uSWQsICh1 aW50NjQpIG54aWRzKTsKIApAQCAtNDcsNiArNDUsNyBAQCBjb25zdW1lX3hpZHMoUEdfRlVOQ1RJ T05fQVJHUykKIAogLyoKICAqIENvbnN1bWUgWElEcywgdXAgdG8gdGhlIGdpdmVuIFhJRC4KKyAq IFJldHVybnMgdGhlIGxhc3QgWElEIGFzc2lnbmVkIGJ5IHRoaXMgZnVuY3Rpb24uCiAgKi8KIFBH X0ZVTkNUSU9OX0lORk9fVjEoY29uc3VtZV94aWRzX3VudGlsKTsKIERhdHVtCkBAIC04OCw4ICs4 NywxNSBAQCBjb25zdW1lX3hpZHNfY29tbW9uKEZ1bGxUcmFuc2FjdGlvbklkIHVudGlseGlkLCB1 aW50NjQgbnhpZHMpCiAJICogR2V0TmV3VHJhbnNhY3Rpb25JZCByZWdpc3RlcnMgdGhlbSBpbiB0 aGUgc3VieGlkIGNhY2hlIGluIFBHUFJPQywgdW50aWwKIAkgKiB0aGUgY2FjaGUgb3ZlcmZsb3dz LCBidXQgYmV5b25kIHRoYXQsIHdlIGRvbid0IGtlZXAgdHJhY2sgb2YgdGhlCiAJICogY29uc3Vt ZWQgWElEcy4KKwkgKiAKKwkgKiBJZiBubyB0b3AtbGV2ZWwgWElEIGlzIGFzc2lnbmVkLCBhIG5l dyBvbmUgaXMgb2J0YWluZWQsCisJICogYW5kIHRoZSBjb25zdW1lZCBYSUQgY291bnRlciBpcyBp bmNyZW1lbnRlZC4KIAkgKi8KLQkodm9pZCkgR2V0VG9wVHJhbnNhY3Rpb25JZCgpOworCWlmKCFG dWxsVHJhbnNhY3Rpb25JZElzVmFsaWQoR2V0VG9wRnVsbFRyYW5zYWN0aW9uSWRJZkFueSgpKSkK Kwl7CisJCWxhc3R4aWQgPSBHZXRUb3BGdWxsVHJhbnNhY3Rpb25JZCgpOworCQljb25zdW1lZCsr OworCX0KIAogCWZvciAoOzspCiAJewo= --=_9d0dab42fa3e9f9b15b11d243a84e689 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=support_blksz_32k.diff Content-Disposition: attachment; filename=support_blksz_32k.diff; size=1640 ZGlmZiAtLWdpdCBhL3NyYy90ZXN0L21vZHVsZXMveGlkX3dyYXBhcm91bmQveGlkX3dyYXBhcm91 bmQuYyBiL3NyYy90ZXN0L21vZHVsZXMveGlkX3dyYXBhcm91bmQveGlkX3dyYXBhcm91bmQuYwpp bmRleCBkY2U4MWMwYzZkLi45NTgzMmZiZWNjIDEwMDY0NAotLS0gYS9zcmMvdGVzdC9tb2R1bGVz L3hpZF93cmFwYXJvdW5kL3hpZF93cmFwYXJvdW5kLmMKKysrIGIvc3JjL3Rlc3QvbW9kdWxlcy94 aWRfd3JhcGFyb3VuZC94aWRfd3JhcGFyb3VuZC5jCkBAIC02NCw2ICs2NCwxNCBAQCBjb25zdW1l X3hpZHNfdW50aWwoUEdfRlVOQ1RJT05fQVJHUykKIAlQR19SRVRVUk5fRlVMTFRSQU5TQUNUSU9O SUQobGFzdHhpZCk7CiB9CiAKKy8qCisgKiBUaGVzZSBjb25zdGFudHMgY29waWVkIGZyb20gLmMg ZmlsZXMsIGJlY2F1c2UgdGhleSdyZSBwcml2YXRlLgorICovCisjZGVmaW5lIENPTU1JVF9UU19Y QUNUU19QRVJfUEFHRSAoQkxDS1NaIC8gMTApCisjZGVmaW5lIFNVQlRSQU5TX1hBQ1RTX1BFUl9Q QUdFIChCTENLU1ogLyBzaXplb2YoVHJhbnNhY3Rpb25JZCkpCisjZGVmaW5lIENMT0dfWEFDVFNf UEVSX0JZVEUgNAorI2RlZmluZSBDTE9HX1hBQ1RTX1BFUl9QQUdFIChCTENLU1ogKiBDTE9HX1hB Q1RTX1BFUl9CWVRFKQorCiAvKgogICogQ29tbW9uIGZ1bmN0aW9uYWxpdHkgYmV0d2VlbiB0aGUg dHdvIHB1YmxpYyBmdW5jdGlvbnMuCiAgKi8KQEAgLTExNSw3ICsxMjMsNyBAQCBjb25zdW1lX3hp ZHNfY29tbW9uKEZ1bGxUcmFuc2FjdGlvbklkIHVudGlseGlkLCB1aW50NjQgbnhpZHMpCiAJCSAq IElmIHdlIHN0aWxsIGhhdmUgcGxlbnR5IG9mIFhJRHMgdG8gY29uc3VtZSwgdHJ5IHRvIHRha2Ug YSBzaG9ydGN1dAogCQkgKiBhbmQgYnVtcCB1cCB0aGUgbmV4dFhpZCBjb3VudGVyIGRpcmVjdGx5 LgogCQkgKi8KLQkJaWYgKHhpZHNfbGVmdCA+IDIwMDAgJiYKKwkJaWYgKHhpZHNfbGVmdCA+IENP TU1JVF9UU19YQUNUU19QRVJfUEFHRSAmJgogCQkJY29uc3VtZWQgLSBsYXN0X3JlcG9ydGVkX2F0 IDwgUkVQT1JUX0lOVEVSVkFMICYmCiAJCQlNeVByb2MtPnN1YnhpZFN0YXR1cy5vdmVyZmxvd2Vk KQogCQl7CkBAIC0xNTMsMTQgKzE2MSw2IEBAIGNvbnN1bWVfeGlkc19jb21tb24oRnVsbFRyYW5z YWN0aW9uSWQgdW50aWx4aWQsIHVpbnQ2NCBueGlkcykKIAlyZXR1cm4gbGFzdHhpZDsKIH0KIAot LyoKLSAqIFRoZXNlIGNvbnN0YW50cyBjb3BpZWQgZnJvbSAuYyBmaWxlcywgYmVjYXVzZSB0aGV5 J3JlIHByaXZhdGUuCi0gKi8KLSNkZWZpbmUgQ09NTUlUX1RTX1hBQ1RTX1BFUl9QQUdFIChCTENL U1ogLyAxMCkKLSNkZWZpbmUgU1VCVFJBTlNfWEFDVFNfUEVSX1BBR0UgKEJMQ0tTWiAvIHNpemVv ZihUcmFuc2FjdGlvbklkKSkKLSNkZWZpbmUgQ0xPR19YQUNUU19QRVJfQllURSA0Ci0jZGVmaW5l IENMT0dfWEFDVFNfUEVSX1BBR0UgKEJMQ0tTWiAqIENMT0dfWEFDVFNfUEVSX0JZVEUpCi0KIC8q CiAgKiBBbGwgdGhlIGludGVyZXN0aW5nIGFjdGlvbiBpbiBHZXROZXdUcmFuc2FjdGlvbklkIGhh cHBlbnMgd2hlbiB3ZSBleHRlbmQKICAqIHRoZSBTTFJVcywgb3IgYXQgdGhlIHVpbnQzMiB3cmFw YXJvdW5kLiBJZiB0aGUgbmV4dFhpZCBjb3VudGVyIGlzIG5vdCBjbG9zZQo= --=_9d0dab42fa3e9f9b15b11d243a84e689--