MIME-Version: 1.0
References: 
 <CA+HiwqF4C0ws3cO+z5cLkPuvwnAwkSp7sfvgGj3yQ=Li6KNMqA@mail.gmail.com>
 <CA+HiwqGM6nvAV5O+=Nr+BXMPWOma0oeCRVzVP0XiLE8zX5TVAg@mail.gmail.com>
 <CA+HiwqGMaovCUgDbGxVGnK0Mrivr+ph3YE2Ws+47-ugyPb4f7g@mail.gmail.com>
 <CAFj8pRDaiBe_GOLk_yyYHTtPiDAAaLOM8u1-=Q3ZgXBTH+1igg@mail.gmail.com>
 <CA+HiwqGA5Ay_MR0eJEEbt4j6WrVh4F+AasTp8yCbs5aJLOJn6Q@mail.gmail.com>
 <CAEG8a3JM=NoqiTK0V6S9FNxZPvy1+C5F7rfafTtPKBVWnunL-g@mail.gmail.com>
 <CA+HiwqEyiLCY6MTLbOJXDdLNNQLaURYHvdW797MQgbjEK9od4Q@mail.gmail.com>
 <CAEG8a3+VBpwPf1Rm-ECD90whM9b3YnGhux5CVXdsL6khiBfzRQ@mail.gmail.com>
 <CA+HiwqF2UHzF0sKCp-F2a-U29rqh_9ZPy=f1h+Fh_=M8efj3pg@mail.gmail.com>
 <CAEG8a3L9Ew-WL8sxLROVOcypeaENPmd8qCmMvz4geoGL1TDGCA@mail.gmail.com>
 <CAEG8a3+nUFQo4sdPQF9xy0J73J8RFJ5U9A5+_kMosGDaZ+1sXA@mail.gmail.com>
 <2BE661BA-D909-4093-BF78-DB9B0C099337@gmail.com>
 <CAEG8a3JyKdizWvYsF+z_mA1BKy=dpW11iKVMOG=bk6Tbz6M1Bw@mail.gmail.com>
 <CAEG8a3+Hf4tvvbts29_k_AFhWQmRYfEo_SW4C5FY_140iKghBw@mail.gmail.com>
 <CA+HiwqFV-PY-3BxM6j5TaAiC3AwedDxo-6vwRSbvygg3zF+xAQ@mail.gmail.com>
 <CA+HiwqHpaisS-e+0gAgzh92qZAFxncAJMmmTRZZN=efoeTPgOg@mail.gmail.com>
 <CA+HiwqFwZ6WLRbY8R7VC7JVp5Jot6ktZOkr9wDxTjoK=W1SgdQ@mail.gmail.com>
 <CA+HiwqF_Kz=R8juHJBiOATvabWSOugK4VaGOxoJ_n=E2c7UM9w@mail.gmail.com>
 <CA+HiwqHCB7kcbspkhaLN9enoj5x=ehzhFM4PXDgWUUP8Px41GA@mail.gmail.com>
 <77FA04FE-1F84-4DA1-8855-8BBFD8CC889A@gmail.com>
 <CA+HiwqHpVtP485wEKuXdOkdoZWhvVvfFH40-og07Jp3MPx21eg@mail.gmail.com>
 <CAEG8a3JWHkJSXe9nNcVK7wnYKUEqWuMGFDhy5BynB_9tEjmEUg@mail.gmail.com>
 <CA+HiwqFjfumKrWy03q5M309xJJVYt0WgGfH6AZ8BjFhSwppwsQ@mail.gmail.com>
 <CAEG8a3JjP1LaKSv-r3AMJLRyLMzENJrKshWsDvDouMPM_sizmA@mail.gmail.com>
 <CA+HiwqFQ+ZA7hSOygv4uv_t75B3r0_gosjadetCsAEoaZwTu6g@mail.gmail.com>
 <CA+HiwqHdB0r8z6Mut13BxpYNq2W-os+Arju4mcZbCyU9PeaVog@mail.gmail.com>
 <CAEG8a3K5ayVNkCDnK9OtNb+4OY0chJtW6ObgEOSFjqyymQda8Q@mail.gmail.com>
 <CA+HiwqGJYCgEs_F-LBtrRdx-Y969LMr-OVogjFXU6U-0q5bOwQ@mail.gmail.com>
 <CA+HiwqF2Ma6R_QyjfPBvFreYbezFpGcwASJE0a2bM+Y0jvof+g@mail.gmail.com>
 <C3ACBAE1-CC5F-4688-9828-4668CDE37F83@gmail.com>
 <CA+HiwqGFRAH2O5bGpNMErFopFyn-2-Zu3+5y+BFQim9TE8z+Pw@mail.gmail.com>
 <C2133B47-79CD-40FF-B088-02D20D654806@gmail.com>
 <CA+HiwqFx=aciJYkkaviyTutUm303QXz6GtXSqzG7nfd4MAzddQ@mail.gmail.com>
