Received: from malur.postgresql.org ([2a02:16a8:dc51::56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1fiG9y-0005va-N9 for pgadmin-hackers@arkaria.postgresql.org; Wed, 25 Jul 2018 09:32:43 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1fiG9w-0002U9-V5 for pgadmin-hackers@arkaria.postgresql.org; Wed, 25 Jul 2018 09:32:40 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1fiG9w-0002U2-1d for pgadmin-hackers@lists.postgresql.org; Wed, 25 Jul 2018 09:32:40 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1fiG9r-00055f-Nm for pgadmin-hackers@postgresql.org; Wed, 25 Jul 2018 09:32:38 +0000 Received: by mail-lj1-x244.google.com with SMTP id s12-v6so6080953ljj.0 for ; Wed, 25 Jul 2018 02:32:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=9mdfeWDYaP0gCuXKrLOYAIDCFXmhNYB5CT3u6f80to8=; b=X07j0oqcZKJWZPaM3jI9JlfER79VZJBmaxWdEVKRa6a5RPog4m7Uw26JUAkjxy/BvW xLRK1QPEl59W4j8gVPW8QvNkX/Vsepu08LFIy2mzFwtSMGF005glBst9t1JbwQOJoBg+ G1QJMcyvVCnJt8SuyCtwvc64XH8BxHjU7j4UnHsnKw/u/yIcX+y+kfrCiDZoMUqouqMG 4fiJqSF9N8L9ihUk5uMEBw70OF5c//J8ocZJ4KkNNS+Sqp49pGTjnp/lMtZmjGtWGDB5 F/2jdQEAgw3SvtudzRt3uJTeAAwZkAuFT17clM4M3xVe9YP72a607eqFwkKMfs4D+qL4 G/Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=9mdfeWDYaP0gCuXKrLOYAIDCFXmhNYB5CT3u6f80to8=; b=RUtuiN1guuv42RXMPfWZgW0EKy5oJKTkuqxhHNfingS3da5EqWzz9W0tLmpytm7AIM qUVO0E2MZn5m0r2JfoVU1t16ouThXmyY8vHD9/5rDKEIP2uDAxHBqJCNza08eUoxGM1P 0iHjORkKkmXFOkqBC6SA0ks015HtH7gbOn6AMTCl2iErb0gllOAqm2BBs3zPSGSL0XWs zqQ/QPzXvFsJmLUnUw6elBpWLL3rKZE/WO7kSPf+YA1dw5VbMp1Xj1SBKB00sWEcTkuO E4MrHpYsdjCiIQtKL8nplHMI75MZdPZQKMkm9nUMfnf/2NKB34tIuWAy4aG1IEmJQGB1 EsLg== X-Gm-Message-State: AOUpUlFgkZ1/huWEehMOKurSfJ+kD4xMd82/1dFIzkrI04a7RRT2mFet QVyv6zqIceB05eRHqNvER4ZupsGrhB9P64+PP4+Vow== X-Google-Smtp-Source: AAOMgpevx+iUsHHeBAKC6sCk1oMFPkZkXfjbnyYiJqKp8u3Vgu2u1DDIkZiaGX57UW2w/0Oo3047ys7VQQ2iC/YG/fk= X-Received: by 2002:a2e:1984:: with SMTP id 4-v6mr15410890ljz.35.1532511153632; Wed, 25 Jul 2018 02:32:33 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a2e:8703:0:0:0:0:0 with HTTP; Wed, 25 Jul 2018 02:32:33 -0700 (PDT) In-Reply-To: References: From: Aditya Toshniwal Date: Wed, 25 Jul 2018 15:02:33 +0530 Message-ID: Subject: Re: [pgAdmin4][RM3294] User need to reset the layout to see the changed preferences parameters To: Dave Page Cc: Akshay Joshi , pgadmin-hackers Content-Type: multipart/mixed; boundary="000000000000ed61850571cf8eee" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --000000000000ed61850571cf8eee Content-Type: multipart/alternative; boundary="000000000000ed61820571cf8eec" --000000000000ed61820571cf8eec Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Hackers, Attached is the updated patch with few more fixes of existing dashboard. Fi= xed dashboard reloading even if subnodes under a dashboard or server selected. On Tue, Jul 24, 2018 at 9:01 PM, Dave Page wrote: > Thanks, applied. > > On Tue, Jul 24, 2018 at 2:11 PM, Aditya Toshniwal enterprisedb.com> wrote: > >> Hi, >> >> Attached is the updated patch. >> >> On Tue, Jul 24, 2018 at 4:32 PM, Dave Page wrote: >> >>> Hi >>> >>> On Tue, Jul 24, 2018 at 11:39 AM, Aditya Toshniwal < >>> aditya.toshniwal@enterprisedb.com> wrote: >>> >>>> Hi Hackers, >>>> >>>> Attached is the second part of the changes for making preferences >>>> realtime. The patch includes dashboard and debugger modules. >>>> >>> >>> All my dashboard graphs now seem to be straight lines. I'm guessing >>> there's a bug somewhere, as I've never seen one PG server sustain it's = I/O >>> levels so perfectly, let alone the three I tested with :-) >>> >> =E2=80=8BFixed. :P =E2=80=8B >> >> >>> >>> >>>> I would also request to create RMs for javascript test cases for >>>> dashboard and debugger modules as currently there is no setup for the = test >>>> cases of these two modules. >>>> >>> >>> Please do. As well as that I'd also like to see a Python test to ensure >>> that the invocation SQL for various different types of function/procedu= re >>> is correct. We've messed that up a few times over the years. >>> >>> Thanks. >>> >>> The changes are on the JS side and so patch does not have any test case= s >>>> included. >>>> >>> >>>> Kindly review. >>>> >>>> >>>> On Thu, Jul 5, 2018 at 4:09 PM, Dave Page wrote: >>>> >>>>> Thanks - patch applied! >>>>> >>>>> On Wed, Jul 4, 2018 at 10:19 AM, Aditya Toshniwal < >>>>> aditya.toshniwal@enterprisedb.com> wrote: >>>>> >>>>>> Hi Hackers, >>>>>> >>>>>> Attached is the updated patch for the RM. Change of the flags like >>>>>> auto commit, explain->verbose, etc. will reflect in all other open s= ql >>>>>> editors. >>>>>> Kindly review. >>>>>> >>>>>> On Fri, Jun 29, 2018 at 10:39 PM, Aditya Toshniwal < >>>>>> aditya.toshniwal@enterprisedb.com> wrote: >>>>>> >>>>>>> Hi Dave, >>>>>>> >>>>>>> On Fri, Jun 29, 2018 at 9:30 PM, Dave Page >>>>>>> wrote: >>>>>>> >>>>>>>> Hi >>>>>>>> >>>>>>>> On Fri, Jun 29, 2018 at 3:14 PM, Aditya Toshniwal < >>>>>>>> aditya.toshniwal@enterprisedb.com> wrote: >>>>>>>> >>>>>>>>> Hi Hackers, >>>>>>>>> >>>>>>>>> Attached is the updated patch. >>>>>>>>> >>>>>>>> >>>>>>>> This seems to work for the most part, however I saw what seemed >>>>>>>> like odd behaviour. If I have 2 query tool windows open; >>>>>>>> >>>>>>>> - Changing a preference from the Preferences dialogue updates both >>>>>>>> query tools. >>>>>>>> >>>>>>>> - Changing a preference from a Query Tool updates the Preferences >>>>>>>> dialogue. >>>>>>>> >>>>>>>> - Changing a preference from a Query Tool does *not* update the >>>>>>>> other Query Tool. >>>>>>>> >>>>>>>> The last point seems odd to me, though it also kinda makes sense t= o >>>>>>>> not have one query tool affect the other. The problem with that is= that it >>>>>>>> could get quite confusing when they get out of sync. I think it wo= uld be >>>>>>>> better for a change in one Query Tool to update the other(s). >>>>>>>> >>>>>>>> What do you think? Was this behaviour intentional? >>>>>>>> >>>>>>> >>>>>>> =E2=80=8BNo this was not intentional. It should reflect in other qu= ery tools >>>>>>> as well because changing the flags like Auto Commit changes the pre= ferences >>>>>>> config and is not local to a Query tool. I missed the fact that som= e >>>>>>> preferences can be changed from other than preference dialog.=E2=80= =8B >>>>>>> >>>>>>> =E2=80=8BWill send the updated patch with the fix.=E2=80=8B >>>>>>> >>>>>>>> >>>>>>>> (FYI, in case this was a one-off bug, I was testing using "Auto >>>>>>>> Commit?") >>>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> On Fri, Jun 29, 2018 at 4:46 PM, Aditya Toshniwal < >>>>>>>>> aditya.toshniwal@enterprisedb.com> wrote: >>>>>>>>> >>>>>>>>>> Hi Akshay, >>>>>>>>>> >>>>>>>>>> On Fri, Jun 29, 2018 at 3:42 PM, Akshay Joshi < >>>>>>>>>> akshay.joshi@enterprisedb.com> wrote: >>>>>>>>>> >>>>>>>>>>> Hi Aditya >>>>>>>>>>> >>>>>>>>>>> I have applied your patch and run pgAdmin4. I have found >>>>>>>>>>> following two issue in the browser: >>>>>>>>>>> >>>>>>>>>>> - Found error while open Preferences dialog. Refer >>>>>>>>>>> Open_Preferences_Dialog.png >>>>>>>>>>> >>>>>>>>>>> =E2=80=8BThis error occurs even with the latest pull without ch= anges.=E2=80=8B >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> - Set the preferences setting "Open in new browser tab" to >>>>>>>>>>> True and open the query tool. Refer "Open_In_New_Broswer.png= ". >>>>>>>>>>> >>>>>>>>>>> =E2=80=8BWill look into this.=E2=80=8B >>>>>>>>>> >>>>>>>>>> >>>>>>>>>>> I haven't review the code. >>>>>>>>>>> >>>>>>>>>>> On Thu, Jun 28, 2018 at 8:04 PM, Aditya Toshniwal < >>>>>>>>>>> aditya.toshniwal@enterprisedb.com> wrote: >>>>>>>>>>> >>>>>>>>>>>> Hi Hackers, >>>>>>>>>>>> >>>>>>>>>>>> Attached is the patch for making preferences realtime and >>>>>>>>>>>> applying without reseting the layout. Please note, the patch i= s only for >>>>>>>>>>>> one module - SQL Editor and is the first part for the RM. Ther= e are lot of >>>>>>>>>>>> changes to be done to cover all and hence sending in parts. Th= is will not >>>>>>>>>>>> affect/break existing code. Further patches will cover other m= odules. >>>>>>>>>>>> >>>>>>>>>>>> Highlights of this patch include: >>>>>>>>>>>> - Changes will affect SQL Editors in Create dialog boxes, SQL >>>>>>>>>>>> tab of the main screen, Query tool, History entries in the que= ry tool, >>>>>>>>>>>> Query tool opened in New Tab/Window >>>>>>>>>>>> - All the components of SQL editor will refer to single source >>>>>>>>>>>> of preferences which is cached in the Browser object. All othe= r redundant >>>>>>>>>>>> ajax get preference calls are removed. >>>>>>>>>>>> - SQL editor will not refer template JS variables anymore, >>>>>>>>>>>> once all the references are removed the template variables wil= l also be >>>>>>>>>>>> removed. >>>>>>>>>>>> - Code refactoring wherever possible. >>>>>>>>>>>> - Covered JS test cases wherever possible. >>>>>>>>>>>> >>>>>>>>>>>> Request you to kindly review. >>>>>>>>>>>> >>>>>>>>>>>> -- >>>>>>>>>>>> Thanks and Regards, >>>>>>>>>>>> Aditya Toshniwal >>>>>>>>>>>> Software Engineer | EnterpriseDB Software Solutions | Pune >>>>>>>>>>>> "Don't Complain about Heat, Plant a tree" >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> -- >>>>>>>>>>> *Akshay Joshi* >>>>>>>>>>> >>>>>>>>>>> *Sr. Software Architect * >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> *Phone: +91 20-3058-9517Mobile: +91 976-788-8246* >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> -- >>>>>>>>>> Thanks and Regards, >>>>>>>>>> Aditya Toshniwal >>>>>>>>>> Software Engineer | EnterpriseDB Software Solutions | Pune >>>>>>>>>> "Don't Complain about Heat, Plant a tree" >>>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> -- >>>>>>>>> Thanks and Regards, >>>>>>>>> Aditya Toshniwal >>>>>>>>> Software Engineer | EnterpriseDB Software Solutions | Pune >>>>>>>>> "Don't Complain about Heat, Plant a tree" >>>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> Dave Page >>>>>>>> Blog: http://pgsnake.blogspot.com >>>>>>>> Twitter: @pgsnake >>>>>>>> >>>>>>>> EnterpriseDB UK: http://www.enterprisedb.com >>>>>>>> The Enterprise PostgreSQL Company >>>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> Thanks and Regards, >>>>>>> Aditya Toshniwal >>>>>>> Software Engineer | EnterpriseDB Software Solutions | Pune >>>>>>> "Don't Complain about Heat, Plant a tree" >>>>>>> >>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> Thanks and Regards, >>>>>> Aditya Toshniwal >>>>>> Software Engineer | EnterpriseDB Software Solutions | Pune >>>>>> "Don't Complain about Heat, Plant a tree" >>>>>> >>>>> >>>>> >>>>> >>>>> -- >>>>> Dave Page >>>>> Blog: http://pgsnake.blogspot.com >>>>> Twitter: @pgsnake >>>>> >>>>> EnterpriseDB UK: http://www.enterprisedb.com >>>>> The Enterprise PostgreSQL Company >>>>> >>>> >>>> >>>> >>>> -- >>>> Thanks and Regards, >>>> Aditya Toshniwal >>>> Software Engineer | EnterpriseDB Software Solutions | Pune >>>> "Don't Complain about Heat, Plant a tree" >>>> >>> >>> >>> >>> -- >>> Dave Page >>> Blog: http://pgsnake.blogspot.com >>> Twitter: @pgsnake >>> >>> EnterpriseDB UK: http://www.enterprisedb.com >>> The Enterprise PostgreSQL Company >>> >> >> >> >> -- >> Thanks and Regards, >> Aditya Toshniwal >> Software Engineer | EnterpriseDB Software Solutions | Pune >> "Don't Complain about Heat, Plant a tree" >> > > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > --=20 Thanks and Regards, Aditya Toshniwal Software Engineer | EnterpriseDB Software Solutions | Pune "Don't Complain about Heat, Plant a tree" --000000000000ed61820571cf8eec Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,

Attached is the updated patch with few more fi= xes of existing dashboard.=C2=A0Fixed dash= board reloading even if subnodes under a dashboard or server selected.

On = Tue, Jul 24, 2018 at 9:01 PM, Dave Page <dpage@pgadmin.org> = wrote:
Thanks, applied.<= /div>
On Tue, Jul 24, 2018 at 2:11 PM, Aditya Toshniw= al <aditya.toshniwal@enterprisedb.com> = wrote:
Hi,=C2=A0

Attached is the updated patch.
On Tue, Jul 24, 2018 at 4:32 PM, Dave Pag= e <dpage@pgadmin.org> wrote:
Hi

On Tue, Jul 24, 2018 at 11:39 AM, Aditya Toshni= wal <aditya.toshniwal@enterprisedb.com>= wrote:
Hi Hackers,

Attached is the second part of the changes for making preferenc= es realtime. The patch includes dashboard and debugger modules.

All my dashboard graphs now seem to= be straight lines. I'm guessing there's a bug somewhere, as I'= ve never seen one PG server sustain it's I/O levels so perfectly, let a= lone the three I tested with :-)
=E2=80= =8BFixed. :P =E2=80=8B
=C2=A0
=C2=A0
I would also request to create RMs for javascript test cases for dashboa= rd and debugger modules as currently there is no setup for the test cases o= f these two modules.

Ple= ase do. As well as that I'd also like to see a Python test to ensure th= at the invocation SQL for various different types of function/procedure is = correct. We've messed that up a few times over the years.
=C2= =A0
Thanks.

The changes are on the = JS side and so patch does not have any test cases included.

Kindly review.
=

On Thu, Jul 5, 2018 at 4:09 PM, Dave Page <dpage@pgadmi= n.org> wrote:
Thanks - patch applied!

On Wed, Jul 4, 2018 at 10:19 AM, Aditya Toshniwal <= adit= ya.toshniwal@enterprisedb.com> wrote:
Hi Hackers,

Attached is the updated pat= ch for the RM. Change of the flags like auto commit, explain->verbose, e= tc. will reflect in all other open sql editors.
Kindly review.

On Fri, Jun 2= 9, 2018 at 10:39 PM, Aditya Toshniwal <aditya.toshniwal@en= terprisedb.com> wrote:
Hi Dave,

On Fri, = Jun 29, 2018 at 9:30 PM, Dave Page <dpage@pgadmin.org> wrote= :
Hi

On Fri, Jun 29, 2018 at 3:1= 4 PM, Aditya Toshniwal <aditya.toshniwal@enterprisedb= .com> wrote:
Hi Hackers,=C2=A0

Attached is the updated patch.

This seems to work for the most part, howeve= r I saw what seemed like odd behaviour. If I have 2 query tool windows open= ;

- Changing a preference from the Preferences dia= logue updates both query tools.

- Changing a prefe= rence from a Query Tool updates the Preferences dialogue.

- Changing a preference from a Query Tool does *not* update the oth= er Query Tool.

The last point seems odd to me, tho= ugh it also kinda makes sense to not have one query tool affect the other. = The problem with that is that it could get quite confusing when they get ou= t of sync. I think it would be better for a change in one Query Tool to upd= ate the other(s).=C2=A0

What do you think? Was thi= s behaviour intentional?
= =C2=A0
=E2=80= =8BNo this was not intentional. It should reflect in other query tools as w= ell because changing the flags like Auto Commit changes the preferences con= fig and is not local to a Query tool. I missed the fact that some preferenc= es can be changed from other than preference dialog.=E2=80=8B
=C2=A0=E2=80=8BWill se= nd the updated patch with the fix.=E2=80=8B

(FYI, in case this was a one-off bug, I was t= esting using "Auto Commit?")
=C2= =A0
<= br>
On Fri, Jun 29, 2018 at 4:46 PM, Aditya Toshn= iwal <aditya.toshniwal@enterprisedb.com> wrote:
Hi Akshay,
<= br>
On Fri, Jun 29, 2018 at 3:42 PM, Akshay= Joshi <akshay.joshi@enterprisedb.com> wrot= e:
Hi Aditya=C2=A0
<= br>
I have applied your patch and run pgAdmin4. I have found foll= owing two issue in the browser:
  • Found error while open Pr= eferences dialog. Refer Open_Preferences_Dialog.png
=E2=80=8BThis error occurs even with the latest pull without chang= es.=E2=80=8B
=C2=A0
  • Set the preferences setting "Open in new browser= tab" to True and open the query tool. Refer "Open_In_New_Broswer= .png".
=E2=80=8BWill look into this.= =E2=80=8B
=C2=A0
I ha= ven't review the code.

On Thu, Jun 28, 2018 at 8:04 PM, Aditya To= shniwal <aditya.toshniwal@enterprisedb.com> wrote:
Hi Hackers,

Attached is the patch for making preferences realtime and applying wit= hout reseting the layout. Please note, the patch is only for one module - S= QL Editor and is the first part for the RM. There are lot of changes to be = done to cover all and hence sending in parts. This will not affect/break ex= isting code. Further patches will cover other modules.

Highlights of this patch include:
- Changes will affect SQL Editors in Create dialog bo= xes, SQL tab of the main screen, Query tool, History entries in the query t= ool, Query tool opened in New Tab/Window
- All the components of SQL editor will refer to single so= urce of preferences which is cached in the Browser object. All other redund= ant ajax get preference calls are removed.
-=C2=A0SQL editor will not refer template JS variables= anymore, once all the references are removed the template variables will a= lso be removed.
-= Code refactoring wherever possible.
- Covered JS test cases wherever possible.

Request you to kindly review.

--
<= div dir=3D"ltr">
Thanks and Regards,
Aditya Toshniwal
= Software Engineer |=C2=A0EnterpriseDB So= ftware Solutions |=C2=A0Pune
= "Don't Compla= in about Heat, Plant a tree"



--
Akshay Joshi
Sr. Software Architect


Phone: +91 20-3058-9517
Mobile: +91 976-788-= 8246



--
Thanks and Regards,
Aditya Toshniwal
Software Engineer |=C2=A0EnterpriseDB Software Solutions |=C2= =A0Pune
"Don't Complain about Heat, Plant a tree"



--
Thanks and Regar= ds,
Aditya Toshniwal=
= Softwa= re Engineer |=C2=A0EnterpriseDB Software Solutions |=C2=A0Pune
&qu= ot;Don't Complain about Heat, Plant a tree"



--
Dave = Page
Blog: htt= p://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: <= a href=3D"http://www.enterprisedb.com" target=3D"_blank">http://www.enterpr= isedb.com
The Enterprise PostgreSQL Company



--
Thanks and Regards,
Aditya Toshniwal
Software Engineer |=C2=A0EnterpriseDB So= ftware Solutions |=C2=A0Pune
"Don't Complain about Heat, = Plant a tree"



--
Thanks a= nd Regards,
Aditya T= oshniwal
Software Engineer |=C2=A0EnterpriseDB Software Solutions |=C2=A0Pune
"Don't Complain about Heat, Plant a tree"<= /div>



--
=
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsna= ke

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Co= mpany



--
=
Thanks and Regards,
Aditya Toshniwal
Software Engineer |=C2=A0Enter= priseDB Software Solutions |=C2=A0Pune<= /span>
"Don't Complain ab= out Heat, Plant a tree"



-- <= br>



--
Dave Page
Blog:
http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseD= B UK: http://www.= enterprisedb.com
The Enterprise PostgreSQL Company



--
=
Thanks and Regards,
Aditya Toshniwal
Software Engineer |=C2=A0EnterpriseDB So= ftware Solutions |=C2=A0Pune
"Don't Complain about Heat, = Plant a tree"
--000000000000ed61820571cf8eec-- --000000000000ed61850571cf8eee Content-Type: application/octet-stream; name="0003-RM3294.patch" Content-Disposition: attachment; filename="0003-RM3294.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jk0xkita0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC9zdGF0aWMvanMvZGFzaGJvYXJkLmpz IGIvd2ViL3BnYWRtaW4vZGFzaGJvYXJkL3N0YXRpYy9qcy9kYXNoYm9hcmQuanMKaW5kZXggYjg4 OGI2ZDUuLjA5ZDg4NWQ3IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvc3RhdGlj L2pzL2Rhc2hib2FyZC5qcworKysgYi93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvc3RhdGljL2pzL2Rh c2hib2FyZC5qcwpAQCAtMjQ5LDggKzI0OSw2IEBAIGRlZmluZSgncGdhZG1pbi5kYXNoYm9hcmQn LCBbCiAgICAgLy8gSGFuZGxlIHRyZWV2aWV3IGNsaWNrcwogICAgIG9iamVjdF9zZWxlY3RlZDog ZnVuY3Rpb24oaXRlbSwgaXRlbURhdGEsIG5vZGUpIHsKICAgICAgIGxldCBzZWxmID0gdGhpczsK LSAgICAgIC8qIENsZWFyIGFsbCB0aGUgaW50ZXJ2YWwgZnVuY3Rpb25zIG9mIHByZXZpb3VzIGRh c2hib2FyZHMgKi8KLSAgICAgIHNlbGYuY2xlYXJJbnRlcnZhbElkKCk7CiAKICAgICAgIGlmIChp dGVtRGF0YSAmJiBpdGVtRGF0YS5fdHlwZSAmJiBkYXNoYm9hcmRWaXNpYmxlKSB7CiAgICAgICAg IHZhciB0cmVlSGllcmFyY2h5ID0gbm9kZS5nZXRUcmVlTm9kZUhpZXJhcmNoeShpdGVtKSwKQEAg LTI5MSw2ICsyODksOCBAQCBkZWZpbmUoJ3BnYWRtaW4uZGFzaGJvYXJkJywgWwogICAgICAgICAg ICAgdXJsICs9IHNlbGYuc2lkOwogICAgICAgICAgICAgY2FuY2VsX3F1ZXJ5X3VybCArPSBzZWxm LnNpZCArICcvJzsKICAgICAgICAgICAgIHRlcm1pbmF0ZV9zZXNzaW9uX3VybCArPSBzZWxmLnNp ZCArICcvJzsKKyAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgaXNfc2VydmVyX2Rhc2hi b2FyZCA9IGlzX2RhdGFiYXNlX2Rhc2hib2FyZCA9IGZhbHNlOwogICAgICAgICAgIH0KICAgICAg ICAgfQogCkBAIC0zMDYsOCArMzA2LDEwIEBAIGRlZmluZSgncGdhZG1pbi5kYXNoYm9hcmQnLCBb CiAgICAgICAgICAgICAgIGlmICh1cmwgIT09ICQoZGFzaGJvYXJkUGFuZWwpLmRhdGEoJ2Rhc2hi b2FyZF91cmwnKSB8fCAoCiAgICAgICAgICAgICAgICAgdXJsID09PSAkKGRhc2hib2FyZFBhbmVs KS5kYXRhKCdkYXNoYm9hcmRfdXJsJykgJiYKICAgICAgICAgICAgICAgICAgICQoZGFzaGJvYXJk UGFuZWwpLmRhdGEoJ3NlcnZlcl9zdGF0dXMnKSA9PSBmYWxzZSkpIHsKLSAgICAgICAgICAgICAg ICAvLyBDbGVhciBvdXQgZXZlcnl0aGluZyBzbyBhbnkgZXhpc3RpbmcgdGltZXJzIGRpZSBvZmYK ICAgICAgICAgICAgICAgICAkKGRpdikuZW1wdHkoKTsKKyAgICAgICAgICAgICAgICAvKiBDbGVh ciBhbGwgdGhlIGludGVydmFsIGZ1bmN0aW9ucyBvZiBwcmV2aW91cyBkYXNoYm9hcmRzICovCisg ICAgICAgICAgICAgICAgc2VsZi5jbGVhckludGVydmFsSWQoKTsKKwogCiAgICAgICAgICAgICAg ICAgJC5hamF4KHsKICAgICAgICAgICAgICAgICAgIHVybDogdXJsLApAQCAtMzI1LDkgKzMyNyw2 IEBAIGRlZmluZSgncGdhZG1pbi5kYXNoYm9hcmQnLCBbCiAgICAgICAgICAgICAgICAgfSk7CiAg ICAgICAgICAgICAgICAgJChkYXNoYm9hcmRQYW5lbCkuZGF0YSgnc2VydmVyX3N0YXR1cycsIHRy dWUpOwogICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAg ICAgIHNlbGYuaW5pdF9kYXNoYm9hcmQoKTsKLSAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgICAgJChkaXYpLmVtcHR5KCk7CiAgICAgICAgICAgICAgICQo ZGl2KS5odG1sKApAQCAtNjU1LDEwICs2NTQsNiBAQCBkZWZpbmUoJ3BnYWRtaW4uZGFzaGJvYXJk JywgWwogICAgIGluaXRfZGFzaGJvYXJkOiBmdW5jdGlvbigpIHsKICAgICAgIGxldCBzZWxmID0g dGhpczsKIAotICAgICAgaWYoc2VsZi5zaWQgPT09IC0xICYmIHNlbGYuZGlkID09PSAtMSkgewot ICAgICAgICByZXR1cm47Ci0gICAgICB9Ci0KICAgICAgIC8qIENhY2hlIG1heSB0YWtlIHRpbWUg dG8gbG9hZCBmb3IgdGhlIGZpcnN0IHRpbWUKICAgICAgICAqIEtlZXAgdHJ5aW5nIHRpbGwgYXZh aWxhYmxlCiAgICAgICAgKi8KQEAgLTY4MywzMCArNjc4LDcgQEAgZGVmaW5lKCdwZ2FkbWluLmRh c2hib2FyZCcsIFsKICAgICB9LAogCiAgICAgcmVmbGVjdFByZWZlcmVuY2VzOiBmdW5jdGlvbigp IHsKLSAgICAgIC8qIENvbW1vbiB0aGluZ3MgY2FuIGNvbWUgaGVyZSAqLwogICAgICAgdmFyIHNl bGYgPSB0aGlzOwotICAgICAgdmFyIGRpdl9zZXNzaW9ucyA9ICQoJy5kYXNoYm9hcmQtY29udGFp bmVyJykuZmluZCgnI2dyYXBoLXNlc3Npb25zJylbMF07Ci0gICAgICB2YXIgZGl2X3RwcyA9ICQo Jy5kYXNoYm9hcmQtY29udGFpbmVyJykuZmluZCgnI2dyYXBoLXRwcycpWzBdOwotICAgICAgdmFy IGRpdl90aSA9ICQoJy5kYXNoYm9hcmQtY29udGFpbmVyJykuZmluZCgnI2dyYXBoLXRpJylbMF07 Ci0gICAgICB2YXIgZGl2X3RvID0gJCgnLmRhc2hib2FyZC1jb250YWluZXInKS5maW5kKCcjZ3Jh cGgtdG8nKVswXTsKLSAgICAgIHZhciBkaXZfYmlvID0gJCgnLmRhc2hib2FyZC1jb250YWluZXIn KS5maW5kKCcjZ3JhcGgtYmlvJylbMF07Ci0gICAgICB2YXIgb3B0aW9uc19saW5lID0gewotICAg ICAgICBwYXJzZUZsb2F0OiBmYWxzZSwKLSAgICAgICAgeGF4aXM6IHsKLSAgICAgICAgICBtaW46 IDEwMCwKLSAgICAgICAgICBtYXg6IDAsCi0gICAgICAgICAgYXV0b3NjYWxlOiAwLAotICAgICAg ICB9LAotICAgICAgICB5YXhpczogewotICAgICAgICAgIGF1dG9zY2FsZTogMSwKLSAgICAgICAg fSwKLSAgICAgICAgbGVnZW5kOiB7Ci0gICAgICAgICAgcG9zaXRpb246ICdudycsCi0gICAgICAg ICAgYmFja2dyb3VuZENvbG9yOiAnI0QyRThGRicsCi0gICAgICAgIH0sCi0gICAgICAgIHNoYWRv d1NpemU6IDAsCi0gICAgICAgIHJlc29sdXRpb24gOiA1LAotICAgICAgfTsKIAogICAgICAgLyog V2Ugd2lsbCB1c2Ugb2xkIHByZWZlcmVuY2VzIGZvciBzZWxlY3RpdmUgZ3JhcGggdXBkYXRlcyBv biBwcmVmZXJlbmNlIGNoYW5nZSAqLwogICAgICAgaWYoc2VsZi5wcmVmZXJlbmNlcykgewpAQCAt NzE4LDYwICs2OTAsODYgQEAgZGVmaW5lKCdwZ2FkbWluLmRhc2hib2FyZCcsIFsKICAgICAgICAg c2VsZi5vbGRfcHJlZmVyZW5jZXMgPSBzZWxmLnByZWZlcmVuY2VzOwogICAgICAgfQogCi0gICAg ICBpZihzZWxmLnByZWZlcmVuY2VzLnNob3dfZ3JhcGhzICYmICQoJyNkYXNoYm9hcmQtZ3JhcGhz JykuaGFzQ2xhc3MoJ2Rhc2hib2FyZC1oaWRkZW4nKSkgewotICAgICAgICAkKCcjZGFzaGJvYXJk LWdyYXBocycpLnJlbW92ZUNsYXNzKCdkYXNoYm9hcmQtaGlkZGVuJyk7Ci0gICAgICB9Ci0gICAg ICBlbHNlIGlmKCFzZWxmLnByZWZlcmVuY2VzLnNob3dfZ3JhcGhzKSB7Ci0gICAgICAgICQoJyNk YXNoYm9hcmQtZ3JhcGhzJykuYWRkQ2xhc3MoJ2Rhc2hib2FyZC1oaWRkZW4nKTsKLSAgICAgICAg c2VsZi5jbGVhckludGVydmFsSWQoKTsKLSAgICAgIH0KKyAgICAgIGlmKGlzX3NlcnZlcl9kYXNo Ym9hcmQgfHwgaXNfZGF0YWJhc2VfZGFzaGJvYXJkKSB7CisgICAgICAgIC8qIENvbW1vbiB0aGlu Z3MgY2FuIGNvbWUgaGVyZSAqLworICAgICAgICB2YXIgZGl2X3Nlc3Npb25zID0gJCgnLmRhc2hi b2FyZC1jb250YWluZXInKS5maW5kKCcjZ3JhcGgtc2Vzc2lvbnMnKVswXTsKKyAgICAgICAgdmFy IGRpdl90cHMgPSAkKCcuZGFzaGJvYXJkLWNvbnRhaW5lcicpLmZpbmQoJyNncmFwaC10cHMnKVsw XTsKKyAgICAgICAgdmFyIGRpdl90aSA9ICQoJy5kYXNoYm9hcmQtY29udGFpbmVyJykuZmluZCgn I2dyYXBoLXRpJylbMF07CisgICAgICAgIHZhciBkaXZfdG8gPSAkKCcuZGFzaGJvYXJkLWNvbnRh aW5lcicpLmZpbmQoJyNncmFwaC10bycpWzBdOworICAgICAgICB2YXIgZGl2X2JpbyA9ICQoJy5k YXNoYm9hcmQtY29udGFpbmVyJykuZmluZCgnI2dyYXBoLWJpbycpWzBdOworICAgICAgICB2YXIg b3B0aW9uc19saW5lID0geworICAgICAgICAgIHBhcnNlRmxvYXQ6IGZhbHNlLAorICAgICAgICAg IHhheGlzOiB7CisgICAgICAgICAgICBtaW46IDEwMCwKKyAgICAgICAgICAgIG1heDogMCwKKyAg ICAgICAgICAgIGF1dG9zY2FsZTogMCwKKyAgICAgICAgICB9LAorICAgICAgICAgIHlheGlzOiB7 CisgICAgICAgICAgICBhdXRvc2NhbGU6IDEsCisgICAgICAgICAgfSwKKyAgICAgICAgICBsZWdl bmQ6IHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiAnbncnLAorICAgICAgICAgICAgYmFja2dyb3Vu ZENvbG9yOiAnI0QyRThGRicsCisgICAgICAgICAgfSwKKyAgICAgICAgICBzaGFkb3dTaXplOiAw LAorICAgICAgICAgIHJlc29sdXRpb24gOiA1LAorICAgICAgICB9OworCisgICAgICAgIGlmKHNl bGYucHJlZmVyZW5jZXMuc2hvd19ncmFwaHMgJiYgJCgnI2Rhc2hib2FyZC1ncmFwaHMnKS5oYXND bGFzcygnZGFzaGJvYXJkLWhpZGRlbicpKSB7CisgICAgICAgICAgJCgnI2Rhc2hib2FyZC1ncmFw aHMnKS5yZW1vdmVDbGFzcygnZGFzaGJvYXJkLWhpZGRlbicpOworICAgICAgICB9CisgICAgICAg IGVsc2UgaWYoIXNlbGYucHJlZmVyZW5jZXMuc2hvd19ncmFwaHMpIHsKKyAgICAgICAgICAkKCcj ZGFzaGJvYXJkLWdyYXBocycpLmFkZENsYXNzKCdkYXNoYm9hcmQtaGlkZGVuJyk7CisgICAgICAg ICAgc2VsZi5jbGVhckludGVydmFsSWQoKTsKKyAgICAgICAgfQogCi0gICAgICBpZiAoc2VsZi5w cmVmZXJlbmNlcy5zaG93X2FjdGl2aXR5ICYmICQoJyNkYXNoYm9hcmQtYWN0aXZpdHknKS5oYXND bGFzcygnZGFzaGJvYXJkLWhpZGRlbicpKSB7Ci0gICAgICAgICQoJyNkYXNoYm9hcmQtYWN0aXZp dHknKS5yZW1vdmVDbGFzcygnZGFzaGJvYXJkLWhpZGRlbicpOwotICAgICAgfQotICAgICAgZWxz ZSBpZighc2VsZi5wcmVmZXJlbmNlcy5zaG93X2FjdGl2aXR5KSB7Ci0gICAgICAgICQoJyNkYXNo Ym9hcmQtYWN0aXZpdHknKS5hZGRDbGFzcygnZGFzaGJvYXJkLWhpZGRlbicpOwotICAgICAgfQor ICAgICAgICBpZiAoc2VsZi5wcmVmZXJlbmNlcy5zaG93X2FjdGl2aXR5ICYmICQoJyNkYXNoYm9h cmQtYWN0aXZpdHknKS5oYXNDbGFzcygnZGFzaGJvYXJkLWhpZGRlbicpKSB7CisgICAgICAgICAg JCgnI2Rhc2hib2FyZC1hY3Rpdml0eScpLnJlbW92ZUNsYXNzKCdkYXNoYm9hcmQtaGlkZGVuJyk7 CisgICAgICAgIH0KKyAgICAgICAgZWxzZSBpZighc2VsZi5wcmVmZXJlbmNlcy5zaG93X2FjdGl2 aXR5KSB7CisgICAgICAgICAgJCgnI2Rhc2hib2FyZC1hY3Rpdml0eScpLmFkZENsYXNzKCdkYXNo Ym9hcmQtaGlkZGVuJyk7CisgICAgICAgIH0KIAotICAgICAgaWYoc2VsZi5wcmVmZXJlbmNlcy5z aG93X2dyYXBocykgewotICAgICAgICAvLyBSZW5kZXIgdGhlIGdyYXBocwotICAgICAgICBwZ0Fk bWluLkRhc2hib2FyZC5yZW5kZXJfY2hhcnQoCi0gICAgICAgICAgZGl2X3Nlc3Npb25zLCB1cmxf Zm9yKCdkYXNoYm9hcmQuc2Vzc2lvbl9zdGF0cycpLCBvcHRpb25zX2xpbmUsIGZhbHNlLAotICAg ICAgICAgICdzZXNzaW9uX3N0YXRzJywgJ3Nlc3Npb25fc3RhdHNfcmVmcmVzaCcKLSAgICAgICAg KTsKLSAgICAgICAgcGdBZG1pbi5EYXNoYm9hcmQucmVuZGVyX2NoYXJ0KAotICAgICAgICAgIGRp dl90cHMsIHVybF9mb3IoJ2Rhc2hib2FyZC50cHNfc3RhdHMnKSwgb3B0aW9uc19saW5lLCB0cnVl LAotICAgICAgICAgICd0cHNfc3RhdHMnLCd0cHNfc3RhdHNfcmVmcmVzaCcKLSAgICAgICAgKTsK LSAgICAgICAgcGdBZG1pbi5EYXNoYm9hcmQucmVuZGVyX2NoYXJ0KAotICAgICAgICAgIGRpdl90 aSwgdXJsX2ZvcignZGFzaGJvYXJkLnRpX3N0YXRzJyksIG9wdGlvbnNfbGluZSwgdHJ1ZSwKLSAg ICAgICAgICAndGlfc3RhdHMnLCAndGlfc3RhdHNfcmVmcmVzaCcKLSAgICAgICAgKTsKLSAgICAg ICAgcGdBZG1pbi5EYXNoYm9hcmQucmVuZGVyX2NoYXJ0KAotICAgICAgICAgIGRpdl90bywgdXJs X2ZvcignZGFzaGJvYXJkLnRvX3N0YXRzJyksIG9wdGlvbnNfbGluZSwgdHJ1ZSwKLSAgICAgICAg ICAndG9fc3RhdHMnLCd0b19zdGF0c19yZWZyZXNoJwotICAgICAgICApOwotICAgICAgICBwZ0Fk bWluLkRhc2hib2FyZC5yZW5kZXJfY2hhcnQoCi0gICAgICAgICAgZGl2X2JpbywgdXJsX2Zvcign ZGFzaGJvYXJkLmJpb19zdGF0cycpLCBvcHRpb25zX2xpbmUsIHRydWUsCi0gICAgICAgICAgJ2Jp b19zdGF0cycsJ2Jpb19zdGF0c19yZWZyZXNoJwotICAgICAgICApOwotICAgICAgfQorICAgICAg ICBpZihzZWxmLnByZWZlcmVuY2VzLnNob3dfZ3JhcGhzKSB7CisgICAgICAgICAgLy8gUmVuZGVy IHRoZSBncmFwaHMKKyAgICAgICAgICBwZ0FkbWluLkRhc2hib2FyZC5yZW5kZXJfY2hhcnQoCisg ICAgICAgICAgICBkaXZfc2Vzc2lvbnMsIHVybF9mb3IoJ2Rhc2hib2FyZC5zZXNzaW9uX3N0YXRz JyksIG9wdGlvbnNfbGluZSwgZmFsc2UsCisgICAgICAgICAgICAnc2Vzc2lvbl9zdGF0cycsICdz ZXNzaW9uX3N0YXRzX3JlZnJlc2gnCisgICAgICAgICAgKTsKKyAgICAgICAgICBwZ0FkbWluLkRh c2hib2FyZC5yZW5kZXJfY2hhcnQoCisgICAgICAgICAgICBkaXZfdHBzLCB1cmxfZm9yKCdkYXNo Ym9hcmQudHBzX3N0YXRzJyksIG9wdGlvbnNfbGluZSwgdHJ1ZSwKKyAgICAgICAgICAgICd0cHNf c3RhdHMnLCd0cHNfc3RhdHNfcmVmcmVzaCcKKyAgICAgICAgICApOworICAgICAgICAgIHBnQWRt aW4uRGFzaGJvYXJkLnJlbmRlcl9jaGFydCgKKyAgICAgICAgICAgIGRpdl90aSwgdXJsX2Zvcign ZGFzaGJvYXJkLnRpX3N0YXRzJyksIG9wdGlvbnNfbGluZSwgdHJ1ZSwKKyAgICAgICAgICAgICd0 aV9zdGF0cycsICd0aV9zdGF0c19yZWZyZXNoJworICAgICAgICAgICk7CisgICAgICAgICAgcGdB ZG1pbi5EYXNoYm9hcmQucmVuZGVyX2NoYXJ0KAorICAgICAgICAgICAgZGl2X3RvLCB1cmxfZm9y KCdkYXNoYm9hcmQudG9fc3RhdHMnKSwgb3B0aW9uc19saW5lLCB0cnVlLAorICAgICAgICAgICAg J3RvX3N0YXRzJywndG9fc3RhdHNfcmVmcmVzaCcKKyAgICAgICAgICApOworICAgICAgICAgIHBn QWRtaW4uRGFzaGJvYXJkLnJlbmRlcl9jaGFydCgKKyAgICAgICAgICAgIGRpdl9iaW8sIHVybF9m b3IoJ2Rhc2hib2FyZC5iaW9fc3RhdHMnKSwgb3B0aW9uc19saW5lLCB0cnVlLAorICAgICAgICAg ICAgJ2Jpb19zdGF0cycsJ2Jpb19zdGF0c19yZWZyZXNoJworICAgICAgICAgICk7CisgICAgICAg IH0KIAotICAgICAgLyogRGFzaGJvYXJkIHNwZWNpZmljIHByZWZlcmVuY2VzIGNhbiBiZSB1cGRh dGVkIGluIHRoZQotICAgICAgICogYXBwcm9wcmlhdGUgZnVuY3Rpb25zCi0gICAgICAgKi8KLSAg ICAgIGlmKGlzX3NlcnZlcl9kYXNoYm9hcmQpIHsKLSAgICAgICAgc2VsZi5yZWZsZWN0UHJlZmVy ZW5jZXNTZXJ2ZXIoKTsKLSAgICAgIH0KLSAgICAgIGVsc2UgaWYoaXNfZGF0YWJhc2VfZGFzaGJv YXJkKSB7Ci0gICAgICAgIHNlbGYucmVmbGVjdFByZWZlcmVuY2VzRGF0YWJhc2UoKTsKLSAgICAg IH0KKyAgICAgICAgaWYoIXNlbGYucHJlZmVyZW5jZXMuc2hvd19ncmFwaHMgJiYgIXNlbGYucHJl ZmVyZW5jZXMuc2hvd19hY3Rpdml0eSkgeworICAgICAgICAgICQoJyNkYXNoYm9hcmQtbm9uZS1z aG93JykucmVtb3ZlQ2xhc3MoJ2Rhc2hib2FyZC1oaWRkZW4nKTsKKyAgICAgICAgfQorICAgICAg ICBlbHNlIHsKKyAgICAgICAgICAkKCcjZGFzaGJvYXJkLW5vbmUtc2hvdycpLmFkZENsYXNzKCdk YXNoYm9hcmQtaGlkZGVuJyk7CisgICAgICAgIH0KIAotICAgICAgaWYoIXNlbGYucHJlZmVyZW5j ZXMuc2hvd19ncmFwaHMgJiYgIXNlbGYucHJlZmVyZW5jZXMuc2hvd19hY3Rpdml0eSkgewotICAg ICAgICAkKCcjZGFzaGJvYXJkLW5vbmUtc2hvdycpLnJlbW92ZUNsYXNzKCdkYXNoYm9hcmQtaGlk ZGVuJyk7Ci0gICAgICB9Ci0gICAgICBlbHNlIHsKLSAgICAgICAgJCgnI2Rhc2hib2FyZC1ub25l LXNob3cnKS5hZGRDbGFzcygnZGFzaGJvYXJkLWhpZGRlbicpOworICAgICAgICAvKiBEYXNoYm9h cmQgc3BlY2lmaWMgcHJlZmVyZW5jZXMgY2FuIGJlIHVwZGF0ZWQgaW4gdGhlCisgICAgICAgICAq IGFwcHJvcHJpYXRlIGZ1bmN0aW9ucworICAgICAgICAgKi8KKyAgICAgICAgaWYoaXNfc2VydmVy X2Rhc2hib2FyZCkgeworICAgICAgICAgIHNlbGYucmVmbGVjdFByZWZlcmVuY2VzU2VydmVyKCk7 CisgICAgICAgIH0KKyAgICAgICAgZWxzZSBpZihpc19kYXRhYmFzZV9kYXNoYm9hcmQpIHsKKyAg ICAgICAgICBzZWxmLnJlZmxlY3RQcmVmZXJlbmNlc0RhdGFiYXNlKCk7CisgICAgICAgIH0KICAg ICAgIH0KICAgICB9LAogICAgIHJlZmxlY3RQcmVmZXJlbmNlc1NlcnZlcjogZnVuY3Rpb24oKSB7 CkBAIC0xMzEzLDEyICsxMzExLDcgQEAgZGVmaW5lKCdwZ2FkbWluLmRhc2hib2FyZCcsIFsKICAg ICAgIH0KICAgICB9LAogICAgIHRvZ2dsZVZpc2liaWxpdHk6IGZ1bmN0aW9uKGZsYWcpIHsKLS8v ICAgICAgbGV0IHNlbGYgPSB0aGlzOwogICAgICAgZGFzaGJvYXJkVmlzaWJsZSA9IGZsYWc7Ci0K LS8vICAgICAgaWYoZGFzaGJvYXJkVmlzaWJsZSkgewotLy8gICAgICAgIHNlbGYuaW5pdF9kYXNo Ym9hcmQoKTsKLS8vICAgICAgfQogICAgIH0sCiAgICAgY2FuX3Rha2VfYWN0aW9uOiBmdW5jdGlv bihtKSB7CiAgICAgICAvLyBXZSB3aWxsIHZhbGlkYXRlIGlmIHVzZXIgaXMgYWxsb3dlZCB0byBj YW5jZWwgdGhlIGFjdGl2ZSBxdWVyeQo= --000000000000ed61850571cf8eee--