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.98.2) (envelope-from ) id 1xN8K0-00000002O9O-3dkO for pgsql-hackers@arkaria.postgresql.org; Sat, 31 Oct 2026 12:36:33 +0000 Received: from localhost ([127.0.0.1]:44060 helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.98.2) (envelope-from ) id 1xN8J0-0000000EfOt-0H6X for pgsql-hackers@arkaria.postgresql.org; Sat, 31 Oct 2026 12:35:30 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]:42860) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xN8Iz-0000000EfOl-1Ctg for pgsql-hackers@lists.postgresql.org; Sat, 31 Oct 2026 12:35:29 +0000 Received: from mail-wr2-x08.google.com ([2a00:1450:4864:30::8]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.98.2) (envelope-from ) id 1xN8Iv-00000001r61-3jUh for pgsql-hackers@postgresql.org; Sat, 31 Oct 2026 12:35:28 +0000 Received: by mail-wr2-x08.google.com with SMTP id ffacd0b85a97d-48e293ecaa7so462755f8f.1 for ; Sat, 31 Oct 2026 05:35:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793450124; x=1794054924; darn=postgresql.org; h=in-reply-to:from:references:cc:to:subject:user-agent:mime-version :date:message-id:content-type:from:to:cc:subject:date:message-id :reply-to:content-type; bh=xvqGDmHjRihVf2RbJoOK010cD+p/LNVfK3XLoTVvuKQ=; b=UJZxtHDecmEbaEf8wrfYf1M1bD4eSm2tbVwvF8I+N3AOXSg7bYuvI6+EOGPj0p339H m3IrAnuEKHVf/F8bDrEs15MmF3aIs0x7dqyaqR4L+4gL6terJquV2QRdkJdf1ymKAaCg FwFbc35h/8CoY3OsoFHA734QEH7dNiNimQhO7f0z0cdmNK1pbge1zARptVvCPj0LUi+w EglWxOz4Z021sP8OaGT1gViKV9UKVD0oKIi5XrppKdpi3pJ1Nh1py+Jfy6bl0R1iu4Ib vQHiTQ19hqT/6n2FKS0z50ZSG32fB4Fm5xcnyXOBJ7wC52/mcnFChwQbvNSiOYg8hirm /BuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793450124; x=1794054924; h=in-reply-to:from:references:cc:to:subject:user-agent:mime-version :date:message-id:content-type:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to:content-type; bh=xvqGDmHjRihVf2RbJoOK010cD+p/LNVfK3XLoTVvuKQ=; b=JlD607esKpx20EMHcaegjgaLoBD4OAXOmUK+vCVoymaqX6y0MZoc8DFPbU83cIkD+q 4soAAhrKJJGdDUanXRChgXazOTMwITsn4gcaNrv3WxLGMunGj5u0XT9EugXeceX4LKN/ 6O3lkbzlx+7WBzmqwGajdlI3l9EA4JY/AmFc649c9CvDhj28a/6vCx5xdpdxYsyg3Vc6 YcAI+mN6MgJ8tjpNeNIj0ZDKrUE2cHFrN9wN3U2CkzV5LzoZGAbhAQ72DkGu4qU0mNvp szasIuepH7CVUcjJQCYfHgM1KlYJxhGXqwSCKAHeVf4CXom9/gZjHmJwf/Rc1f9IyU1G nFtw== X-Forwarded-Encrypted: i=1; AKwUvBzmAw0QTQR56eF/7sAtNH2dRZgWGXX4uRUFeQ5HZxL8jOI77wyo+wVrvrY8pOHoG5PDXnGA+aTYa1BwtRU3@postgresql.org X-Gm-Message-State: AFq9FYL+FBSGuC65WmlQtcSzRxqmWkEBZ33+sI5pRumJtAj70IKTtoAk +rPM5YPy0+1t4R4IlU+9YhaQKOouOu/eao62lbiKQmnc1cQzPAFDRjSE X-Gm-Gg: AYBFou3ocmr0MNi6x7nm9X6ynxp8NwDZGGo17403lODSqAxVTRvNr3wCjA6DqAmc60M 5pocNjqdYQ8hkkKvnwEn9bhk6JuL3sWoBlXb6rj98uScD0/5ZyZoCly+jpy3qj4FNDXg/q/Zjhx Qum6/+hmbK1PZdBXN6yeAXLI1hSqLh6YT9v+p8A+1edg3YW71aYqhaGGA2UsPF+kW860Zr9pmQz kQwHIoasgfRvXvrc5EQuVBiIF0mCR6a9rF/oC8e3amcBfWOr0d1nu2cWDjReuaFZJR6L/7dMs4S qczoVchFe8PihSSA22L3eR6/n+lcksweY5OzYdgeUKlzAqlEWuTN4sJoYTOFA+2BvvGcCPrcpLL QAN+kT3UDFml6WgDsbfP9INsdjpPjxq7r77xDpO3m6dGIX/rJlNDSeQnDxcOJLz85WE5aN2+RUp tqimxQTEn0zu8bMnjINswUMaxrHaHn76YBnYXpX3zmA6zL+xTxwQz2Gf/jUDpcgvDgMag2F1Xqy GpZsanz0KnhVeAdT7eG7Aqs0ILNRzSDj45dVFvq5vXv4BbE2Hucq+q2FN2O96we6/UYvbCA7DtI 4ikl15qLwZ1qa5IXHj1bbEX4hrKxwRXvGLk09C64b0j8vzs6e/9lFKU0itJSxSox4Xe136HEgqa hgqF85aDy4lqnjFAWCum32Ilkv5DDau6wRIbmMP/3j1yBX9NGNeB047oQX+9rAty9hg== X-Received: by 2002:a05:6000:402c:b0:48d:f39b:83de with SMTP id ffacd0b85a97d-48e6e2bdf87mr13398859f8f.3.1793450123510; Sat, 31 Oct 2026 05:35:23 -0700 (PDT) Received: from [17.235.221.176] ([17.235.221.176]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48e71a4d4f9sm8715957f8f.2.2026.10.31.05.35.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 31 Oct 2026 05:35:22 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------Y5J0l03R80Xs4S0cemX5NSrd" Message-ID: Date: Sat, 31 Oct 2026 20:35:15 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Add a hook for handling logical decoding messages on subscribers. To: Masahiko Sawada , Bharath Rupireddy Cc: Amit Kapila , Chao Li , Fujii Masao , PostgreSQL-development References: <875ACE0E-20ED-4ECC-AEBF-733BFA46D97D@gmail.com> From: Zhijie Hou In-Reply-To: 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. --------------Y5J0l03R80Xs4S0cemX5NSrd Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, On Sat, Oct 31, 2026 at 06:34 AM Masahiko Sawada wrote: > > It seems to me worth adding a check for tablesync workers since both > the apply workers and the tablesync workers call > walrcv_startstreaming() and it would prevent mistakes by future > changes. > > I've attached the updated patch. While reviewing how transactional logical messages interact with subtransaction aborts, I noticed an issue with streamed transactions. In non-streaming mode, it works as expected (i.e., the message is not applied if the subtransaction is aborted). However, in streaming mode, if a transactional message is emitted in a subtransaction that is later aborted, the STREAM ABORT message does not discard or roll back that logical message, so it still gets applied in both streaming=on and streaming=parallel modes. I think the reason is that ReorderBufferApplyMessage() passes the top-level txn rather than change->txn to rb->stream_message(), so logical decoding always sends the top-level XID instead of the subtransaction XID when outputting a streamed message. Thus the apply worker cannot associate the message with the subtransaction and cannot roll it back properly. Strictly speaking, this is an existing issue, but it becomes more visible once subscribers can handle logical messages via this hook. So it may be worth considering whether to fix it along with this patch or separately. Attached 0002 adds a test diff in 001_basic.pl to show the issue when streaming a message in an aborted subtransaction. 0001 is a draft patch showing that passing the subtransaction of the message when streaming allows the message to be rolled back properly (we may not necessarily fix it in this exact style, just sharing it to show the behavior change). -- Best Regards, Zhijie Hou --------------Y5J0l03R80Xs4S0cemX5NSrd Content-Type: text/plain; charset=UTF-8; name="nocfbot-0001-Fix-subtransaction-XID-in-streamed-logical-messag.patch" Content-Disposition: attachment; filename*0="nocfbot-0001-Fix-subtransaction-XID-in-streamed-logical-mess"; filename*1="ag.patch" Content-Transfer-Encoding: base64 RnJvbSAwMWQ0NjA2OTUwOTk2ZmQ4ZDVkN2UyYWYyYjVhMTlhNzUyYjU2MWMyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBaaGlqaWUgSG91IDxob3V6aGlqaWUyMkBnbWFpbC5j b20+CkRhdGU6IFNhdCwgMzEgT2N0IDIwMjYgMTk6NTU6MjUgKzA4MDAKU3ViamVjdDogW1BB VENIXSBGaXggc3VidHJhbnNhY3Rpb24gWElEIGluIHN0cmVhbWVkIGxvZ2ljYWwgbWVzc2Fn ZXMuCgpXaGVuIHN0cmVhbWluZyBhIHRyYW5zYWN0aW9uYWwgbG9naWNhbCBkZWNvZGluZyBt ZXNzYWdlIGVtaXR0ZWQgaW5zaWRlIGEKc3VidHJhbnNhY3Rpb24sIFJlb3JkZXJCdWZmZXJB cHBseU1lc3NhZ2UoKSBwYXNzZWQgdGhlIHRvcC1sZXZlbApSZW9yZGVyQnVmZmVyVFhOIHRv IHN0cmVhbV9tZXNzYWdlX2NiIGluc3RlYWQgb2YgdGhlIHN1YnRyYW5zYWN0aW9uJ3MKUmVv cmRlckJ1ZmZlclRYTiAoY2hhbmdlLT50eG4pLiBBcyBhIHJlc3VsdCwgc3RyZWFtX21lc3Nh Z2VfY2Jfd3JhcHBlcigpCmFuZCBwZ291dHB1dF9tZXNzYWdlKCkgcmVjb3JkZWQgdGhlIHRv cC1sZXZlbCBYSUQgaW5zdGVhZCBvZiB0aGUKc3VidHJhbnNhY3Rpb24gWElEIGZvciB0aGUg c3RyZWFtZWQgbWVzc2FnZSwgdW5saWtlIHBnb3V0cHV0X2NoYW5nZSgpIGFuZApwZ291dHB1 dF90cnVuY2F0ZSgpLiBBbnkgZG93bnN0cmVhbSBjb25zdW1lciBvZiBzdHJlYW1lZCBsb2dp Y2FsCm1lc3NhZ2VzIHRoZXJlZm9yZSBjb3VsZCBub3QgYXNzb2NpYXRlIHRoZSBtZXNzYWdl IHdpdGggaXRzCnN1YnRyYW5zYWN0aW9uIG9yIHJvbGwgaXQgYmFjayB1cG9uIHJlY2Vpdmlu ZyBTVFJFQU0gQUJPUlQgZm9yIGEKcm9sbGVkLWJhY2sgc2F2ZXBvaW50LgoKRml4IHRoaXMg YnkgcGFzc2luZyBjaGFuZ2UtPnR4biB0byByYi0+c3RyZWFtX21lc3NhZ2UoKSBpbgpSZW9y ZGVyQnVmZmVyQXBwbHlNZXNzYWdlKCkuIEFsc28gdXBkYXRlIHBnX2RlY29kZV9zdHJlYW1f bWVzc2FnZSgpIGluCnRlc3RfZGVjb2RpbmcgdG8gbG9vayB1cCBvdXRwdXRfcGx1Z2luX3By aXZhdGUgb24gdGhlIHRvcC1sZXZlbAp0cmFuc2FjdGlvbiB2aWEgcmJ0eG5fZ2V0X3RvcHR4 bih0eG4pLCBtYXRjaGluZyBwZ19kZWNvZGVfc3RyZWFtX2Fib3J0KCkuCi0tLQogY29udHJp Yi90ZXN0X2RlY29kaW5nL2V4cGVjdGVkL3N0cmVhbS5vdXQgICAgIHwgMjggKysrKysrKysr KysrKysrKysrKwogY29udHJpYi90ZXN0X2RlY29kaW5nL3NxbC9zdHJlYW0uc3FsICAgICAg ICAgIHwgMjAgKysrKysrKysrKysrKwogY29udHJpYi90ZXN0X2RlY29kaW5nL3Rlc3RfZGVj b2RpbmcuYyAgICAgICAgIHwgMTEgKysrKysrLS0KIC4uLi9yZXBsaWNhdGlvbi9sb2dpY2Fs L3Jlb3JkZXJidWZmZXIuYyAgICAgICB8IDEwICsrKysrKy0KIDQgZmlsZXMgY2hhbmdlZCwg NjYgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9jb250cmli L3Rlc3RfZGVjb2RpbmcvZXhwZWN0ZWQvc3RyZWFtLm91dCBiL2NvbnRyaWIvdGVzdF9kZWNv ZGluZy9leHBlY3RlZC9zdHJlYW0ub3V0CmluZGV4IDBlYzVjOTMzNjEwLi5mMzRhMDdiYTc2 MSAxMDA2NDQKLS0tIGEvY29udHJpYi90ZXN0X2RlY29kaW5nL2V4cGVjdGVkL3N0cmVhbS5v dXQKKysrIGIvY29udHJpYi90ZXN0X2RlY29kaW5nL2V4cGVjdGVkL3N0cmVhbS5vdXQKQEAg LTE1Nyw2ICsxNTcsMzQgQEAgU0VMRUNUIGRhdGEgRlJPTSBwZ19sb2dpY2FsX3Nsb3RfZ2V0 X2NoYW5nZXMoJ3JlZ3Jlc3Npb25fc2xvdCcsIE5VTEwsIE5VTEwsICdpbmMKICBDT01NSVQK ICgzIHJvd3MpCiAKKy0tIFZlcmlmeSB0aGF0IGEgdHJhbnNhY3Rpb25hbCBtZXNzYWdlIGVt aXR0ZWQgaW4gYSBzdHJlYW1lZCBzdWJ0cmFuc2FjdGlvbgorLS0gaXMgYXNzb2NpYXRlZCB3 aXRoIHRoZSBzdWJ0cmFuc2FjdGlvbidzIFhJRC4KK1NFVCBkZWJ1Z19sb2dpY2FsX3JlcGxp Y2F0aW9uX3N0cmVhbWluZyA9IGltbWVkaWF0ZTsKK0JFR0lOOworU0FWRVBPSU5UIHNwOwor U0VMRUNUICdtc2dfc3VieGFjdCcgRlJPTSBwZ19sb2dpY2FsX2VtaXRfbWVzc2FnZSh0cnVl LCAndGVzdCcsICdtc2cnKTsKKyAgP2NvbHVtbj8gICAKKy0tLS0tLS0tLS0tLS0KKyBtc2df c3VieGFjdAorKDEgcm93KQorCitST0xMQkFDSyBUTyBTQVZFUE9JTlQgc3A7CitDT01NSVQ7 CitXSVRIIGNoYW5nZXMgQVMgKAorCVNFTEVDVCB4aWQsIGRhdGEKKwlGUk9NIHBnX2xvZ2lj YWxfc2xvdF9nZXRfY2hhbmdlcygncmVncmVzc2lvbl9zbG90JywgTlVMTCwgTlVMTCwKKwkJ J2luY2x1ZGUteGlkcycsICcwJywgJ3NraXAtZW1wdHkteGFjdHMnLCAnMScsICdzdHJlYW0t Y2hhbmdlcycsICcxJykKKykKK1NFTEVDVCBtLnhpZCA9IGEueGlkIEFTIHN1YnhpZF9tYXRj aGVzCitGUk9NIGNoYW5nZXMgbSwgY2hhbmdlcyBhCitXSEVSRSBtLmRhdGEgTElLRSAnc3Ry ZWFtaW5nIG1lc3NhZ2U6JScKKyAgQU5EIGEuZGF0YSA9ICdhYm9ydGluZyBzdHJlYW1lZCAo c3ViKXRyYW5zYWN0aW9uJzsKKyBzdWJ4aWRfbWF0Y2hlcyAKKy0tLS0tLS0tLS0tLS0tLS0K KyB0CisoMSByb3cpCisKK1JFU0VUIGRlYnVnX2xvZ2ljYWxfcmVwbGljYXRpb25fc3RyZWFt aW5nOwogRFJPUCBUQUJMRSBzdHJlYW1fdGVzdDsKIFNFTEVDVCBwZ19kcm9wX3JlcGxpY2F0 aW9uX3Nsb3QoJ3JlZ3Jlc3Npb25fc2xvdCcpOwogIHBnX2Ryb3BfcmVwbGljYXRpb25fc2xv dCAKZGlmZiAtLWdpdCBhL2NvbnRyaWIvdGVzdF9kZWNvZGluZy9zcWwvc3RyZWFtLnNxbCBi L2NvbnRyaWIvdGVzdF9kZWNvZGluZy9zcWwvc3RyZWFtLnNxbAppbmRleCA1ZTQ1YThlOWI2 NC4uZWM2OGVmZWQ0MjEgMTAwNjQ0Ci0tLSBhL2NvbnRyaWIvdGVzdF9kZWNvZGluZy9zcWwv c3RyZWFtLnNxbAorKysgYi9jb250cmliL3Rlc3RfZGVjb2Rpbmcvc3FsL3N0cmVhbS5zcWwK QEAgLTgyLDUgKzgyLDI1IEBAIFJPTExCQUNLOwogSU5TRVJUIElOVE8gc3RyZWFtX3Rlc3Qg VkFMVUVTICgnYWZ0ZXItYWJvcnQnKTsKIFNFTEVDVCBkYXRhIEZST00gcGdfbG9naWNhbF9z bG90X2dldF9jaGFuZ2VzKCdyZWdyZXNzaW9uX3Nsb3QnLCBOVUxMLCBOVUxMLCAnaW5jbHVk ZS14aWRzJywgJzAnLCAnc2tpcC1lbXB0eS14YWN0cycsICcxJyk7CiAKKy0tIFZlcmlmeSB0 aGF0IGEgdHJhbnNhY3Rpb25hbCBtZXNzYWdlIGVtaXR0ZWQgaW4gYSBzdHJlYW1lZCBzdWJ0 cmFuc2FjdGlvbgorLS0gaXMgYXNzb2NpYXRlZCB3aXRoIHRoZSBzdWJ0cmFuc2FjdGlvbidz IFhJRC4KK1NFVCBkZWJ1Z19sb2dpY2FsX3JlcGxpY2F0aW9uX3N0cmVhbWluZyA9IGltbWVk aWF0ZTsKK0JFR0lOOworU0FWRVBPSU5UIHNwOworU0VMRUNUICdtc2dfc3VieGFjdCcgRlJP TSBwZ19sb2dpY2FsX2VtaXRfbWVzc2FnZSh0cnVlLCAndGVzdCcsICdtc2cnKTsKK1JPTExC QUNLIFRPIFNBVkVQT0lOVCBzcDsKK0NPTU1JVDsKKworV0lUSCBjaGFuZ2VzIEFTICgKKwlT RUxFQ1QgeGlkLCBkYXRhCisJRlJPTSBwZ19sb2dpY2FsX3Nsb3RfZ2V0X2NoYW5nZXMoJ3Jl Z3Jlc3Npb25fc2xvdCcsIE5VTEwsIE5VTEwsCisJCSdpbmNsdWRlLXhpZHMnLCAnMCcsICdz a2lwLWVtcHR5LXhhY3RzJywgJzEnLCAnc3RyZWFtLWNoYW5nZXMnLCAnMScpCispCitTRUxF Q1QgbS54aWQgPSBhLnhpZCBBUyBzdWJ4aWRfbWF0Y2hlcworRlJPTSBjaGFuZ2VzIG0sIGNo YW5nZXMgYQorV0hFUkUgbS5kYXRhIExJS0UgJ3N0cmVhbWluZyBtZXNzYWdlOiUnCisgIEFO RCBhLmRhdGEgPSAnYWJvcnRpbmcgc3RyZWFtZWQgKHN1Yil0cmFuc2FjdGlvbic7CitSRVNF VCBkZWJ1Z19sb2dpY2FsX3JlcGxpY2F0aW9uX3N0cmVhbWluZzsKKwogRFJPUCBUQUJMRSBz dHJlYW1fdGVzdDsKIFNFTEVDVCBwZ19kcm9wX3JlcGxpY2F0aW9uX3Nsb3QoJ3JlZ3Jlc3Np b25fc2xvdCcpOwpkaWZmIC0tZ2l0IGEvY29udHJpYi90ZXN0X2RlY29kaW5nL3Rlc3RfZGVj b2RpbmcuYyBiL2NvbnRyaWIvdGVzdF9kZWNvZGluZy90ZXN0X2RlY29kaW5nLmMKaW5kZXgg NzgxODU4MzdhZWYuLjk2MWRjNDc1YTEyIDEwMDY0NAotLS0gYS9jb250cmliL3Rlc3RfZGVj b2RpbmcvdGVzdF9kZWNvZGluZy5jCisrKyBiL2NvbnRyaWIvdGVzdF9kZWNvZGluZy90ZXN0 X2RlY29kaW5nLmMKQEAgLTk2MSwxMSArOTYxLDE4IEBAIHBnX2RlY29kZV9zdHJlYW1fbWVz c2FnZShMb2dpY2FsRGVjb2RpbmdDb250ZXh0ICpjdHgsCiAJaWYgKHRyYW5zYWN0aW9uYWwp CiAJewogCQlUZXN0RGVjb2RpbmdEYXRhICpkYXRhID0gY3R4LT5vdXRwdXRfcGx1Z2luX3By aXZhdGU7Ci0JCVRlc3REZWNvZGluZ1R4bkRhdGEgKnR4bmRhdGEgPSB0eG4tPm91dHB1dF9w bHVnaW5fcHJpdmF0ZTsKKworCQkvKgorCQkgKiBzdHJlYW1fbWVzc2FnZV9jYiBjYW4gYmUg Y2FsbGVkIGZvciBhbiBpbmRpdmlkdWFsIHN1YnRyYW5zYWN0aW9uCisJCSAqIGJ1dCB3ZSBt YWludGFpbiB0aGUgb3V0cHV0X3BsdWdpbl9wcml2YXRlIG9ubHkgdW5kZXIgdGhlIHRvcHR4 biBzbworCQkgKiBpZiB0aGlzIGlzIG5vdCB0aGUgdG9wdHhuIHRoZW4gZmV0Y2ggdGhlIHRv cHR4bi4KKwkJICovCisJCVJlb3JkZXJCdWZmZXJUWE4gKnRvcHR4biA9IHJidHhuX2dldF90 b3B0eG4odHhuKTsKKwkJVGVzdERlY29kaW5nVHhuRGF0YSAqdHhuZGF0YSA9IHRvcHR4bi0+ b3V0cHV0X3BsdWdpbl9wcml2YXRlOwogCiAJCWlmIChkYXRhLT5za2lwX2VtcHR5X3hhY3Rz ICYmICF0eG5kYXRhLT5zdHJlYW1fd3JvdGVfY2hhbmdlcykKIAkJewotCQkJcGdfb3V0cHV0 X3N0cmVhbV9zdGFydChjdHgsIGRhdGEsIHR4biwgZmFsc2UpOworCQkJcGdfb3V0cHV0X3N0 cmVhbV9zdGFydChjdHgsIGRhdGEsIHRvcHR4biwgZmFsc2UpOwogCQl9CiAJCXR4bmRhdGEt PnhhY3Rfd3JvdGVfY2hhbmdlcyA9IHR4bmRhdGEtPnN0cmVhbV93cm90ZV9jaGFuZ2VzID0g dHJ1ZTsKIAl9CmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2Fs L3Jlb3JkZXJidWZmZXIuYyBiL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwvcmVv cmRlcmJ1ZmZlci5jCmluZGV4IDQ2ODQzOTg1MzE3Li43ZDUzODc5ZDE4ZSAxMDA2NDQKLS0t IGEvc3JjL2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC9yZW9yZGVyYnVmZmVyLmMKKysr IGIvc3JjL2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC9yZW9yZGVyYnVmZmVyLmMKQEAg LTIxMDQsMTAgKzIxMDQsMTggQEAgUmVvcmRlckJ1ZmZlckFwcGx5TWVzc2FnZShSZW9yZGVy QnVmZmVyICpyYiwgUmVvcmRlckJ1ZmZlclRYTiAqdHhuLAogCQkJCQkJICBSZW9yZGVyQnVm ZmVyQ2hhbmdlICpjaGFuZ2UsIGJvb2wgc3RyZWFtaW5nKQogewogCWlmIChzdHJlYW1pbmcp Ci0JCXJiLT5zdHJlYW1fbWVzc2FnZShyYiwgdHhuLCBjaGFuZ2UtPmxzbiwgdHJ1ZSwKKwl7 CisJCS8qCisJCSAqIFBhc3MgdGhlIGNoYW5nZSdzIHRyYW5zYWN0aW9uIGVudHJ5ICh3aGlj aCBjb3VsZCBiZSBhCisJCSAqIHN1YnRyYW5zYWN0aW9uKSBzbyB0aGF0IHRoZSBvdXRwdXQg cGx1Z2luIGNhbiBhc3NvY2lhdGUgdGhlIG1lc3NhZ2UKKwkJICogd2l0aCBpdCBhbmQgZGlz Y2FyZCB0aGUgbWVzc2FnZSBpZiB0aGUgc3VidHJhbnNhY3Rpb24gaXMgYWJvcnRlZAorCQkg KiBsYXRlci4KKwkJICovCisJCXJiLT5zdHJlYW1fbWVzc2FnZShyYiwgY2hhbmdlLT50eG4s IGNoYW5nZS0+bHNuLCB0cnVlLAogCQkJCQkJICAgY2hhbmdlLT5kYXRhLm1zZy5wcmVmaXgs CiAJCQkJCQkgICBjaGFuZ2UtPmRhdGEubXNnLm1lc3NhZ2Vfc2l6ZSwKIAkJCQkJCSAgIGNo YW5nZS0+ZGF0YS5tc2cubWVzc2FnZSk7CisJfQogCWVsc2UKIAkJcmItPm1lc3NhZ2UocmIs IHR4biwgY2hhbmdlLT5sc24sIHRydWUsCiAJCQkJCWNoYW5nZS0+ZGF0YS5tc2cucHJlZml4 LAotLSAKMi41NC4wIChBcHBsZSBHaXQtMTU3KQoK --------------Y5J0l03R80Xs4S0cemX5NSrd Content-Type: text/plain; charset=UTF-8; name="nocfbot-0002-Top-up-for-v6-0001-Test-streamed-subtransaction-.patch" Content-Disposition: attachment; filename*0="nocfbot-0002-Top-up-for-v6-0001-Test-streamed-subtransaction"; filename*1="-.patch" Content-Transfer-Encoding: base64 RnJvbSA0YjM3NzAyNWRiMzExNzRmOGYyYTQzMTIzZjBiMmM0MjA1YjI0MGVkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBaaGlqaWUgSG91IDxob3V6aGlqaWUyMkBnbWFpbC5j b20+CkRhdGU6IFNhdCwgMzEgT2N0IDIwMjYgMTY6Mjg6NDUgKzA4MDAKU3ViamVjdDogW1BB VENIXSBUb3AtdXAgZm9yIHY2LTAwMDE6IFRlc3Qgc3RyZWFtZWQgc3VidHJhbnNhY3Rpb24g cm9sbGJhY2sKIHdpdGggbG9naWNhbCBtZXNzYWdlcy4KClZlcmlmeSBpbiAwMDFfYmFzaWMu cGwgdGhhdCBhIHRyYW5zYWN0aW9uYWwgbG9naWNhbCBtZXNzYWdlIGVtaXR0ZWQgaW4gYQpz dHJlYW1lZCBzdWJ0cmFuc2FjdGlvbiB0aGF0IGxhdGVyIHJvbGxzIGJhY2sgdG8gYSBzYXZl cG9pbnQgaXMgbm90CmFwcGxpZWQgdW5kZXIgYm90aCBzdHJlYW1pbmcgPSBvbiBhbmQgc3Ry ZWFtaW5nID0gcGFyYWxsZWwuCi0tLQogc3JjL3Rlc3QvbW9kdWxlcy90ZXN0X2xvZ2ljYWxt c2dfaG9va3MvdC8wMDFfYmFzaWMucGwgfCA3ICsrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA3 IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9zcmMvdGVzdC9tb2R1bGVzL3Rlc3RfbG9n aWNhbG1zZ19ob29rcy90LzAwMV9iYXNpYy5wbCBiL3NyYy90ZXN0L21vZHVsZXMvdGVzdF9s b2dpY2FsbXNnX2hvb2tzL3QvMDAxX2Jhc2ljLnBsCmluZGV4IGE5ZmY2MTcxYWQ2Li41OWQz ODc2OWMwMyAxMDA2NDQKLS0tIGEvc3JjL3Rlc3QvbW9kdWxlcy90ZXN0X2xvZ2ljYWxtc2df aG9va3MvdC8wMDFfYmFzaWMucGwKKysrIGIvc3JjL3Rlc3QvbW9kdWxlcy90ZXN0X2xvZ2lj YWxtc2dfaG9va3MvdC8wMDFfYmFzaWMucGwKQEAgLTEyNCw3ICsxMjQsMTAgQEAgZm9yZWFj aCBteSAkbW9kZSAoJ29uJywgJ3BhcmFsbGVsJykKIAkkcHViLT5zYWZlX3BzcWwoCiAJCSdw b3N0Z3JlcycsIHFxewogQkVHSU47CitTQVZFUE9JTlQgc3A7CitTRUxFQ1QgcGdfbG9naWNh bF9lbWl0X21lc3NhZ2UodHJ1ZSwgJ3N0cmVhbWluZ19zdWJ4YWN0X2Fib3J0ZWRfJG1vZGUn LCAnbm90IGRlbGl2ZXJlZCcpOwogSU5TRVJUIElOVE8gdGVzdCBTRUxFQ1QgZ2VuZXJhdGVf c2VyaWVzKDEwMDAsIDYwMDApOworUk9MTEJBQ0sgVE8gU0FWRVBPSU5UIHNwOwogU0VMRUNU IHBnX2xvZ2ljYWxfZW1pdF9tZXNzYWdlKHRydWUsICdzdHJlYW1pbmdfJG1vZGUnLCAnc3Ry ZWFtZWQgbWVzc2FnZScpOwogQ09NTUlUOwogfSk7CkBAIC0xMzYsNiArMTM5LDEwIEBAIENP TU1JVDsKIAkJcXtTRUxFQ1Qgc3RyZWFtX3R4bnMgPiAwIEZST00gcGdfc3RhdF9yZXBsaWNh dGlvbl9zbG90cyBXSEVSRSBzbG90X25hbWUgPSAnc3ViJ30KIAkpIG9yIGRpZSAidHJhbnNh Y3Rpb24gd2FzIG5vdCBzdHJlYW1lZCI7CiAKKwlpcyhsb2dnZWRfY291bnQoInN0cmVhbWlu Z19zdWJ4YWN0X2Fib3J0ZWRfJG1vZGUiKSwKKwkJMCwKKwkJIm1lc3NhZ2Ugb2YgYW4gYWJv cnRlZCBzdHJlYW1lZCBzdWJ0cmFuc2FjdGlvbiBpcyBub3QgYXBwbGllZCAoc3RyZWFtaW5n ID0gJG1vZGUpIgorCSk7CiAJaXMobG9nZ2VkX2NvdW50KCJzdHJlYW1pbmdfJG1vZGUiKSwK IAkJMSwKIAkJIm1lc3NhZ2UgaW4gYSBzdHJlYW1lZCB0cmFuc2FjdGlvbiBpcyBhcHBsaWVk IChzdHJlYW1pbmcgPSAkbW9kZSkiKTsKLS0gCjIuNTQuMCAoQXBwbGUgR2l0LTE1NykKCg== --------------Y5J0l03R80Xs4S0cemX5NSrd--