In-Reply-To: 
 <CA+HiwqFx=aciJYkkaviyTutUm303QXz6GtXSqzG7nfd4MAzddQ@mail.gmail.com>
From: Amit Langote <amitlangote09@gmail.com>
Date: Mon, 6 Apr 2026 18:45:05 +0900
Message-ID: 
 <CA+HiwqH39QU7vGVx65JH1e0nzVvQc5eVmuY7=qyj0T_+b-HO3A@mail.gmail.com>
Subject: Re: Eliminating SPI / SQL from some RI triggers - take 3
To: Chao Li <li.evan.chao@gmail.com>
Cc: Junwang Zhao <zhjwpku@gmail.com>, Haibo Yan <tristan.yim@gmail.com>,
	Pavel Stehule <pavel.stehule@gmail.com>,
	PostgreSQL-development <pgsql-hackers@postgresql.org>,
 Tomas Vondra <tomas@vondra.me>
Content-Type: multipart/mixed; boundary="0000000000008bc6bb064ec78692"
Archived-At: 
 <https://www.postgresql.org/message-id/CA%2BHiwqH39QU7vGVx65JH1e0nzVvQc5eVmuY7%3Dqyj0T_%2Bb-HO3A%40mail.gmail.com>
Precedence: bulk

--0000000000008bc6bb064ec78692
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, Apr 3, 2026 at 6:39=E2=80=AFPM Amit Langote <amitlangote09@gmail.co=
m> wrote:
> On Fri, Apr 3, 2026 at 5:58=E2=80=AFPM Chao Li <li.evan.chao@gmail.com> w=
rote:
> > > On Apr 3, 2026, at 13:52, Amit Langote <amitlangote09@gmail.com> wrot=
e:
> > > On Thu, Apr 2, 2026 at 5:00=E2=80=AFPM Chao Li <li.evan.chao@gmail.co=
m> wrote:
> > >> I plan to spend time testing and tracing this patch tomorrow. But I =
don=E2=80=99t want to block your progress, if I find anything, I will repor=
t to you.
> > >
> > > Sure, I didn't want to leave committing this to the weekend or the ne=
xt week.
> >
> > I spent several hours debugging this patch today, and I found a problem=
 where the batch mode doesn't seem to handle deferred RI triggers, although=
 the commit message suggests that it should.
