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 1faL4c-0003R4-Mz for pgadmin-hackers@arkaria.postgresql.org; Tue, 03 Jul 2018 13:10:26 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1faL4a-0007iG-RE for pgadmin-hackers@arkaria.postgresql.org; Tue, 03 Jul 2018 13:10:24 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1faL4a-0007i3-LQ for pgadmin-hackers@lists.postgresql.org; Tue, 03 Jul 2018 13:10:24 +0000 Received: from mail-pg0-x234.google.com ([2607:f8b0:400e:c05::234]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1faL4V-0003GX-Lv for pgadmin-hackers@postgresql.org; Tue, 03 Jul 2018 13:10:24 +0000 Received: by mail-pg0-x234.google.com with SMTP id v13-v6so964333pgr.10 for ; Tue, 03 Jul 2018 06:10:19 -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=oJEYyfXgXckmAD0sXTzq8C+3ACBZKvhQhhVJ8PImqpk=; b=mli5dfaVKZhhCVghzFFScdHuucsvyZgEC3qxc2ALuWZuTT3iSMdc9SGmtkrse+CiJp GLDdJ3YS5hzRp0pf87HhzPqu7RNEC10fgMOEJtKho10izK/OnhIz/32gZI9hMnH1rwMB vNeJHVqAVTMKU9KmwuOh3y/46k0QdCosM9Nk9V92RkoCv2aHYly1CW3irp/fr176R7iK TDUoKql1xlC4jNyseOsaRi4x2Hu+65OFfm15jLmK2xNuAcmGCa+vO3BPzjrCKerXRPQr 07xBpZMMG7ITZnkIdPqDuCGe8qHbUZ1tFGZBKuw2Is8GPA6QGX2beZxlGuCo8MqPeIji 6voA== 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=oJEYyfXgXckmAD0sXTzq8C+3ACBZKvhQhhVJ8PImqpk=; b=EaO2BPPJPm5YNkJKUfnrjy3H/tZwaylJHWumDhwwogS6RKbeko2uSbPZoP+gwu8DFV KXWepN3nWo51cy625VzChx+c2bPd6lViAUODJIafrH9I5VQoNSo9LpE5BvX7pilBB2uN /7OHQ+b49o4AQ5t3vw8poL9gTIB93AWQfPgp8C7pPUxCn1unTK5389jW8mi1CkZNdtzM inVQWJUbj0bCJvGDSFG/UyK8DQVPeKt1xS8YEy5QKMd8AeArKNELz0UHqqhngG7MRy1o VKfZNytPyiR/8bzhqukvPnZgcSrATJ8biU7e/N8AyvWfYLXnq2TzMv+nlBQVmvLs5Zao 7AAQ== X-Gm-Message-State: APt69E2Dwm1wwqACwEBdaFq6M5Gha9InKUvTbj2nMcTJqZP6+EYco/45 UAPTyH8VzENcMhK/0d60zvqxxXI9it3Y48izSu9x5w== X-Google-Smtp-Source: AAOMgpcimPoK0KTrfv9o4jsvHdguCbMzERfXnlv8MGlOKSM9jIJ+MpZLTQ4J+ISxDNws7rWEOSpj+BfsV3lgPIrydsk= X-Received: by 2002:a62:1894:: with SMTP id 142-v6mr24104286pfy.49.1530623416913; Tue, 03 Jul 2018 06:10:16 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a17:90a:8c86:0:0:0:0 with HTTP; Tue, 3 Jul 2018 06:10:16 -0700 (PDT) In-Reply-To: References: From: Akshay Joshi Date: Tue, 3 Jul 2018 18:40:16 +0530 Message-ID: Subject: Re: [pgAdmin4][Patch]: RM #3397 Add support for JIT stats in EXPLAIN output in PG11 To: Dave Page Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="0000000000000d130d0570180905" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --0000000000000d130d0570180905 Content-Type: multipart/alternative; boundary="0000000000000d13090570180903" --0000000000000d13090570180903 Content-Type: text/plain; charset="UTF-8" Hi Dave, Please ignore the previous patch, I have made some more changes related to background colour on enabled/disabled state. Attached is the modified patch. Please review it. On Tue, Jul 3, 2018 at 12:35 PM, Akshay Joshi wrote: > Hi Dave, > > On Mon, Jul 2, 2018 at 4:10 PM, Dave Page wrote: > >> Hi >> >> On Sat, Jun 30, 2018 at 9:15 AM, Akshay Joshi < >> akshay.joshi@enterprisedb.com> wrote: >> >>> Hi Dave >>> >>> On Fri, Jun 29, 2018 at 7:45 PM, Dave Page wrote: >>> >>>> >>>> >>>> On Fri, Jun 29, 2018 at 3:12 PM, Akshay Joshi < >>>> akshay.joshi@enterprisedb.com> wrote: >>>> >>>>> Hi Dave >>>>> >>>>> On Fri, Jun 29, 2018 at 6:56 PM, Dave Page wrote: >>>>> >>>>>> Hi >>>>>> >>>>>> On Fri, Jun 29, 2018 at 9:55 AM, Akshay Joshi < >>>>>> akshay.joshi@enterprisedb.com> wrote: >>>>>> >>>>>>> Hi Hackers, >>>>>>> >>>>>>> Attached is the patch to fix the RM #3397 Add support for JIT stats >>>>>>> in EXPLAIN output in PG11. Please review it. >>>>>>> >>>>>> >>>>>> A couple of immediate thoughts: >>>>>> >>>>>> - When the canvas is first rendered, there's a vertical scrollbar >>>>>> now. As soon as I mouseover the new icon, it vanishes and the icon jumps to >>>>>> the right. >>>>>> >>>>> >>>>> Will look into it. Vertical scrollbar comes even if you remove my >>>>> patch and try to hover any image. >>>>> >>>>>> >>>>>> - The icon seems lighter than the other controls on the left. >>>>>> >>>>> >>>>> Same css has been applied, only difference is button is disabled. >>>>> >>>>>> >>>>>> - The icon isn't disabled when there is no info to show. >>>>>> >>>>> >>>>> Button is always disabled, I have just change the opacity. >>>>> >>>>>> >>>>>> Thanks. >>>>>> >>>>> >>>> Maybe - but I can still click it and it reacts as if it's active. It >>>> may be lighter to indicate that it's disabled, but its not behaving as >>>> such. >>>> >>> >>> Attached is the modified patch. Please review it. >>> >> >> The button still changes foreground colour on mouseover when disabled. I >> think it needs to be completely non-reactive when disabled. It should also >> be a noticably lighter shade when disabled; right now it seems to be darker >> than the other buttons (see attached). >> > > Attached is the modified patch. Please review it. > >> >> -- >> Dave Page >> Blog: http://pgsnake.blogspot.com >> Twitter: @pgsnake >> >> EnterpriseDB UK: http://www.enterprisedb.com >> The Enterprise PostgreSQL Company >> > > > > -- > *Akshay Joshi* > > *Sr. Software Architect * > > > > *Phone: +91 20-3058-9517Mobile: +91 976-788-8246* > -- *Akshay Joshi* *Sr. Software Architect * *Phone: +91 20-3058-9517Mobile: +91 976-788-8246* --0000000000000d13090570180903 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Dave,

Please ignore the previous pat= ch, I have made some more changes related to background colour on enabled/d= isabled state.=C2=A0
Attached is the modified patch. Please revie= w it.=C2=A0 =C2=A0

On Tue, Jul 3, 2018 at 12:35 PM, Akshay Joshi <ak= shay.joshi@enterprisedb.com> wrote:
Hi Dave,

On Mon, Jul 2, 2018 at 4:10 PM, Dav= e Page <dpage@pgadmin.org> wrote:
Hi

On Sat, Jun 30, 2018 at 9:15 AM, Akshay Joshi <akshay.joshi@enterprisedb.com> wrote:
Hi Dave

On Fri, Jun 29, 2018 at 7:45 PM, Dave Page <= dpage@pgadmin.org> wrote:
<= div dir=3D"ltr">

On Fri, Jun 29, 2018 at 3:12 PM, Akshay Joshi &l= t;akshay= .joshi@enterprisedb.com> wrote:
Hi Dave

On Fri, Jun 29, 2018 at 6:56 PM, Dave Page <dpage@p= gadmin.org> wrote:
Hi

= On Fri, Jun 29, 2018 at 9:55 AM, Akshay Joshi <akshay.joshi@en= terprisedb.com> wrote:
Hi Hackers,

Attached is the patch to f= ix the RM #3397=C2=A0Add support for JIT stats i= n EXPLAIN output in PG11. Please review it.
A couple of immediate thoughts:

- When the canvas is first rendered, there's a vertical scrollbar now= . As soon as I mouseover the new icon, it vanishes and the icon jumps to th= e right.

=C2= =A0 =C2=A0 =C2=A0Will look into it. Vertical scrollbar comes even if you re= move my patch and try to hover any image.=C2=A0

- The icon seems lighter than the other cont= rols on the left.

=C2=A0 =C2=A0 =C2=A0Same css has been applied, only difference is but= ton is disabled.=C2=A0

- The icon isn't disabled when there is no info to show.
<= /div>

=C2=A0 =C2=A0 =C2= =A0Button is always disabled, I have just change the opacity.=C2=A0 =C2=A0= =C2=A0

Thanks.=C2= =A0

Maybe - but I can still click it and it react= s as if it's active. It may be lighter to indicate that it's disabl= ed, but its not behaving as such.=C2=A0

=C2=A0 =C2=A0 Attached is the modified patch. P= lease review it.=C2=A0=C2=A0

<= /div>
The button still changes foreground colour on mouseover wh= en disabled.=C2=A0 I think it needs to be completely non-reactive when disa= bled. It should also be a noticably lighter shade when disabled; right now = it seems to be darker than the other buttons (see attached).

=C2=A0 =C2=A0Attached is the modi= fied patch. Please review it.=C2=A0

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

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



--
Akshay Joshi=
Sr.= Software Architect


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


--
Akshay Joshi
Sr. Software Architect
=

<= /font>

Phone: +91 20-3058-9517
Mob= ile: +91 976-788-8246
--0000000000000d13090570180903-- --0000000000000d130d0570180905 Content-Type: application/octet-stream; name="RM_3397_v4.patch" Content-Disposition: attachment; filename="RM_3397_v4.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jj5pnlst1 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2ZlYXR1cmVfdGVzdHMvcXVlcnlfdG9vbF90ZXN0cy5w eSBiL3dlYi9wZ2FkbWluL2ZlYXR1cmVfdGVzdHMvcXVlcnlfdG9vbF90ZXN0cy5weQppbmRleCBh YzQ2M2QzLi4yMjZiMzIzIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9mZWF0dXJlX3Rlc3RzL3F1 ZXJ5X3Rvb2xfdGVzdHMucHkKKysrIGIvd2ViL3BnYWRtaW4vZmVhdHVyZV90ZXN0cy9xdWVyeV90 b29sX3Rlc3RzLnB5CkBAIC0xMDQsNiArMTA0LDE2IEBAIGNsYXNzIFF1ZXJ5VG9vbEZlYXR1cmVU ZXN0KEJhc2VGZWF0dXJlVGVzdCk6CiAgICAgICAgIHNlbGYuX3F1ZXJ5X3Rvb2xfbm90aWZ5X3N0 YXRlbWVudHMoKQogICAgICAgICBzZWxmLl9jbGVhcl9xdWVyeV90b29sKCkKIAorICAgICAgICAj IGV4cGxhaW4gcXVlcnkgd2l0aCBKSVQgc3RhdHMKKyAgICAgICAgcHJpbnQoIkV4cGxhaW4gcXVl cnkgd2l0aCBKSVQgc3RhdHMuLi4gIiwKKyAgICAgICAgICAgICAgZmlsZT1zeXMuc3RkZXJyLCBl bmQ9IiIpCisgICAgICAgIGlmIHNlbGYuX3N1cHBvcnRlZF9qaXRfb25fc2VydmVyKCk6CisgICAg ICAgICAgICBzZWxmLl9xdWVyeV90b29sX2V4cGxhaW5fY2hlY2tfaml0X3N0YXRzKCkKKyAgICAg ICAgICAgIHByaW50KCJPSy4iLCBmaWxlPXN5cy5zdGRlcnIpCisgICAgICAgICAgICBzZWxmLl9j bGVhcl9xdWVyeV90b29sKCkKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHByaW50KCJTa2lw cGVkLiIsIGZpbGU9c3lzLnN0ZGVycikKKwogICAgIGRlZiBhZnRlcihzZWxmKToKICAgICAgICAg c2VsZi5wYWdlLnJlbW92ZV9zZXJ2ZXIoc2VsZi5zZXJ2ZXIpCiAgICAgICAgIGNvbm5lY3Rpb24g PSB0ZXN0X3V0aWxzLmdldF9kYl9jb25uZWN0aW9uKApAQCAtNjYwLDkgKzY3MCw2MiBAQCBTRUxF Q1QgMSwgcGdfc2xlZXAoMzAwKSIiIgogICAgICAgICAgICAgd2FpdC51bnRpbChXYWl0Rm9yQW55 RWxlbWVudFdpdGhUZXh0KAogICAgICAgICAgICAgICAgIChCeS5DU1NfU0VMRUNUT1IsICd0ZC5w YXlsb2FkJyksICJIZWxsbyIpKQogICAgICAgICAgICAgcHJpbnQoIk9LLiIsIGZpbGU9c3lzLnN0 ZGVycikKKyAgICAgICAgICAgIHNlbGYuX2NsZWFyX3F1ZXJ5X3Rvb2woKQogICAgICAgICBlbHNl OgogICAgICAgICAgICAgcHJpbnQoIlNraXBwZWQuIiwgZmlsZT1zeXMuc3RkZXJyKQogCisgICAg ZGVmIF9zdXBwb3J0ZWRfaml0X29uX3NlcnZlcihzZWxmKToKKyAgICAgICAgY29ubmVjdGlvbiA9 IHRlc3RfdXRpbHMuZ2V0X2RiX2Nvbm5lY3Rpb24oCisgICAgICAgICAgICBzZWxmLnNlcnZlclsn ZGInXSwKKyAgICAgICAgICAgIHNlbGYuc2VydmVyWyd1c2VybmFtZSddLAorICAgICAgICAgICAg c2VsZi5zZXJ2ZXJbJ2RiX3Bhc3N3b3JkJ10sCisgICAgICAgICAgICBzZWxmLnNlcnZlclsnaG9z dCddLAorICAgICAgICAgICAgc2VsZi5zZXJ2ZXJbJ3BvcnQnXSwKKyAgICAgICAgICAgIHNlbGYu c2VydmVyWydzc2xtb2RlJ10KKyAgICAgICAgKQorCisgICAgICAgIHBnX2N1cnNvciA9IGNvbm5l Y3Rpb24uY3Vyc29yKCkKKyAgICAgICAgcGdfY3Vyc29yLmV4ZWN1dGUoJ3NlbGVjdCB2ZXJzaW9u KCknKQorICAgICAgICB2ZXJzaW9uX3N0cmluZyA9IHBnX2N1cnNvci5mZXRjaG9uZSgpCisKKyAg ICAgICAgaXNfZWRiID0gRmFsc2UKKyAgICAgICAgaWYgbGVuKHZlcnNpb25fc3RyaW5nKSA+IDA6 CisgICAgICAgICAgICBpc19lZGIgPSAnRW50ZXJwcmlzZURCJyBpbiB2ZXJzaW9uX3N0cmluZ1sw XQorCisgICAgICAgIGNvbm5lY3Rpb24uY2xvc2UoKQorCisgICAgICAgIHJldHVybiBjb25uZWN0 aW9uLnNlcnZlcl92ZXJzaW9uID49IDExMDAwMCBhbmQgbm90IGlzX2VkYgorCisgICAgZGVmIF9x dWVyeV90b29sX2V4cGxhaW5fY2hlY2tfaml0X3N0YXRzKHNlbGYpOgorICAgICAgICB3YWl0ID0g V2ViRHJpdmVyV2FpdChzZWxmLnBhZ2UuZHJpdmVyLCAxMCkKKworICAgICAgICBzZWxmLnBhZ2Uu ZmlsbF9jb2RlbWlycm9yX2FyZWFfd2l0aCgiU0VUIGppdF9hYm92ZV9jb3N0PTEwOyIpCisgICAg ICAgIHNlbGYucGFnZS5maW5kX2J5X2lkKCJidG4tZmxhc2giKS5jbGljaygpCisgICAgICAgIHNl bGYucGFnZS53YWl0X2Zvcl9xdWVyeV90b29sX2xvYWRpbmdfaW5kaWNhdG9yX3RvX2Rpc2FwcGVh cigpCisgICAgICAgIHNlbGYuX2NsZWFyX3F1ZXJ5X3Rvb2woKQorCisgICAgICAgIHNlbGYucGFn ZS5maWxsX2NvZGVtaXJyb3JfYXJlYV93aXRoKCJTRUxFQ1QgY291bnQoKikgRlJPTSBwZ19jbGFz czsiKQorICAgICAgICBxdWVyeV9vcCA9IHNlbGYucGFnZS5maW5kX2J5X2lkKCJidG4tcXVlcnkt ZHJvcGRvd24iKQorICAgICAgICBxdWVyeV9vcC5jbGljaygpCisgICAgICAgIEFjdGlvbkNoYWlu cyhzZWxmLmRyaXZlcikubW92ZV90b19lbGVtZW50KAorICAgICAgICAgICAgcXVlcnlfb3AuZmlu ZF9lbGVtZW50X2J5X3hwYXRoKAorICAgICAgICAgICAgICAgICIvL2xpW2NvbnRhaW5zKC4sJ0V4 cGxhaW4gT3B0aW9ucycpXSIpKS5wZXJmb3JtKCkKKworICAgICAgICBzZWxmLnBhZ2UuZmluZF9i eV9pZCgiYnRuLWV4cGxhaW4tdmVyYm9zZSIpLmNsaWNrKCkKKyAgICAgICAgc2VsZi5wYWdlLmZp bmRfYnlfaWQoImJ0bi1leHBsYWluLWNvc3RzIikuY2xpY2soKQorICAgICAgICBzZWxmLnBhZ2Uu ZmluZF9ieV9pZCgiYnRuLWV4cGxhaW4tYW5hbHl6ZSIpLmNsaWNrKCkKKworICAgICAgICBzZWxm LnBhZ2Uud2FpdF9mb3JfcXVlcnlfdG9vbF9sb2FkaW5nX2luZGljYXRvcl90b19kaXNhcHBlYXIo KQorICAgICAgICBzZWxmLnBhZ2UuY2xpY2tfdGFiKCdEYXRhIE91dHB1dCcpCisKKyAgICAgICAg Y2FudmFzID0gd2FpdC51bnRpbChFQy5wcmVzZW5jZV9vZl9lbGVtZW50X2xvY2F0ZWQoCisgICAg ICAgICAgICAoQnkuQ1NTX1NFTEVDVE9SLCAiI2RhdGFncmlkIC5zbGljay12aWV3cG9ydCAuZ3Jp ZC1jYW52YXMiKSkKKyAgICAgICAgKQorICAgICAgICAjIFNlYXJjaCBmb3IgJ091dHB1dCcgd29y ZCBpbiByZXN1bHQgKHZlcmJvc2Ugb3B0aW9uKQorICAgICAgICBjYW52YXMuZmluZF9lbGVtZW50 X2J5X3hwYXRoKCIvLypbY29udGFpbnMoc3RyaW5nKCksICdKSVQnKV0iKQorCisgICAgICAgIHNl bGYuX2NsZWFyX3F1ZXJ5X3Rvb2woKQorCiAKIGNsYXNzIFdhaXRGb3JBbnlFbGVtZW50V2l0aFRl eHQob2JqZWN0KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgbG9jYXRvciwgdGV4dCk6CmRpZmYg LS1naXQgYS93ZWIvcGdhZG1pbi9taXNjL3N0YXRpYy9leHBsYWluL2Nzcy9leHBsYWluLmNzcyBi L3dlYi9wZ2FkbWluL21pc2Mvc3RhdGljL2V4cGxhaW4vY3NzL2V4cGxhaW4uY3NzCmluZGV4IGQ1 NDlmODUuLmUwNjBmMjMgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGljL2V4cGxh aW4vY3NzL2V4cGxhaW4uY3NzCisrKyBiL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGljL2V4cGxhaW4v Y3NzL2V4cGxhaW4uY3NzCkBAIC0xNyw2ICsxNywxOCBAQAogICAgb3BhY2l0eTogMTsKIH0KIAor LnBnLWV4cGxhaW4tc3RhdHMtYXJlYSB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRv cDogNXB4OworICAgIHJpZ2h0OiAyNXB4OworfQorCisucGctZXhwbGFpbi1zdGF0cy1idG4gewor ICAgIHRvcDogNXB4OworICAgIG1pbi13aWR0aDogMjVweDsKKyAgICBib3JkZXI6IDFweCBzb2xp ZCB0cmFuc3BhcmVudDsKK30KKwogLmV4cGxhaW4tdG9vbHRpcCB7CiAgIGRpc3BsYXk6IHRhYmxl LWNlbGw7CiAgIHRleHQtYWxpZ246IGxlZnQ7CkBAIC0zNyw4ICs0OSw2IEBAIHRkLmV4cGxhaW4t dG9vbHRpcC12YWwgewogCiAucGdhZG1pbi1leHBsYWluLXRvb2x0aXAgewogICBwb3NpdGlvbjog YWJzb2x1dGU7Ci0gIHBhZGRpbmc6NXB4OwotICBib3JkZXI6IDFweCBzb2xpZCB3aGl0ZTsKICAg b3BhY2l0eTowOwogICBjb2xvcjogY29ybnNpbGs7CiAgIGJhY2tncm91bmQtY29sb3I6ICMwMTAx MjU7CkBAIC01NSw0ICs2NSwxNCBAQCB0ZC5leHBsYWluLXRvb2x0aXAtdmFsIHsKICAgaGVpZ2h0 OiAxMDAlOwogICB3aWR0aDogMTAwJTsKICAgb3ZlcmZsb3c6IGF1dG87Ci19ClwgTm8gbmV3bGlu ZSBhdCBlbmQgb2YgZmlsZQorfQorCisucGctZXhwbGFpbi1zdGF0cy1idG4tZGlzYWJsZWQgewor ICBiYWNrZ3JvdW5kLWNvbG9yOiAjNzc3Nzc3NWM7Cit9CisKKy5wZy1leHBsYWluLXN0YXRzLWJ0 bi1kaXNhYmxlZDpob3ZlciwKKy5wZy1leHBsYWluLXN0YXRzLWJ0bi1kaXNhYmxlZDpmb2N1cywK Ky5wZy1leHBsYWluLXN0YXRzLWJ0bi1kaXNhYmxlZDpmb2N1cyB7CisgIGNvbG9yOiNmZmYgIWlt cG9ydGFudDsKK30KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGljL2V4cGxhaW4v anMvZXhwbGFpbi5qcyBiL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGljL2V4cGxhaW4vanMvZXhwbGFp bi5qcwppbmRleCBlMDI4Nzc0Li4yOWFiMjZjIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9taXNj L3N0YXRpYy9leHBsYWluL2pzL2V4cGxhaW4uanMKKysrIGIvd2ViL3BnYWRtaW4vbWlzYy9zdGF0 aWMvZXhwbGFpbi9qcy9leHBsYWluLmpzCkBAIC02MTUsNiArNjE1LDkgQEAgZGVmaW5lKCdwZ2Fk bWluLm1pc2MuZXhwbGFpbicsIFsKICAgICAgICAgfSk7CiAgICAgICAgIHRvb2xUaXBDb250YWlu ZXIuY3NzKCdsZWZ0JywgdG9vbFRpcFgpOwogICAgICAgICB0b29sVGlwQ29udGFpbmVyLmNzcygn dG9wJywgdG9vbFRpcFkpOworCisgICAgICAgICQoJy5wZ2FkbWluLWV4cGxhaW4tdG9vbHRpcCcp LmNzcygncGFkZGluZycsICc1cHgnKTsKKyAgICAgICAgJCgnLnBnYWRtaW4tZXhwbGFpbi10b29s dGlwJykuY3NzKCdib3JkZXInLCAnMXB4IHNvbGlkIHdoaXRlJyk7CiAgICAgICB9KTsKIAogICAg ICAgLy8gUmVtb3ZlIHRvb2x0aXAgd2hlbiBtb3VzZSBpcyBvdXQgZnJvbSBub2RlJ3MgYXJlYQpA QCAtNjg3LDYgKzY5MCw5MSBAQCBkZWZpbmUoJ3BnYWRtaW4ubWlzYy5leHBsYWluJywgWwogICAg IH0sCiAgIH0pOwogCisgIC8vIEJhY2tib25lIG1vZGVsIGZvciBvdGhlciBzdGF0aXN0aWNzCisg IHZhciBTdGF0c01vZGVsID0gQmFja2JvbmUuTW9kZWwuZXh0ZW5kKHsKKyAgICBkZWZhdWx0czog eworICAgICAgSklUOiBbXSwKKyAgICAgIFRyaWdnZXJzOiBbXSwKKyAgICB9LAorICAgIHNldF9z dGF0aXN0aWNzOiBmdW5jdGlvbih4cG9zLCB5cG9zLCBncmFwaENvbnRhaW5lciwgdG9vbFRpcENv bnRhaW5lcikgeworICAgICAgdmFyIGppdF9zdGF0cyA9IHRoaXMuZ2V0KCdKSVQnKSwKKyAgICAg ICAgdHJpZ2dlcnNfc3RhdHMgPSB0aGlzLmdldCgnVHJpZ2dlcnMnKTsKKworICAgICAgaWYgKE9i amVjdC5rZXlzKGppdF9zdGF0cykubGVuZ3RoID4gMCB8fAorICAgICAgICAgIE9iamVjdC5rZXlz KHRyaWdnZXJzX3N0YXRzKS5sZW5ndGggPiAwKSB7CisgICAgICAgICQoJyNidG4tZXhwbGFpbi1z dGF0cycpLnJlbW92ZUNsYXNzKCdwZy1leHBsYWluLXN0YXRzLWJ0bi1kaXNhYmxlZCcpOworICAg ICAgfQorCisgICAgICAkKCcucGctZXhwbGFpbi1zdGF0cy1hcmVhJykub24oJ21vdXNlb3Zlcics ICgpID0+IHsKKworICAgICAgICAvLyBFbXB0eSB0aGUgdG9vbHRpcCBjb250ZW50IGlmIGl0IGhh cyBhbnkgYW5kIGFkZCBuZXcgZGF0YQorICAgICAgICB0b29sVGlwQ29udGFpbmVyLmVtcHR5KCk7 CisgICAgICAgIGlmIChPYmplY3Qua2V5cyhqaXRfc3RhdHMpLmxlbmd0aCA9PSAwICYmCisgICAg ICAgICAgT2JqZWN0LmtleXModHJpZ2dlcnNfc3RhdHMpLmxlbmd0aCA9PSAwKSB7CisgICAgICAg ICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgdmFyIHRvb2x0aXAgPSAkKCc8dGFibGU+ PC90YWJsZT4nLCB7CisgICAgICAgICAgY2xhc3M6ICdwZ2FkbWluLXRvb2x0aXAtdGFibGUnLAor ICAgICAgICB9KS5hcHBlbmRUbyh0b29sVGlwQ29udGFpbmVyKTsKKworICAgICAgICBpZiAoT2Jq ZWN0LmtleXMoaml0X3N0YXRzKS5sZW5ndGggPiAwKXsKKyAgICAgICAgICB0b29sdGlwLmFwcGVu ZCgnPHRyPjx0ZCBjbGFzcz0ibGFiZWwgZXhwbGFpbi10b29sdGlwIj5KSVQ6PC90ZD48L3RyPicp OworICAgICAgICAgIF8uZWFjaChqaXRfc3RhdHMsIGZ1bmN0aW9uKHZhbHVlLCBrZXkpIHsKKyAg ICAgICAgICAgIHRvb2x0aXAuYXBwZW5kKCc8dHI+PHRkIGNsYXNzPSJsYWJlbCBleHBsYWluLXRv b2x0aXAiPiZuYnNwJm5ic3AnCisgICAgICAgICAgICArIGtleSArICc8L3RkPjx0ZCBjbGFzcz0i bGFiZWwgZXhwbGFpbi10b29sdGlwLXZhbCI+JworICAgICAgICAgICAgKyB2YWx1ZSArICc8L3Rk PjwvdHI+Jyk7CisgICAgICAgICAgfSk7CisgICAgICAgIH0KKworICAgICAgICBpZiAoT2JqZWN0 LmtleXModHJpZ2dlcnNfc3RhdHMpLmxlbmd0aCA+IDApeworICAgICAgICAgIHRvb2x0aXAuYXBw ZW5kKCc8dHI+PHRkIGNsYXNzPSJsYWJlbCBleHBsYWluLXRvb2x0aXAiPlRyaWdnZXJzOjwvdGQ+ PC90cj4nKTsKKyAgICAgICAgICBfLmVhY2godHJpZ2dlcnNfc3RhdHMsIGZ1bmN0aW9uKHRyaWdn ZXJzLCBrZXlfaWQpIHsKKyAgICAgICAgICAgIGlmICh0cmlnZ2VycyBpbnN0YW5jZW9mIE9iamVj dCkgeworICAgICAgICAgICAgICBfLmVhY2godHJpZ2dlcnMsIGZ1bmN0aW9uKHZhbHVlLCBrZXkp IHsKKyAgICAgICAgICAgICAgICBpZiAoa2V5ID09PSAnVHJpZ2dlciBOYW1lJykgeworICAgICAg ICAgICAgICAgICAgdG9vbHRpcC5hcHBlbmQoJzx0cj48dGQgY2xhc3M9ImxhYmVsIGV4cGxhaW4t dG9vbHRpcCI+Jm5ic3A7Jm5ic3A7JworICAgICAgICAgICAgICAgICAgKyBrZXkgKyAnPC90ZD48 dGQgY2xhc3M9ImxhYmVsIGV4cGxhaW4tdG9vbHRpcC12YWwiPicKKyAgICAgICAgICAgICAgICAg ICsgdmFsdWUgKyAnPC90ZD48L3RyPicpOworICAgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAg ICAgICAgICAgICAgICB0b29sdGlwLmFwcGVuZCgnPHRyPjx0ZCBjbGFzcz0ibGFiZWwgZXhwbGFp bi10b29sdGlwIj4mbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsnCisgICAgICAgICAgICAgICAgICAr IGtleSArICc8L3RkPjx0ZCBjbGFzcz0ibGFiZWwgZXhwbGFpbi10b29sdGlwLXZhbCI+JworICAg ICAgICAgICAgICAgICAgKyB2YWx1ZSArICc8L3RkPjwvdHI+Jyk7CisgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGVsc2Ugewor ICAgICAgICAgICAgICB0b29sdGlwLmFwcGVuZCgnPHRyPjx0ZCBjbGFzcz0ibGFiZWwgZXhwbGFp bi10b29sdGlwIj4mbmJzcDsmbmJzcDsnCisgICAgICAgICAgICAgICsga2V5X2lkICsgJzwvdGQ+ PHRkIGNsYXNzPSJsYWJlbCBleHBsYWluLXRvb2x0aXAtdmFsIj4nCisgICAgICAgICAgICAgICsg dHJpZ2dlcnMgKyAnPC90ZD48L3RyPicpOworICAgICAgICAgICAgfQorICAgICAgICAgIH0pOwor ICAgICAgICB9CisKKyAgICAgICAgLy8gU2hvdyB0b29sVGlwIGF0IHJlc3BlY3RpdmUgeCx5IGNv b3JkaW5hdGVzCisgICAgICAgIHRvb2xUaXBDb250YWluZXIuY3NzKHsKKyAgICAgICAgICAnb3Bh Y2l0eSc6ICcwLjgnLAorICAgICAgICAgICdsZWZ0JzogJycsCisgICAgICAgICAgJ3JpZ2h0Jzog JzY1cHgnLAorICAgICAgICAgICd0b3AnOiAnMTVweCcsCisgICAgICAgIH0pOworCisgICAgICAg ICQoJy5wZ2FkbWluLWV4cGxhaW4tdG9vbHRpcCcpLmNzcygncGFkZGluZycsICc1cHgnKTsKKyAg ICAgICAgJCgnLnBnYWRtaW4tZXhwbGFpbi10b29sdGlwJykuY3NzKCdib3JkZXInLCAnMXB4IHNv bGlkIHdoaXRlJyk7CisgICAgICB9KTsKKworICAgICAgLy8gUmVtb3ZlIHRvb2x0aXAgd2hlbiBt b3VzZSBpcyBvdXQgZnJvbSBub2RlJ3MgYXJlYQorICAgICAgJCgnLnBnLWV4cGxhaW4tc3RhdHMt YXJlYScpLm9uKCdtb3VzZW91dCcsICgpID0+IHsKKyAgICAgICAgdG9vbFRpcENvbnRhaW5lci5l bXB0eSgpOworICAgICAgICB0b29sVGlwQ29udGFpbmVyLmNzcyh7CisgICAgICAgICAgJ29wYWNp dHknOiAnMCcsCisgICAgICAgICAgJ2xlZnQnOiAwLAorICAgICAgICAgICd0b3AnOiAwLAorICAg ICAgICB9KTsKKyAgICAgIH0pOworICAgIH0sCisgIH0pOworCiAgIC8vIE1haW4gYmFja2JvbmUg bW9kZWwgdG8gc3RvcmUgSlNPTiBvYmplY3QKICAgdmFyIE1haW5QbGFuTW9kZWwgPSBCYWNrYm9u ZS5Nb2RlbC5leHRlbmQoewogICAgIGRlZmF1bHRzOiB7CkBAIC02OTYsNiArNzg0LDcgQEAgZGVm aW5lKCdwZ2FkbWluLm1pc2MuZXhwbGFpbicsIFsKICAgICB9LAogICAgIGluaXRpYWxpemU6IGZ1 bmN0aW9uKCkgewogICAgICAgdGhpcy5zZXQoJ1BsYW4nLCBuZXcgUGxhbk1vZGVsKCkpOworICAg ICAgdGhpcy5zZXQoJ1N0YXRpc3RpY3MnLCBuZXcgU3RhdHNNb2RlbCgpKTsKICAgICB9LAogCiAg ICAgLy8gUGFyc2UgdGhlIEpTT04gZGF0YSBhbmQgZmV0Y2ggaXRzIGNoaWxkcmVuIHBsYW5zCkBA IC03MTgsNiArODA3LDE3IEBAIGRlZmluZSgncGdhZG1pbi5taXNjLmV4cGxhaW4nLCBbCiAgICAg ICAgIGRlbGV0ZSBkYXRhWydQbGFuJ107CiAgICAgICB9CiAKKyAgICAgIHZhciBzdGF0cyA9IHRo aXMuZ2V0KCdTdGF0aXN0aWNzJyk7CisgICAgICBpZiAoZGF0YSAmJiAnSklUJyBpbiBkYXRhKSB7 CisgICAgICAgIHN0YXRzLnNldCgnSklUJywgZGF0YVsnSklUJ10pOworICAgICAgICBkZWxldGUg ZGF0YSBbJ0pJVCddOworICAgICAgfQorCisgICAgICBpZiAoZGF0YSAmJiAnVHJpZ2dlcnMnIGlu IGRhdGEpIHsKKyAgICAgICAgc3RhdHMuc2V0KCdUcmlnZ2VycycsIGRhdGFbJ1RyaWdnZXJzJ10p OworICAgICAgICBkZWxldGUgZGF0YSBbJ1RyaWdnZXJzJ107CisgICAgICB9CisKICAgICAgIHJl dHVybiBkYXRhOwogICAgIH0sCiAgICAgdG9KU09OOiBmdW5jdGlvbigpIHsKQEAgLTc0NSw2ICs4 NDUsMTAgQEAgZGVmaW5lKCdwZ2FkbWluLm1pc2MuZXhwbGFpbicsIFsKICAgICAgIHBsYW4uZHJh dygKICAgICAgICAgZywgeHBvcywgeXBvcywgdW5kZWZpbmVkLCB1bmRlZmluZWQsIGdyYXBoQ29u dGFpbmVyLCB0b29sVGlwQ29udGFpbmVyCiAgICAgICApOworCisgICAgICAvL1NldCB0aGUgU3Rh dGlzdGljcyBhcyB0b29sdGlwCisgICAgICB2YXIgc3RhdHMgPSB0aGlzLmdldCgnU3RhdGlzdGlj cycpOworICAgICAgc3RhdHMuc2V0X3N0YXRpc3RpY3MoeHBvcywgeXBvcywgZ3JhcGhDb250YWlu ZXIsIHRvb2xUaXBDb250YWluZXIpOwogICAgIH0sCiAgIH0pOwogCkBAIC03ODQsNiArODg4LDIy IEBAIGRlZmluZSgncGdhZG1pbi5taXNjLmV4cGxhaW4nLCBbCiAgICAgICAgICAgICBjbGFzczog J2ZhIGZhLXNlYXJjaC1taW51cycsCiAgICAgICAgICAgfSkpOwogCisgICAgICB2YXIgc3RhdHNB cmVhID0gJCgnPGRpdj48L2Rpdj4nLCB7CisgICAgICAgIGNsYXNzOiAncGctZXhwbGFpbi1zdGF0 cy1hcmVhIGJ0bi1ncm91cCcsCisgICAgICAgIHJvbGU6ICdncm91cCcsCisgICAgICB9KS5hcHBl bmRUbyhjb250YWluZXIpOworCisgICAgICAkKCc8YnV0dG9uPjwvYnV0dG9uPicsIHsKKyAgICAg ICAgaWQ6ICdidG4tZXhwbGFpbi1zdGF0cycsCisgICAgICAgIGNsYXNzOiAnYnRuIHBnLWV4cGxh aW4tc3RhdHMtYnRuIGJhZGdlIHBnLWV4cGxhaW4tc3RhdHMtYnRuLWRpc2FibGVkJywKKyAgICAg ICAgdGl0bGU6ICdTdGF0aXN0aWNzJywKKyAgICAgICAgdGFiaW5kZXg6IDAsCisgICAgICAgIGRp c2FibGVkOiAnZGlzYWJsZWQnLAorICAgICAgfSkuYXBwZW5kVG8oc3RhdHNBcmVhKS5hcHBlbmQo CisgICAgICAgICQoJzxpPjwvaT4nLCB7CisgICAgICAgICAgY2xhc3M6ICdmYSBmYS1saW5lLWNo YXJ0JywKKyAgICAgICAgfSkpOworCiAgICAgICAvLyBNYWluIGRpdiB0byBiZSBkcmF3biBhbGwg aW1hZ2VzIG9uCiAgICAgICB2YXIgcGxhbkRpdiA9ICQoJzxkaXY+PC9kaXY+JywgewogICAgICAg ICAgIGNsYXNzOiAncGdhZG1pbi1leHBsYWluLWNvbnRhaW5lcicsCg== --0000000000000d130d0570180905--