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 1faFNV-0000a1-QZ for pgadmin-hackers@arkaria.postgresql.org; Tue, 03 Jul 2018 07:05:34 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1faFNU-0000GE-5t for pgadmin-hackers@arkaria.postgresql.org; Tue, 03 Jul 2018 07:05:32 +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 1faFNT-0000G3-KB for pgadmin-hackers@lists.postgresql.org; Tue, 03 Jul 2018 07:05:32 +0000 Received: from mail-pf0-x22c.google.com ([2607:f8b0:400e:c00::22c]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1faFNP-0000W5-U5 for pgadmin-hackers@postgresql.org; Tue, 03 Jul 2018 07:05:29 +0000 Received: by mail-pf0-x22c.google.com with SMTP id j3-v6so538631pfh.11 for ; Tue, 03 Jul 2018 00:05:27 -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=DUenIfXvKwOZedoOd/Mpa2ofqPWZOku9uiuLh0pDPFg=; b=mhz7AoVLbfwZGGJYf/ZJ9VLyKLgCcj0E7fqM4hYfIBynsrebYCj/uTGDc/BPiPwjPa HDXB7Yz3aiFi3PREZY1fR1ar3vay7zizI5rtgt01+kt91Uk6taDWwVy1esYsvRKrf448 b4YcFET6Uy6nt48UH9AQ3MjG2HofmUThhtH0X4jF/iR3FHWbZzVJ7KeGSOhfftD3E4f2 1RgCdLKS6sxuv825eAP+nPi+Zr6r0av5I/SekFkXGXxhgtVdCDsbndadeKW3U+oEfpn6 Oi8zTYH5vHXuszgO2rB2ekuBZY/v3N3QirTT4GhkkI4Bf+WRhwskJak7VJ3KzY60uGT9 /fXw== 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=DUenIfXvKwOZedoOd/Mpa2ofqPWZOku9uiuLh0pDPFg=; b=ZipCdcXbo+5rT9Qq22OfXNGq7ZTxz1SOzsJWivNIg5GrREdegFEMp2QmKdf0G8GmOj JG/CXz78htjl05TdzxCjZeEY+SIIKY/xvQ0akNWqakirhcDrUFVaWs7LjRnBxGgMCXIo /9A+RSLpnTDtI6Z6ggz+rPsbGD3w4Y5r5f7gh2fUx+P9/luch2/Tel0+utUc3oTVHGlF WzI0vHDtFtT5VULNrYkEqwyOaNKIHNPrKtearNbrpp9x0SOnoyqqPP0EvMtqA/GLYV5i hSjLPsPRVNf9oUC+3LgZAdba3+AjKVjhpPahzVq2XnewSa7EeziS3IuRi8JiBOKlMvNX LRMA== X-Gm-Message-State: APt69E1O1+fW1h4iLsvNVzYgZ4WJvVbVQmULiZnrq3iYx4vu3+Dm4sFw EW3OuqqUD5/KePYZclLKmIlBtsRlxA0s0j+6l1Tugw== X-Google-Smtp-Source: AAOMgpcXmmNoWs3+x79BgXba3FiLnLA0Q276gQ+MeZjqN//7jVNMujX+auPoII8h/7r7vMG4mmP6/K9tD2sDMLSeGds= X-Received: by 2002:a63:c60:: with SMTP id 32-v6mr9821419pgm.155.1530601526336; Tue, 03 Jul 2018 00:05:26 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a17:90a:8c86:0:0:0:0 with HTTP; Tue, 3 Jul 2018 00:05:25 -0700 (PDT) In-Reply-To: References: From: Akshay Joshi Date: Tue, 3 Jul 2018 12:35:25 +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="000000000000455409057012f0a7" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --000000000000455409057012f0a7 Content-Type: multipart/alternative; boundary="000000000000455406057012f0a5" --000000000000455406057012f0a5 Content-Type: text/plain; charset="UTF-8" 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* --000000000000455406057012f0a5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Dave,

On Mon, Jul 2, 2018 at 4:10 PM, Dave Page <dpage@pgadmin.org&g= t; wrote:
Hi

On Sa= t, Jun 30, 2018 at 9:15 AM, Akshay Joshi <akshay.joshi@enterpr= isedb.com> wrote:
Hi Dave

On Fri, Jun 29, 2018 at 7:45 PM, Dave Page <<= a href=3D"mailto:dpage@pgadmin.org" target=3D"_blank">dpage@pgadmin.org= > wrote:

<= div class=3D"gmail_extra">
On Fri, Jun = 29, 2018 at 3:12 PM, Akshay Joshi <akshay.joshi@enterprisedb.c= om> wrote:
Hi Dave

On Fri, Jun 29, 2018 at 6:56 PM, Dave Page <dpage@pgadmin.org> 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=C2= =A0Add support for JIT stats in EXPLAIN output in PG11. Please review= it.

A couple of immedia= te 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.

=C2=A0 =C2=A0 =C2=A0Will look into it. Ver= tical scrollbar comes even if you remove my patch and try to hover any imag= e.=C2=A0

- The ic= on seems lighter than the other controls on the left.

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

- The icon isn't disabled whe= n there is no info to show.

=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 reacts as if it's active. It may be lighter = to indicate that it's disabled, but its not behaving as such.=C2=A0

=C2=A0 =C2=A0 A= ttached is the modified patch. Please review it.=C2=A0=C2=A0

The button still changes f= oreground colour on mouseover when disabled.=C2=A0 I think it needs to be c= ompletely non-reactive when disabled. It should also be a noticably lighter= shade when disabled; right now it seems to be darker than the other button= s (see attached).

= =C2=A0 =C2=A0Attached is the modified patch. Please review it.=C2=A0
<= blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px= #ccc solid;padding-left:1ex">
<= span class=3D"">

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

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



--
Akshay Joshi
Sr. Software Architect
=

<= /font>

Phone: +91 20-3058-9517
Mob= ile: +91 976-788-8246
--000000000000455406057012f0a5-- --000000000000455409057012f0a7 Content-Type: application/octet-stream; name="RM_3397_v3.patch" Content-Disposition: attachment; filename="RM_3397_v3.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jj5cmdpg1 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 NDlmODUuLjI4NjA1ZGYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGljL2V4cGxh aW4vY3NzL2V4cGxhaW4uY3NzCisrKyBiL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGljL2V4cGxhaW4v Y3NzL2V4cGxhaW4uY3NzCkBAIC0xNyw2ICsxNywxOSBAQAogICAgb3BhY2l0eTogMTsKIH0KIAor LnBnLWV4cGxhaW4tc3RhdHMtYXJlYSB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRv cDogNXB4OworICAgIHJpZ2h0OiAyNXB4OworfQorCisucGctZXhwbGFpbi1zdGF0cy1idG4gewor ICAgIHRvcDogNXB4OworICAgIG1pbi13aWR0aDogMjVweDsKKyAgICBib3JkZXI6IDFweCBzb2xp ZCB0cmFuc3BhcmVudDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjNzc3Nzc3NWM7Cit9CisKIC5l eHBsYWluLXRvb2x0aXAgewogICBkaXNwbGF5OiB0YWJsZS1jZWxsOwogICB0ZXh0LWFsaWduOiBs ZWZ0OwpAQCAtMzcsOCArNTAsNiBAQCB0ZC5leHBsYWluLXRvb2x0aXAtdmFsIHsKIAogLnBnYWRt aW4tZXhwbGFpbi10b29sdGlwIHsKICAgcG9zaXRpb246IGFic29sdXRlOwotICBwYWRkaW5nOjVw eDsKLSAgYm9yZGVyOiAxcHggc29saWQgd2hpdGU7CiAgIG9wYWNpdHk6MDsKICAgY29sb3I6IGNv cm5zaWxrOwogICBiYWNrZ3JvdW5kLWNvbG9yOiAjMDEwMTI1OwpAQCAtNTUsNCArNjYsMTAgQEAg dGQuZXhwbGFpbi10b29sdGlwLXZhbCB7CiAgIGhlaWdodDogMTAwJTsKICAgd2lkdGg6IDEwMCU7 CiAgIG92ZXJmbG93OiBhdXRvOwotfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK30KKwor LnBnLWV4cGxhaW4tc3RhdHMtYnRuLWRpc2FibGVkOmhvdmVyLAorLnBnLWV4cGxhaW4tc3RhdHMt YnRuLWRpc2FibGVkOmZvY3VzLAorLnBnLWV4cGxhaW4tc3RhdHMtYnRuLWRpc2FibGVkOmZvY3Vz IHsKKyAgY29sb3I6I2ZmZiAhaW1wb3J0YW50OworfQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4v bWlzYy9zdGF0aWMvZXhwbGFpbi9qcy9leHBsYWluLmpzIGIvd2ViL3BnYWRtaW4vbWlzYy9zdGF0 aWMvZXhwbGFpbi9qcy9leHBsYWluLmpzCmluZGV4IGUwMjg3NzQuLjY3YmI1MzEgMTAwNjQ0Ci0t LSBhL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGljL2V4cGxhaW4vanMvZXhwbGFpbi5qcworKysgYi93 ZWIvcGdhZG1pbi9taXNjL3N0YXRpYy9leHBsYWluL2pzL2V4cGxhaW4uanMKQEAgLTYxNSw2ICs2 MTUsOSBAQCBkZWZpbmUoJ3BnYWRtaW4ubWlzYy5leHBsYWluJywgWwogICAgICAgICB9KTsKICAg ICAgICAgdG9vbFRpcENvbnRhaW5lci5jc3MoJ2xlZnQnLCB0b29sVGlwWCk7CiAgICAgICAgIHRv b2xUaXBDb250YWluZXIuY3NzKCd0b3AnLCB0b29sVGlwWSk7CisKKyAgICAgICAgJCgnLnBnYWRt aW4tZXhwbGFpbi10b29sdGlwJykuY3NzKCdwYWRkaW5nJywgJzVweCcpOworICAgICAgICAkKCcu cGdhZG1pbi1leHBsYWluLXRvb2x0aXAnKS5jc3MoJ2JvcmRlcicsICcxcHggc29saWQgd2hpdGUn KTsKICAgICAgIH0pOwogCiAgICAgICAvLyBSZW1vdmUgdG9vbHRpcCB3aGVuIG1vdXNlIGlzIG91 dCBmcm9tIG5vZGUncyBhcmVhCkBAIC02ODcsNiArNjkwLDg3IEBAIGRlZmluZSgncGdhZG1pbi5t aXNjLmV4cGxhaW4nLCBbCiAgICAgfSwKICAgfSk7CiAKKyAgLy8gQmFja2JvbmUgbW9kZWwgZm9y IG90aGVyIHN0YXRpc3RpY3MKKyAgdmFyIFN0YXRzTW9kZWwgPSBCYWNrYm9uZS5Nb2RlbC5leHRl bmQoeworICAgIGRlZmF1bHRzOiB7CisgICAgICBKSVQ6IFtdLAorICAgICAgVHJpZ2dlcnM6IFtd LAorICAgIH0sCisgICAgc2V0X3N0YXRpc3RpY3M6IGZ1bmN0aW9uKHhwb3MsIHlwb3MsIGdyYXBo Q29udGFpbmVyLCB0b29sVGlwQ29udGFpbmVyKSB7CisgICAgICB2YXIgaml0X3N0YXRzID0gdGhp cy5nZXQoJ0pJVCcpLAorICAgICAgICB0cmlnZ2Vyc19zdGF0cyA9IHRoaXMuZ2V0KCdUcmlnZ2Vy cycpOworICAgICAgJCgnLnBnLWV4cGxhaW4tc3RhdHMtYXJlYScpLm9uKCdtb3VzZW92ZXInLCAo KSA9PiB7CisKKyAgICAgICAgLy8gRW1wdHkgdGhlIHRvb2x0aXAgY29udGVudCBpZiBpdCBoYXMg YW55IGFuZCBhZGQgbmV3IGRhdGEKKyAgICAgICAgdG9vbFRpcENvbnRhaW5lci5lbXB0eSgpOwor ICAgICAgICBpZiAoT2JqZWN0LmtleXMoaml0X3N0YXRzKS5sZW5ndGggPT0gMCAmJgorICAgICAg ICAgIE9iamVjdC5rZXlzKHRyaWdnZXJzX3N0YXRzKS5sZW5ndGggPT0gMCkgeworICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgICQoJyNidG4tZXhwbGFpbi1zdGF0cycpLnJl bW92ZUNsYXNzKCdwZy1leHBsYWluLXN0YXRzLWJ0bi1kaXNhYmxlZCcpOworICAgICAgICB2YXIg dG9vbHRpcCA9ICQoJzx0YWJsZT48L3RhYmxlPicsIHsKKyAgICAgICAgICBjbGFzczogJ3BnYWRt aW4tdG9vbHRpcC10YWJsZScsCisgICAgICAgIH0pLmFwcGVuZFRvKHRvb2xUaXBDb250YWluZXIp OworCisgICAgICAgIGlmIChPYmplY3Qua2V5cyhqaXRfc3RhdHMpLmxlbmd0aCA+IDApeworICAg ICAgICAgIHRvb2x0aXAuYXBwZW5kKCc8dHI+PHRkIGNsYXNzPSJsYWJlbCBleHBsYWluLXRvb2x0 aXAiPkpJVDo8L3RkPjwvdHI+Jyk7CisgICAgICAgICAgXy5lYWNoKGppdF9zdGF0cywgZnVuY3Rp b24odmFsdWUsIGtleSkgeworICAgICAgICAgICAgdG9vbHRpcC5hcHBlbmQoJzx0cj48dGQgY2xh c3M9ImxhYmVsIGV4cGxhaW4tdG9vbHRpcCI+Jm5ic3AmbmJzcCcKKyAgICAgICAgICAgICsga2V5 ICsgJzwvdGQ+PHRkIGNsYXNzPSJsYWJlbCBleHBsYWluLXRvb2x0aXAtdmFsIj4nCisgICAgICAg ICAgICArIHZhbHVlICsgJzwvdGQ+PC90cj4nKTsKKyAgICAgICAgICB9KTsKKyAgICAgICAgfQor CisgICAgICAgIGlmIChPYmplY3Qua2V5cyh0cmlnZ2Vyc19zdGF0cykubGVuZ3RoID4gMCl7Cisg ICAgICAgICAgdG9vbHRpcC5hcHBlbmQoJzx0cj48dGQgY2xhc3M9ImxhYmVsIGV4cGxhaW4tdG9v bHRpcCI+VHJpZ2dlcnM6PC90ZD48L3RyPicpOworICAgICAgICAgIF8uZWFjaCh0cmlnZ2Vyc19z dGF0cywgZnVuY3Rpb24odHJpZ2dlcnMsIGtleV9pZCkgeworICAgICAgICAgICAgaWYgKHRyaWdn ZXJzIGluc3RhbmNlb2YgT2JqZWN0KSB7CisgICAgICAgICAgICAgIF8uZWFjaCh0cmlnZ2Vycywg ZnVuY3Rpb24odmFsdWUsIGtleSkgeworICAgICAgICAgICAgICAgIGlmIChrZXkgPT09ICdUcmln Z2VyIE5hbWUnKSB7CisgICAgICAgICAgICAgICAgICB0b29sdGlwLmFwcGVuZCgnPHRyPjx0ZCBj bGFzcz0ibGFiZWwgZXhwbGFpbi10b29sdGlwIj4mbmJzcDsmbmJzcDsnCisgICAgICAgICAgICAg ICAgICArIGtleSArICc8L3RkPjx0ZCBjbGFzcz0ibGFiZWwgZXhwbGFpbi10b29sdGlwLXZhbCI+ JworICAgICAgICAgICAgICAgICAgKyB2YWx1ZSArICc8L3RkPjwvdHI+Jyk7CisgICAgICAgICAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgIHRvb2x0aXAuYXBwZW5kKCc8dHI+PHRk IGNsYXNzPSJsYWJlbCBleHBsYWluLXRvb2x0aXAiPiZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOycK KyAgICAgICAgICAgICAgICAgICsga2V5ICsgJzwvdGQ+PHRkIGNsYXNzPSJsYWJlbCBleHBsYWlu LXRvb2x0aXAtdmFsIj4nCisgICAgICAgICAgICAgICAgICArIHZhbHVlICsgJzwvdGQ+PC90cj4n KTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgIHRvb2x0aXAuYXBwZW5kKCc8dHI+PHRk IGNsYXNzPSJsYWJlbCBleHBsYWluLXRvb2x0aXAiPiZuYnNwOyZuYnNwOycKKyAgICAgICAgICAg ICAgKyBrZXlfaWQgKyAnPC90ZD48dGQgY2xhc3M9ImxhYmVsIGV4cGxhaW4tdG9vbHRpcC12YWwi PicKKyAgICAgICAgICAgICAgKyB0cmlnZ2VycyArICc8L3RkPjwvdHI+Jyk7CisgICAgICAgICAg ICB9CisgICAgICAgICAgfSk7CisgICAgICAgIH0KKworICAgICAgICAvLyBTaG93IHRvb2xUaXAg YXQgcmVzcGVjdGl2ZSB4LHkgY29vcmRpbmF0ZXMKKyAgICAgICAgdG9vbFRpcENvbnRhaW5lci5j c3MoeworICAgICAgICAgICdvcGFjaXR5JzogJzAuOCcsCisgICAgICAgICAgJ2xlZnQnOiAnJywK KyAgICAgICAgICAncmlnaHQnOiAnNjVweCcsCisgICAgICAgICAgJ3RvcCc6ICcxNXB4JywKKyAg ICAgICAgfSk7CisKKyAgICAgICAgJCgnLnBnYWRtaW4tZXhwbGFpbi10b29sdGlwJykuY3NzKCdw YWRkaW5nJywgJzVweCcpOworICAgICAgICAkKCcucGdhZG1pbi1leHBsYWluLXRvb2x0aXAnKS5j c3MoJ2JvcmRlcicsICcxcHggc29saWQgd2hpdGUnKTsKKyAgICAgIH0pOworCisgICAgICAvLyBS ZW1vdmUgdG9vbHRpcCB3aGVuIG1vdXNlIGlzIG91dCBmcm9tIG5vZGUncyBhcmVhCisgICAgICAk KCcucGctZXhwbGFpbi1zdGF0cy1hcmVhJykub24oJ21vdXNlb3V0JywgKCkgPT4geworICAgICAg ICAkKCcjYnRuLWV4cGxhaW4tc3RhdHMnKS5hZGRDbGFzcygncGctZXhwbGFpbi1zdGF0cy1idG4t ZGlzYWJsZWQnKTsKKyAgICAgICAgdG9vbFRpcENvbnRhaW5lci5lbXB0eSgpOworICAgICAgICB0 b29sVGlwQ29udGFpbmVyLmNzcyh7CisgICAgICAgICAgJ29wYWNpdHknOiAnMCcsCisgICAgICAg ICAgJ2xlZnQnOiAwLAorICAgICAgICAgICd0b3AnOiAwLAorICAgICAgICB9KTsKKyAgICAgIH0p OworICAgIH0sCisgIH0pOworCiAgIC8vIE1haW4gYmFja2JvbmUgbW9kZWwgdG8gc3RvcmUgSlNP TiBvYmplY3QKICAgdmFyIE1haW5QbGFuTW9kZWwgPSBCYWNrYm9uZS5Nb2RlbC5leHRlbmQoewog ICAgIGRlZmF1bHRzOiB7CkBAIC02OTYsNiArNzgwLDcgQEAgZGVmaW5lKCdwZ2FkbWluLm1pc2Mu ZXhwbGFpbicsIFsKICAgICB9LAogICAgIGluaXRpYWxpemU6IGZ1bmN0aW9uKCkgewogICAgICAg dGhpcy5zZXQoJ1BsYW4nLCBuZXcgUGxhbk1vZGVsKCkpOworICAgICAgdGhpcy5zZXQoJ1N0YXRp c3RpY3MnLCBuZXcgU3RhdHNNb2RlbCgpKTsKICAgICB9LAogCiAgICAgLy8gUGFyc2UgdGhlIEpT T04gZGF0YSBhbmQgZmV0Y2ggaXRzIGNoaWxkcmVuIHBsYW5zCkBAIC03MTgsNiArODAzLDE3IEBA IGRlZmluZSgncGdhZG1pbi5taXNjLmV4cGxhaW4nLCBbCiAgICAgICAgIGRlbGV0ZSBkYXRhWydQ bGFuJ107CiAgICAgICB9CiAKKyAgICAgIHZhciBzdGF0cyA9IHRoaXMuZ2V0KCdTdGF0aXN0aWNz Jyk7CisgICAgICBpZiAoZGF0YSAmJiAnSklUJyBpbiBkYXRhKSB7CisgICAgICAgIHN0YXRzLnNl dCgnSklUJywgZGF0YVsnSklUJ10pOworICAgICAgICBkZWxldGUgZGF0YSBbJ0pJVCddOworICAg ICAgfQorCisgICAgICBpZiAoZGF0YSAmJiAnVHJpZ2dlcnMnIGluIGRhdGEpIHsKKyAgICAgICAg c3RhdHMuc2V0KCdUcmlnZ2VycycsIGRhdGFbJ1RyaWdnZXJzJ10pOworICAgICAgICBkZWxldGUg ZGF0YSBbJ1RyaWdnZXJzJ107CisgICAgICB9CisKICAgICAgIHJldHVybiBkYXRhOwogICAgIH0s CiAgICAgdG9KU09OOiBmdW5jdGlvbigpIHsKQEAgLTc0NSw2ICs4NDEsMTAgQEAgZGVmaW5lKCdw Z2FkbWluLm1pc2MuZXhwbGFpbicsIFsKICAgICAgIHBsYW4uZHJhdygKICAgICAgICAgZywgeHBv cywgeXBvcywgdW5kZWZpbmVkLCB1bmRlZmluZWQsIGdyYXBoQ29udGFpbmVyLCB0b29sVGlwQ29u dGFpbmVyCiAgICAgICApOworCisgICAgICAvL1NldCB0aGUgU3RhdGlzdGljcyBhcyB0b29sdGlw CisgICAgICB2YXIgc3RhdHMgPSB0aGlzLmdldCgnU3RhdGlzdGljcycpOworICAgICAgc3RhdHMu c2V0X3N0YXRpc3RpY3MoeHBvcywgeXBvcywgZ3JhcGhDb250YWluZXIsIHRvb2xUaXBDb250YWlu ZXIpOwogICAgIH0sCiAgIH0pOwogCkBAIC03ODQsNiArODg0LDIyIEBAIGRlZmluZSgncGdhZG1p bi5taXNjLmV4cGxhaW4nLCBbCiAgICAgICAgICAgICBjbGFzczogJ2ZhIGZhLXNlYXJjaC1taW51 cycsCiAgICAgICAgICAgfSkpOwogCisgICAgICB2YXIgc3RhdHNBcmVhID0gJCgnPGRpdj48L2Rp dj4nLCB7CisgICAgICAgIGNsYXNzOiAncGctZXhwbGFpbi1zdGF0cy1hcmVhIGJ0bi1ncm91cCcs CisgICAgICAgIHJvbGU6ICdncm91cCcsCisgICAgICB9KS5hcHBlbmRUbyhjb250YWluZXIpOwor CisgICAgICAkKCc8YnV0dG9uPjwvYnV0dG9uPicsIHsKKyAgICAgICAgaWQ6ICdidG4tZXhwbGFp bi1zdGF0cycsCisgICAgICAgIGNsYXNzOiAnYnRuIHBnLWV4cGxhaW4tc3RhdHMtYnRuIGJhZGdl IHBnLWV4cGxhaW4tc3RhdHMtYnRuLWRpc2FibGVkJywKKyAgICAgICAgdGl0bGU6ICdTdGF0aXN0 aWNzJywKKyAgICAgICAgdGFiaW5kZXg6IDAsCisgICAgICAgIGRpc2FibGVkOiAnZGlzYWJsZWQn LAorICAgICAgfSkuYXBwZW5kVG8oc3RhdHNBcmVhKS5hcHBlbmQoCisgICAgICAgICQoJzxpPjwv aT4nLCB7CisgICAgICAgICAgY2xhc3M6ICdmYSBmYS1saW5lLWNoYXJ0JywKKyAgICAgICAgfSkp OworCiAgICAgICAvLyBNYWluIGRpdiB0byBiZSBkcmF3biBhbGwgaW1hZ2VzIG9uCiAgICAgICB2 YXIgcGxhbkRpdiA9ICQoJzxkaXY+PC9kaXY+JywgewogICAgICAgICAgIGNsYXNzOiAncGdhZG1p bi1leHBsYWluLWNvbnRhaW5lcicsCg== --000000000000455409057012f0a7--