> >
> > I traced this scenario:
> > ```
> > CREATE TABLE pk (a int primary key);
> > CREATE TABLE fk (a int references pk(a) DEFERRABLE INITIALLY DEFERRED);
> > BEGIN;
> > INSERT INTO fk VALUES (1);
> > INSERT INTO pk VALUES (1);
> > COMMIT;
> > ```
> >
> > When COMMIT is executed, it reaches RI_FKey_check(), where AfterTrigger=
IsActive() checks whether afterTriggers.query_depth >=3D 0. But in the defe=
rred case, afterTriggers.query_depth is -1.
> >
> > From the code:
> > ```
> >         if (ri_fastpath_is_applicable(riinfo))
> >         {
> >                 if (AfterTriggerIsActive())
> >                 {
> >                         /* Batched path: buffer and probe in groups */
> >                         ri_FastPathBatchAdd(riinfo, fk_rel, newslot);
> >                 }
> >                 else
> >                 {
> >                         /* ALTER TABLE validation: per-row, no cache */
> >                         ri_FastPathCheck(riinfo, fk_rel, newslot);
> >                 }
> >                 return PointerGetDatum(NULL);
> >         }
> > ```
> >
> > So this ends up falling back to the per-row path for deferred RI checks=
 at COMMIT, even though the intent here seems to be only to bypass the ALTE=
R TABLE validation case, where batch callbacks would never fire, and MyTrig=
gerDepth is 0. So, maybe we can just check MyTriggerDepth>0 in AfterTrigger=
IsActive().
> >
> > I tried the attached fix. With it, deferred triggers go through the bat=
ch mode, and all existing tests still pass.
>
> I think you might be right.  Thanks for the patch.  It looks correct
> to me at a glance, but I will need to check it a bit more closely
> before committing.

Thinking about this some more, your fix is on the right track but
needs a bit more work -- MyTriggerDepth > 0 is too broad since it
fires for BEFORE triggers too. I have a revised version using a new
afterTriggerFiringDepth counter that I'll push shortly.

Added an open item for tracking in the meantime:
https://wiki.postgresql.org/wiki/PostgreSQL_19_Open_Items#Open_Issues

--=20
Thanks, Amit Langote

--0000000000008bc6bb064ec78692
Content-Type: application/octet-stream;
	name="v2-0001-Fix-deferred-FK-check-batching-introduced-by-comm.patch"
Content-Disposition: attachment;
	filename="v2-0001-Fix-deferred-FK-check-batching-introduced-by-comm.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_mnn04ydo0>
X-Attachment-Id: f_mnn04ydo0

RnJvbSBjMjA4YzdjZjEzYzY5NjhhMTJlNGM5YjMyMWViZWViZWJkOTMxYTQyIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBbWl0IExhbmdvdGUgPGFtaXRsYW5AcG9zdGdyZXNxbC5vcmc+
CkRhdGU6IE1vbiwgNiBBcHIgMjAyNiAxODo0MDowNSArMDkwMApTdWJqZWN0OiBbUEFUQ0ggdjJd
IEZpeCBkZWZlcnJlZCBGSyBjaGVjayBiYXRjaGluZyBpbnRyb2R1Y2VkIGJ5IGNvbW1pdAogYjdi
MjdlYjQxYTUKClRoYXQgY29tbWl0IGludHJvZHVjZWQgQWZ0ZXJUcmlnZ2VySXNBY3RpdmUoKSB0
byBkZXRlY3Qgd2hldGhlcgp3ZSBhcmUgaW5zaWRlIHRoZSBhZnRlci10cmlnZ2VyIGZpcmluZyBt
YWNoaW5lcnksIHNvIHRoYXQgUkkgdHJpZ2dlcgpmdW5jdGlvbnMgY2FuIHRha2UgdGhlIGJhdGNo
ZWQgZmFzdCBwYXRoLiAgSXQgd2FzIGltcGxlbWVudGVkIHVzaW5nCnF1ZXJ5X2RlcHRoID49IDAs
IHdoaWNoIGNvcnJlY3RseSBpZGVudGlmaWVkIGltbWVkaWF0ZSB0cmlnZ2VyIGZpcmluZwpidXQg
bWlzc2VkIHRoZSBkZWZlcnJlZCBjYXNlIHdoZXJlIHF1ZXJ5X2RlcHRoIGlzIC0xIGF0IENPTU1J
VCB2aWEKQWZ0ZXJUcmlnZ2VyRmlyZURlZmVycmVkKCkuICBUaGlzIGNhdXNlZCBkZWZlcnJlZCBG
SyBjaGVja3MgdG8gZmFsbApiYWNrIHRvIHRoZSBwZXItcm93IGZhc3QgcGF0aCBpbnN0ZWFkIG9m
IHRoZSBiYXRjaGVkIHBhdGguCgpUaGUgY29ycmVjdCBjaGVjayBpcyB3aGV0aGVyIHdlIGFyZSBp
bnNpZGUgYW4gYWZ0ZXItdHJpZ2dlciBmaXJpbmcKbG9vcCBzcGVjaWZpY2FsbHkuICBJbnRyb2R1
Y2UgYWZ0ZXJUcmlnZ2VyRmlyaW5nRGVwdGgsIGEgY291bnRlcgppbmNyZW1lbnRlZCBhcm91bmQg
dGhlIHRyaWdnZXItZmlyaW5nIGxvb3BzIGluIEFmdGVyVHJpZ2dlckVuZFF1ZXJ5LApBZnRlclRy
aWdnZXJGaXJlRGVmZXJyZWQsIGFuZCBBZnRlclRyaWdnZXJTZXRTdGF0ZSwgYW5kIGRlY3JlbWVu
dGVkCmFmdGVyIEZpcmVBZnRlclRyaWdnZXJCYXRjaENhbGxiYWNrcygpIHJldHVybnMuICBBZnRl
clRyaWdnZXJJc0FjdGl2ZSgpCm5vdyByZXR1cm5zIGFmdGVyVHJpZ2dlckZpcmluZ0RlcHRoID4g
MC4KClJlcG9ydGVkLWJ5OiBDaGFvIExpIDxsaS5ldmFuLmNoYW9AZ21haWwuY29tPgpBdXRob3I6
IENoYW8gTGkgPGxpLmV2YW4uY2hhb0BnbWFpbC5jb20+CkNvLWF1dGhvcmVkLWJ5OiBBbWl0IExh
bmdvdGUgPGFtaXRsYW5nb3RlMDlAZ21haWwuY29tPgpEaXNjdXNzaW9uOiBodHRwczovL3Bvc3Rn
ci5lcy9tL0MyMTMzQjQ3LTc5Q0QtNDBGRi1CMDg4LTAyRDIwRDY1NDgwNkBnbWFpbC5jb20KLS0t
CiBzcmMvYmFja2VuZC9jb21tYW5kcy90cmlnZ2VyLmMgfCAyNiArKysrKysrKysrKysrKysrKysr
KysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0p
CgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvY29tbWFuZHMvdHJpZ2dlci5jIGIvc3JjL2JhY2tl
bmQvY29tbWFuZHMvdHJpZ2dlci5jCmluZGV4IDRkNGU5NmE1MzAyLi41ZmUyNTg1Yzg4ZiAxMDA2
NDQKLS0tIGEvc3JjL2JhY2tlbmQvY29tbWFuZHMvdHJpZ2dlci5jCisrKyBiL3NyYy9iYWNrZW5k
L2NvbW1hbmRzL3RyaWdnZXIuYwpAQCAtMzk0MCw2ICszOTQwLDEzIEBAIHR5cGVkZWYgc3RydWN0
IEFmdGVyVHJpZ2dlckNhbGxiYWNrSXRlbQogCiBzdGF0aWMgQWZ0ZXJUcmlnZ2Vyc0RhdGEgYWZ0
ZXJUcmlnZ2VyczsKIAorLyoKKyAqIEluY3JlbWVudGVkIGJlZm9yZSBpbnZva2luZyBhZnRlclRy
aWdnZXJJbnZva2VFdmVudHMoKS4gIFVzZWQgYnkKKyAqIEFmdGVyVHJpZ2dlcklzQWN0aXZlKCkg
dG8gZGV0ZXJtaW5lIHdoZXRoZXIgYmF0Y2ggY2FsbGJhY2tzIHdpbGwgZmlyZSwKKyAqIHNvIHRo
YXQgUkkgdHJpZ2dlciBmdW5jdGlvbnMgY2FuIHRha2UgdGhlIGJhdGNoZWQgZmFzdCBwYXRoLgor
ICovCitzdGF0aWMgaW50IGFmdGVyVHJpZ2dlckZpcmluZ0RlcHRoID0gMDsKKwogc3RhdGljIHZv
aWQgQWZ0ZXJUcmlnZ2VyRXhlY3V0ZShFU3RhdGUgKmVzdGF0ZSwKIAkJCQkJCQkJQWZ0ZXJUcmln
Z2VyRXZlbnQgZXZlbnQsCiAJCQkJCQkJCVJlc3VsdFJlbEluZm8gKnJlbEluZm8sCkBAIC01MTEz
LDYgKzUxMjAsNyBAQCBBZnRlclRyaWdnZXJCZWdpblhhY3Qodm9pZCkKIAlBc3NlcnQoYWZ0ZXJU
cmlnZ2Vycy5ldmVudHMuaGVhZCA9PSBOVUxMKTsKIAlBc3NlcnQoYWZ0ZXJUcmlnZ2Vycy50cmFu
c19zdGFjayA9PSBOVUxMKTsKIAlBc3NlcnQoYWZ0ZXJUcmlnZ2Vycy5tYXh0cmFuc2RlcHRoID09
IDApOworCUFzc2VydChhZnRlclRyaWdnZXJGaXJpbmdEZXB0aCA9PSAwKTsKIH0KIAogCkBAIC01
MTg0LDYgKzUxOTIsNyBAQCBBZnRlclRyaWdnZXJFbmRRdWVyeShFU3RhdGUgKmVzdGF0ZSkKIAkg
Ki8KIAlxcyA9ICZhZnRlclRyaWdnZXJzLnF1ZXJ5X3N0YWNrW2FmdGVyVHJpZ2dlcnMucXVlcnlf
ZGVwdGhdOwogCisJYWZ0ZXJUcmlnZ2VyRmlyaW5nRGVwdGgrKzsKIAlmb3IgKDs7KQogCXsKIAkJ
aWYgKGFmdGVyVHJpZ2dlck1hcmtFdmVudHMoJnFzLT5ldmVudHMsICZhZnRlclRyaWdnZXJzLmV2
ZW50cywgdHJ1ZSkpCkBAIC01MjM0LDYgKzUyNDMsNyBAQCBBZnRlclRyaWdnZXJFbmRRdWVyeShF
U3RhdGUgKmVzdGF0ZSkKIAlBZnRlclRyaWdnZXJGcmVlUXVlcnkoJmFmdGVyVHJpZ2dlcnMucXVl
cnlfc3RhY2tbYWZ0ZXJUcmlnZ2Vycy5xdWVyeV9kZXB0aF0pOwogCiAJYWZ0ZXJUcmlnZ2Vycy5x
dWVyeV9kZXB0aC0tOworCWFmdGVyVHJpZ2dlckZpcmluZ0RlcHRoLS07CiB9CiAKIApAQCAtNTMy
OSw2ICs1MzM5LDcgQEAgQWZ0ZXJUcmlnZ2VyRmlyZURlZmVycmVkKHZvaWQpCiAJICogUnVuIGFs
bCB0aGUgcmVtYWluaW5nIHRyaWdnZXJzLiAgTG9vcCB1bnRpbCB0aGV5IGFyZSBhbGwgZ29uZSwg
aW4gY2FzZQogCSAqIHNvbWUgdHJpZ2dlciBxdWV1ZXMgbW9yZSBmb3IgdXMgdG8gZG8uCiAJICov
CisJYWZ0ZXJUcmlnZ2VyRmlyaW5nRGVwdGgrKzsKIAl3aGlsZSAoYWZ0ZXJUcmlnZ2VyTWFya0V2
ZW50cyhldmVudHMsIE5VTEwsIGZhbHNlKSkKIAl7CiAJCUNvbW1hbmRJZAlmaXJpbmdfaWQgPSBh
ZnRlclRyaWdnZXJzLmZpcmluZ19jb3VudGVyKys7CkBAIC01MzQwLDYgKzUzNTEsOCBAQCBBZnRl
clRyaWdnZXJGaXJlRGVmZXJyZWQodm9pZCkKIAkvKiBGbHVzaCBhbnkgZmFzdC1wYXRoIGJhdGNo
ZXMgYWNjdW11bGF0ZWQgYnkgdGhlIHRyaWdnZXJzIGp1c3QgZmlyZWQuICovCiAJRmlyZUFmdGVy
VHJpZ2dlckJhdGNoQ2FsbGJhY2tzKCk7CiAKKwlhZnRlclRyaWdnZXJGaXJpbmdEZXB0aC0tOwor
CiAJLyoKIAkgKiBXZSBkb24ndCBib3RoZXIgZnJlZWluZyB0aGUgZXZlbnQgbGlzdCwgc2luY2Ug
aXQgd2lsbCBnbyBhd2F5IGFueXdheQogCSAqIChhbmQgbW9yZSBlZmZpY2llbnRseSB0aGFuIHZp
YSBwZnJlZSkgaW4gQWZ0ZXJUcmlnZ2VyRW5kWGFjdC4KQEAgLTU0MDQsNiArNTQxNyw4IEBAIEFm
dGVyVHJpZ2dlckVuZFhhY3QoYm9vbCBpc0NvbW1pdCkKIAogCS8qIE5vIG1vcmUgYWZ0ZXJUcmln
Z2VycyBtYW5pcHVsYXRpb24gdW50aWwgbmV4dCB0cmFuc2FjdGlvbiBzdGFydHMuICovCiAJYWZ0
ZXJUcmlnZ2Vycy5xdWVyeV9kZXB0aCA9IC0xOworCisJYWZ0ZXJUcmlnZ2VyRmlyaW5nRGVwdGgg
PSAwOwogfQogCiAvKgpAQCAtNjA1Myw2ICs2MDY4LDcgQEAgQWZ0ZXJUcmlnZ2VyU2V0U3RhdGUo
Q29uc3RyYWludHNTZXRTdG10ICpzdG10KQogCQlBZnRlclRyaWdnZXJFdmVudExpc3QgKmV2ZW50
cyA9ICZhZnRlclRyaWdnZXJzLmV2ZW50czsKIAkJYm9vbAkJc25hcHNob3Rfc2V0ID0gZmFsc2U7
CiAKKwkJYWZ0ZXJUcmlnZ2VyRmlyaW5nRGVwdGgrKzsKIAkJd2hpbGUgKGFmdGVyVHJpZ2dlck1h
cmtFdmVudHMoZXZlbnRzLCBOVUxMLCB0cnVlKSkKIAkJewogCQkJQ29tbWFuZElkCWZpcmluZ19p
ZCA9IGFmdGVyVHJpZ2dlcnMuZmlyaW5nX2NvdW50ZXIrKzsKQEAgLTYwODYsNiArNjEwMiw3IEBA
IEFmdGVyVHJpZ2dlclNldFN0YXRlKENvbnN0cmFpbnRzU2V0U3RtdCAqc3RtdCkKIAkJICogRmx1
c2ggYW55IGZhc3QtcGF0aCBiYXRjaGVzIGFjY3VtdWxhdGVkIGJ5IHRoZSB0cmlnZ2VycyBqdXN0
IGZpcmVkLgogCQkgKi8KIAkJRmlyZUFmdGVyVHJpZ2dlckJhdGNoQ2FsbGJhY2tzKCk7CisJCWFm
dGVyVHJpZ2dlckZpcmluZ0RlcHRoLS07CiAKIAkJaWYgKHNuYXBzaG90X3NldCkKIAkJCVBvcEFj
dGl2ZVNuYXBzaG90KCk7CkBAIC02ODA2LDEwICs2ODIzLDEwIEBAIFJlZ2lzdGVyQWZ0ZXJUcmln
Z2VyQmF0Y2hDYWxsYmFjayhBZnRlclRyaWdnZXJCYXRjaENhbGxiYWNrIGNhbGxiYWNrLAogCSAq
IEFsbG9jYXRlIGluIFRvcFRyYW5zYWN0aW9uQ29udGV4dCBzbyB0aGUgaXRlbSBzdXJ2aXZlcyBm
b3IgdGhlIGR1cmF0aW9uCiAJICogb2YgdGhlIGJhdGNoLCB3aGljaCBtYXkgc3BhbiBtdWx0aXBs
ZSB0cmlnZ2VyIGludm9jYXRpb25zLgogCSAqCi0JICogTXVzdCBiZSBjYWxsZWQgd2hpbGUgYWZ0
ZXJUcmlnZ2VycyBpcyBhY3RpdmUgKHF1ZXJ5X2RlcHRoID49IDApOwotCSAqIGNhbGxiYWNrcyBy
ZWdpc3RlcmVkIG91dHNpZGUgYSB0cmlnZ2VyLWZpcmluZyBjb250ZXh0IHdvdWxkIG5ldmVyIGZp
cmUuCisJICogTXVzdCBiZSBjYWxsZWQgd2hpbGUgYWZ0ZXJUcmlnZ2VycyBpcyBhY3RpdmU7IGNh
bGxiYWNrcyByZWdpc3RlcmVkCisJICogb3V0c2lkZSBhIHRyaWdnZXItZmlyaW5nIGNvbnRleHQg
d291bGQgbmV2ZXIgZmlyZS4KIAkgKi8KLQlBc3NlcnQoYWZ0ZXJUcmlnZ2Vycy5xdWVyeV9kZXB0
aCA+PSAwKTsKKwlBc3NlcnQoYWZ0ZXJUcmlnZ2VyRmlyaW5nRGVwdGggPiAwKTsKIAlvbGRjeHQg
PSBNZW1vcnlDb250ZXh0U3dpdGNoVG8oVG9wVHJhbnNhY3Rpb25Db250ZXh0KTsKIAlpdGVtID0g
cGFsbG9jKHNpemVvZihBZnRlclRyaWdnZXJDYWxsYmFja0l0ZW0pKTsKIAlpdGVtLT5jYWxsYmFj
ayA9IGNhbGxiYWNrOwpAQCAtNjgzNiw2ICs2ODUzLDcgQEAgRmlyZUFmdGVyVHJpZ2dlckJhdGNo
Q2FsbGJhY2tzKHZvaWQpCiAJaWYgKGFmdGVyVHJpZ2dlcnMucXVlcnlfZGVwdGggPiAwKQogCQly
ZXR1cm47CiAKKwlBc3NlcnQoYWZ0ZXJUcmlnZ2VyRmlyaW5nRGVwdGggPiAwKTsKIAlmb3JlYWNo
KGxjLCBhZnRlclRyaWdnZXJzLmJhdGNoX2NhbGxiYWNrcykKIAl7CiAJCUFmdGVyVHJpZ2dlckNh
bGxiYWNrSXRlbSAqaXRlbSA9IGxmaXJzdChsYyk7CkBAIC02ODU4LDUgKzY4NzYsNSBAQCBGaXJl
QWZ0ZXJUcmlnZ2VyQmF0Y2hDYWxsYmFja3Modm9pZCkKIGJvb2wKIEFmdGVyVHJpZ2dlcklzQWN0
aXZlKHZvaWQpCiB7Ci0JcmV0dXJuIGFmdGVyVHJpZ2dlcnMucXVlcnlfZGVwdGggPj0gMDsKKwly
ZXR1cm4gYWZ0ZXJUcmlnZ2VyRmlyaW5nRGVwdGggPiAwOwogfQotLSAKMi40Ny4zCgo=
--0000000000008bc6bb064ec78692--