Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1boWAg-0007Rg-TI for pgadmin-hackers@arkaria.postgresql.org; Mon, 26 Sep 2016 13:42:15 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1boWAg-0002w0-Co for pgadmin-hackers@arkaria.postgresql.org; Mon, 26 Sep 2016 13:42:14 +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.84_2) (envelope-from ) id 1boWAS-0002hG-JI for pgadmin-hackers@postgresql.org; Mon, 26 Sep 2016 13:42:00 +0000 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1boWAP-0007VK-4g for pgadmin-hackers@postgresql.org; Mon, 26 Sep 2016 13:42:00 +0000 Received: by mail-wm0-x22f.google.com with SMTP id l132so150278922wmf.1 for ; Mon, 26 Sep 2016 06:41:56 -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=/2yTthh5purk2ib/mc5iVBMKzB+sDfNSZf/XXamVD90=; b=JHhGrOIaHzoiEG5JFNit7FxVbj9Po5vKlCeqUTJqP1ssn+8qtS16XdbZfXFU9NPsgy JfVyyuSpTyi3IBjpHWa/GcmXlCscF2yn5uhjaptsjqSvTWynoiPA65Ie6z4jZRvgw6D0 gU6faqESUZChHrgVcJYXJrH8RpWR6DBGp6qbdvSQPY/8a32NeXOkdrwFu0xG/FdBJrWv 5dexN0hRvlAomc5SYx5ptzHVa05T6s2tvE/QdbDyFoE9gxuST9+NQiEhcHsqq+g8StE8 bYFE8k9IYiWS+8+cn/bwwBa7p2qyfgWOmcdKnM8eot/UoTYlsYoyuUz0BOcqUtyt2XCt IiiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=/2yTthh5purk2ib/mc5iVBMKzB+sDfNSZf/XXamVD90=; b=i4TJOiDjXLhsntznBYsk9IfFIaW5mVvwlyMpT964o2O+cBzRfvNx7EFMsqeOwyD+ow y2+l6UKksEo3RP57WemF5c81l11boEP2OA/tQy3PsO/ikj+uPTKgoeYg9bgipk9lhNWY klqVyb7FXAMLrBPCuzzsYaGrcJKUhtREAAjDsAyb9/AUIlB9zPhTK4QfGqWF7n85hxzl ngxi1P9jXk7Oooti+tq2CFOjbEGGPcSP90OfXoSXFcy01Opysvu6VCO0bMFInOjpPW9a ZC13CKMV3dN4Y3zb7iAzrcSLd+pK7TZ3t/xNyTpqKyiMttOf/ysxjBNEhH/3/crNNrKK nP4w== X-Gm-Message-State: AA6/9Rkhbb8652D0KKiNmsuope1VsBP/+kcVPlbe3zoLvI70wkazeXAXN75QAK8ZTa1YhmET7cO3nqF+ujPgxJyp X-Received: by 10.28.142.197 with SMTP id q188mr15455127wmd.119.1474897315791; Mon, 26 Sep 2016 06:41:55 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.172.198 with HTTP; Mon, 26 Sep 2016 06:41:24 -0700 (PDT) In-Reply-To: References: From: Surinder Kumar Date: Mon, 26 Sep 2016 19:11:24 +0530 Message-ID: Subject: Re: Lack of activity indicator over slow connections (pgadmin4) To: Dave Page Cc: Magnus Hagander , pgadmin-hackers , Ashesh Vashi , Murtuza Zabuawala Content-Type: multipart/mixed; boundary=001a1143d59896b4ed053d694aa6 X-Pg-Spam-Score: -2.6 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --001a1143d59896b4ed053d694aa6 Content-Type: multipart/alternative; boundary=001a1143d59896b4e7053d694aa4 --001a1143d59896b4e7053d694aa4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Please find attached patch. Added activity indicator for: 1) Panels. 2) Dialog open and on click OK.(set cursor to progress) 3) Debugger. (Set cursor to progress). Not done: Activity indicator is not implemented for wizard pages. send another patch once completed. On Fri, Sep 23, 2016 at 2:19 PM, Surinder Kumar < surinder.kumar@enterprisedb.com> wrote: > On Fri, Sep 23, 2016 at 1:45 PM, Dave Page wrote: > >> On Fri, Sep 23, 2016 at 7:32 AM, Surinder Kumar >> wrote: >> > >> > >> > On Wed, Sep 21, 2016 at 8:40 PM, Dave Page wrote: >> >> >> >> Hi >> >> >> >> On Wed, Sep 21, 2016 at 2:30 PM, Surinder Kumar >> >> wrote: >> >> > Hi Dave/Ashesh >> >> > >> >> > The thing we can do is: >> >> > 1) We can display loading message same as other panels if returned >> >> > response >> >> > is taking longer than 2 seconds, otherwise we won't display any >> >> > message(to >> >> > avoid fluctuations). >> >> > Screenshot - demo_message.png >> >> >> >> There's a typo there (laoded).. >> >> >> >> > 2) Display a loading spinner along with panel title while data is >> being >> >> > loaded. >> >> > Screenshot - spinner.png >> >> >> >> I don't see a spinner there at all. >> > >> > sorry its not spinner, its reload spinning icon in place of properties >> icon. >> >> Oh, I see. I like it, but wonder if it would be too subtle. >> >> Can we do both? Show the panel, and spin a loading icon on the tab? >> > =E2=80=8BI will try to implement both.=E2=80=8B > >> >> >> >> >> >> >> What about the other places I mentioned? >> > >> > >> >> >> >> - On dialogue open and OK >> > >> > D >> > isplay loading message >> > in dialog till the data loads and on OK we can set mouse pointer to >> > 'progress' till the data is not processed. >> >> Yes, they are essentially panels too, so we can do the same as for >> Properties and Statistics etc. >> >> > - On Wizard steps >> > D >> > isplay loading message >> > also in wizard pages till it doesn't loads data. >> >> Yes. >> >> > >> > - Possibly in the debugger, when stepping? >> > >> > In case of debugger's step into, step out & resume, we can set mouse >> pointer >> > to 'progress' >> >> OK. >> >> Can you work up a patch ASAP please? >> > =E2=80=8BOk.=E2=80=8B > >> >> Thanks! >> >> -- >> Dave Page >> Blog: http://pgsnake.blogspot.com >> Twitter: @pgsnake >> >> EnterpriseDB UK: http://www.enterprisedb.com >> The Enterprise PostgreSQL Company >> > > --001a1143d59896b4e7053d694aa4 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Ple= ase find attached patch. Added activity indicator for:
1) Panels.
2) Dialog open and on click OK.(set cur= sor to progress)
3) Debugger. (Set cursor to progress).

Not done: Activity indicator is not implemented for wizard = pages. send another patch once completed.

On Fri, Sep 23, 2016 at 2:19 PM, Surind= er Kumar <surinder.kumar@enterprisedb.com> wro= te:
On Fri, Sep 23, 2016 at= 1:45 PM, Dave Page <dpage@pgadmin.org> wrote:
<= blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px= #ccc solid;padding-left:1ex">On Fri, Sep 23, 2016 at 7:32 AM, Surind= er Kumar
<su= rinder.kumar@enterprisedb.com> wrote:
>
>
> On Wed, Sep 21, 2016 at 8:40 PM, Dave Page <dpage@pgadmin.org> wrote:
>>
>> Hi
>>
>> On Wed, Sep 21, 2016 at 2:30 PM, Surinder Kumar
>> <surinder.kumar@enterprisedb.com> wrote:
>> > Hi Dave/Ashesh
>> >
>> > The thing we can do is:
>> > 1) We can display loading message same as other panels if ret= urned
>> > response
>> > is taking longer than 2 seconds, otherwise we won't displ= ay any
>> > message(to
>> > avoid fluctuations).
>> > Screenshot - demo_message.png
>>
>> There's a typo there (laoded)..
>>
>> > 2) Display a loading spinner along with panel title while dat= a is being
>> > loaded.
>> > Screenshot - spinner.png
>>
>> I don't see a spinner there at all.
>
> sorry its not spinner, its reload spinning icon in place of properties= icon.

Oh, I see. I like it, but wonder if it would be too subtle.

Can we do both? Show the panel, and spin a loading icon on the tab?
=E2= =80=8BI will try to implement both.=E2=80=8B

>>
>>
>> What about the other places I mentioned?
>
>
>>
>> - On dialogue open and OK
>
>=C2=A0 =C2=A0 =C2=A0D
> isplay loading message
> in dialog till the data loads and on OK we can set mouse pointer to
> 'progress' till the data is not processed.

Yes, they are essentially panels too, so we can do the same as for Properties and Statistics etc.

> - On Wizard steps
>=C2=A0 =C2=A0 D
> isplay loading message
> also in wizard pages till it doesn't loads data.

Yes.

>
> - Possibly in the debugger, when stepping?
>
> In case of debugger's step into, step out & resume, we can set= mouse pointer
> to 'progress'

OK.

Can you work up a patch ASAP please?
=E2=80=8BOk.=E2=80=8B

Thanks!

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

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


--001a1143d59896b4e7053d694aa4-- --001a1143d59896b4ed053d694aa6 Content-Type: application/octet-stream; name="activity_indicator.patch" Content-Disposition: attachment; filename="activity_indicator.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_itk3rcsb0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVtcGxhdGVzL2Jy b3dzZXIvanMvbWVzc2FnZXMuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3Rl bXBsYXRlcy9icm93c2VyL2pzL21lc3NhZ2VzLmpzCmluZGV4IGNkYjgzMmIu LmIwM2E4ODYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVt cGxhdGVzL2Jyb3dzZXIvanMvbWVzc2FnZXMuanMKKysrIGIvd2ViL3BnYWRt aW4vYnJvd3Nlci90ZW1wbGF0ZXMvYnJvd3Nlci9qcy9tZXNzYWdlcy5qcwpA QCAtMjgsNyArMjgsOSBAQCBmdW5jdGlvbihfLCBTLCBwZ0FkbWluKSB7CiAg ICAgJ0VSUl9SRVRSSUVWQUxfSU5GTyc6ICJ7eyBfKCJFcnJvciByZXRyaWV2 aW5nIHRoZSBpbmZvcm1hdGlvbiAtICVzIikgfX0iLAogICAgICdDT05ORUNU SU9OX0xPU1QnOiAie3sgXygiQ29ubmVjdGlvbiB0byB0aGUgc2VydmVyIGhh cyBiZWVuIGxvc3QhIikgfX0iLAogICAgICdTRUxFQ1RfQUxMJzogInt7IF8o IlNlbGVjdCBBbGwiKSB9fSIsCi0gICAgJ1VOU0VMRUNUX0FMTCc6ICJ7eyBf KCJVbnNlbGVjdCBBbGwiKSB9fSIKKyAgICAnVU5TRUxFQ1RfQUxMJzogInt7 IF8oIlVuc2VsZWN0IEFsbCIpIH19IiwKKyAgICAnTE9BRElOR19NRVNTQUdF JzogInt7IF8oIlBsZWFzZSB3YWl0IHdoaWxlIGRhdGEgaXMgYmVpbmcgbG9h ZGVkLi4uIikgfX0iLAorICAgICdMT0FESU5HX0ZBSUxFRCc6ICJ7eyBfKCJG YWlsZWQgdG8gbG9hZCBkYXRhLiIpIH19IgogICB9OwoKIHslIGZvciBrZXkg aW4gY3VycmVudF9hcHAubWVzc2FnZXMua2V5cygpICV9CmRpZmYgLS1naXQg YS93ZWIvcGdhZG1pbi9icm93c2VyL3RlbXBsYXRlcy9icm93c2VyL2pzL25v ZGUuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3RlbXBsYXRlcy9icm93c2Vy L2pzL25vZGUuanMKaW5kZXggODdhNWZjNy4uOTkxM2U3OCAxMDA2NDQKLS0t IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci90ZW1wbGF0ZXMvYnJvd3Nlci9qcy9u b2RlLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVtcGxhdGVzL2Jy b3dzZXIvanMvbm9kZS5qcwpAQCAtMjc2LDggKzI3NiwyMiBAQCBmdW5jdGlv bigkLCBfLCBTLCBwZ0FkbWluLCBNZW51LCBCYWNrYm9uZSwgQWxlcnRpZnks IHBnQnJvd3NlciwgQmFja2Zvcm0pIHsKCiAgICAgICAgICAgaWYgKCFuZXdN b2RlbC5pc05ldygpKSB7CiAgICAgICAgICAgICAvLyBUaGlzIGlzIGRlZmlu ZXRlbHkgbm90IGluIGNyZWF0ZSBtb2RlCisgICAgICAgICAgICB2YXIgbXNn RGl2ID0gJzxkaXYgY2xhc3M9ImFsZXJ0IGFsZXJ0LWluZm8gcGctcGFuZWwt bWVzc2FnZSBwZy1wYW5lbC1wcm9wZXJ0aWVzLW1lc3NhZ2UiPicrCisgICAg ICAgICAgICAgICAgcGdCcm93c2VyLm1lc3NhZ2VzWydMT0FESU5HX01FU1NB R0UnXSsnPC9kaXY+JywKKyAgICAgICAgICAgICAgICAkbXNnRGl2ID0gJCht c2dEaXYpOworICAgICAgICAgICAgdmFyIHRpbWVyID0gc2V0VGltZW91dChm dW5jdGlvbihjdHgpIHsKKyAgICAgICAgICAgICAgLy8gbm90aWZ5IHVzZXIg aWYgcmVxdWVzdCBpcyB0YWtpbmcgbG9uZ2VyIHRoYW4gMiBzZWNvbmRzCisK KyAgICAgICAgICAgICAgaWYgKCFfLmlzVW5kZWZpbmVkKGN0eCkpIHsKKyAg ICAgICAgICAgICAgICAkbXNnRGl2LmFwcGVuZFRvKGN0eCk7CisgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIH0sIDIwMDAsIGN0eCk7CiAgICAgICAg ICAgICBuZXdNb2RlbC5mZXRjaCgpCiAgICAgICAgICAgICAuc3VjY2Vzcyhm dW5jdGlvbihyZXMsIG1zZywgeGhyKSB7CisgICAgICAgICAgICAgIC8vIGNs ZWFyIHRpbWVvdXQgYW5kIHJlbW92ZSBtZXNzYWdlCisgICAgICAgICAgICAg IGNsZWFyVGltZW91dCh0aW1lcik7CisgICAgICAgICAgICAgICRtc2dEaXYu YWRkQ2xhc3MoJ2hpZGRlbicpOworCiAgICAgICAgICAgICAgIC8vIFdlIGdv dCB0aGUgbGF0ZXN0IGF0dHJpYnV0ZXMgb2YgdGhlCiAgICAgICAgICAgICAg IC8vIG9iamVjdC4gUmVuZGVyIHRoZSB2aWV3IG5vdy4KICAgICAgICAgICAg ICAgdmlldy5yZW5kZXIoKTsKQEAgLTkzNCw3ICs5NDgsNyBAQCBmdW5jdGlv bigkLCBfLCBTLCBwZ0FkbWluLCBNZW51LCBCYWNrYm9uZSwgQWxlcnRpZnks IHBnQnJvd3NlciwgQmFja2Zvcm0pIHsKICAgICAgICAgICAgICAgICAgICAg ICAncGctcHJvcC1mb290ZXInCiAgICAgICAgICAgICAgICAgICAgICAgKS5h cHBlbmRUbyhqKTsKICAgICAgICAgICAvLyBDcmVhdGUgYSB2aWV3IHRvIHNo b3cgdGhlIHByb3BlcnRpZXMgaW4gZmllbGRzZXRzCi0gICAgICAgICAgdmll dyA9IHRoYXQuZ2V0VmlldyhpdGVtLCAncHJvcGVydGllcycsIGNvbnRlbnQs IGRhdGEsICdmaWVsZHNldCcpOworICAgICAgICAgIHZpZXcgPSB0aGF0Lmdl dFZpZXcoaXRlbSwgJ3Byb3BlcnRpZXMnLCBjb250ZW50LCBkYXRhLCAnZmll bGRzZXQnLCB1bmRlZmluZWQsIGopOwogICAgICAgICAgIGlmICh2aWV3KSB7 CiAgICAgICAgICAgICAvLyBTYXZlIGl0IGZvciByZWxlYXNlIGl0IGxhdGVy CiAgICAgICAgICAgICBqLmRhdGEoJ29iai12aWV3Jywgdmlldyk7CkBAIC0x MTM1LDcgKzExNDksMTMgQEAgZnVuY3Rpb24oJCwgXywgUywgcGdBZG1pbiwg TWVudSwgQmFja2JvbmUsIEFsZXJ0aWZ5LCBwZ0Jyb3dzZXIsIEJhY2tmb3Jt KSB7CiAgICAgICAgICAgICAgICAgLy8gU2F2ZSB0aGUgY2hhbmdlcwogICAg ICAgICAgICAgICAgIGJ0bi5jbGljayhmdW5jdGlvbigpIHsKICAgICAgICAg ICAgICAgICAgIHZhciBtID0gdmlldy5tb2RlbCwKLSAgICAgICAgICAgICAg ICAgICAgZCA9IG0udG9KU09OKHRydWUpOworICAgICAgICAgICAgICAgICAg ICBkID0gbS50b0pTT04odHJ1ZSksCisKKyAgICAgICAgICAgICAgICAgICAg Ly8gR2VuZXJhdGUgYSB0aW1lciBmb3IgdGhlIHJlcXVlc3QKKyAgICAgICAg ICAgICAgICAgICAgdGltZXIgPSBzZXRUaW1lb3V0KGZ1bmN0aW9uKCl7Cisg ICAgICAgICAgICAgICAgICAgICAgJCgnLm9ial9wcm9wZXJ0aWVzJykuYWRk Q2xhc3MoJ3Nob3dfcHJvZ3Jlc3MnKTsKKyAgICAgICAgICAgICAgICAgICAg fSwgMjAwMCk7CisKICAgICAgICAgICAgICAgICAgIGlmIChkICYmICFfLmlz RW1wdHkoZCkpIHsKICAgICAgICAgICAgICAgICAgICAgbS5zYXZlKHt9LCB7 CiAgICAgICAgICAgICAgICAgICAgICAgYXR0cnM6IGQsCkBAIC0xMTQzLDYg KzExNjMsMTAgQEAgZnVuY3Rpb24oJCwgXywgUywgcGdBZG1pbiwgTWVudSwg QmFja2JvbmUsIEFsZXJ0aWZ5LCBwZ0Jyb3dzZXIsIEJhY2tmb3JtKSB7CiAg ICAgICAgICAgICAgICAgICAgICAgY2FjaGU6IGZhbHNlLAogICAgICAgICAg ICAgICAgICAgICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKCkgewogICAgICAgICAg ICAgICAgICAgICAgICAgb25TYXZlRnVuYy5jYWxsKCk7CisgICAgICAgICAg ICAgICAgICAgICAgICAvLyBIaWRlIHByb2dyZXNzIGN1cnNvcgorICAgICAg ICAgICAgICAgICAgICAgICAgJCgnLm9ial9wcm9wZXJ0aWVzJykucmVtb3Zl Q2xhc3MoJ3Nob3dfcHJvZ3Jlc3MnKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgIGNsZWFyVGltZW91dCh0aW1lcik7CisKICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIFJlbW92aW5nIHRoZSBub2RlLXByb3AgcHJvcGVydHkgb2Yg cGFuZWwKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHNvIHRoYXQgd2Ug c2hvdyB1cGRhdGVkIGRhdGEgb24gcGFuZWwKICAgICAgICAgICAgICAgICAg ICAgICAgIHZhciBwbmxQcm9wZXJ0aWVzID0gcGdCcm93c2VyLmRvY2tlci5m aW5kUGFuZWxzKCdwcm9wZXJ0aWVzJylbMF0sCkBAIC0xMTY5LDYgKzExOTMs MTAgQEAgZnVuY3Rpb24oJCwgXywgUywgcGdBZG1pbiwgTWVudSwgQmFja2Jv bmUsIEFsZXJ0aWZ5LCBwZ0Jyb3dzZXIsIEJhY2tmb3JtKSB7CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgInt7IF8oIkVycm9yIHNhdmluZyBwcm9w ZXJ0aWVzOiAlcyIpIH19IgogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICkuc3ByaW50ZihqcXhoci5zdGF0dXNUZXh0KS52YWx1ZSgpCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICk7CisKKyAgICAgICAgICAgICAgICAgICAg ICAgIC8vIEhpZGUgcHJvZ3Jlc3MgY3Vyc29yCisgICAgICAgICAgICAgICAg ICAgICAgICAkKCcub2JqX3Byb3BlcnRpZXMnKS5yZW1vdmVDbGFzcygnc2hv d19wcm9ncmVzcycpOworICAgICAgICAgICAgICAgICAgICAgICAgY2xlYXJU aW1lb3V0KHRpbWVyKTsKICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgICAgICAgfQpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vbWlzYy9kZXBlbmRzL3N0YXRpYy9qcy9k ZXBlbmRzLmpzIGIvd2ViL3BnYWRtaW4vbWlzYy9kZXBlbmRzL3N0YXRpYy9q cy9kZXBlbmRzLmpzCmluZGV4IGRjNWQ3ZTcuLjI2MWI5MjcgMTAwNjQ0Ci0t LSBhL3dlYi9wZ2FkbWluL21pc2MvZGVwZW5kcy9zdGF0aWMvanMvZGVwZW5k cy5qcworKysgYi93ZWIvcGdhZG1pbi9taXNjL2RlcGVuZHMvc3RhdGljL2pz L2RlcGVuZHMuanMKQEAgLTEsNiArMSw2IEBACiBkZWZpbmUoWwogICAndW5k ZXJzY29yZScsICd1bmRlcnNjb3JlLnN0cmluZycsICdqcXVlcnknLCAncGdh ZG1pbi5icm93c2VyJywKLSAgJ2FsZXJ0aWZ5JywgJ3BnYWRtaW4uYWxlcnRp ZnlqcycKKyAgJ2FsZXJ0aWZ5JywgJ3BnYWRtaW4uYWxlcnRpZnlqcycsICdw Z2FkbWluLmJyb3dzZXIubWVzc2FnZXMnLAogXSwgZnVuY3Rpb24oXywgUywg JCwgcGdCcm93c2VyLCBBbGVydGlmeSkgewoKICAgaWYgKHBnQnJvd3Nlci5T aG93Tm9kZURlcGVuZHMpCkBAIC0yMzQsMTMgKzIzNCwzMSBAQCBkZWZpbmUo WwogICAgICAgICAgICAgdGhpcy5kZXBlbmRlbnRHcmlkLmNvbHVtbnMubW9k ZWxzWzJdLnNldCh7J2xhYmVsJzogJ1Jlc3RyaWN0aW9uJ30pOwogICAgICAg ICAgIH0KCi0gICAgICAgICAgLy8gSGlkZSB0aGUgbWVzc2FnZSBjb250YWlu ZXIgYW5kIHNob3cgdGhlIGdyaWQgY29udGFpbmVyLgorICAgICAgICAgIC8v IEhpZGUgbWVzc2FnZSBjb250YWluZXIgYW5kIHNob3cgZ3JpZCBjb250YWlu ZXIuCiAgICAgICAgICAgJG1zZ0NvbnRhaW5lci5hZGRDbGFzcygnaGlkZGVu Jyk7CiAgICAgICAgICAgJGdyaWRDb250YWluZXIucmVtb3ZlQ2xhc3MoJ2hp ZGRlbicpOworCisgICAgICAgICAgdmFyIHRpbWVyID0gc2V0VGltZW91dChm dW5jdGlvbigpeworICAgICAgICAgICAgLy8gbm90aWZ5IHVzZXIgaWYgcmVx dWVzdCBpcyB0YWtpbmcgbG9uZ2VyIHRoYW4gMiBzZWNvbmRzCisKKyAgICAg ICAgICAgICRtc2dDb250YWluZXIudGV4dChwZ0Jyb3dzZXIubWVzc2FnZXNb J0xPQURJTkdfTUVTU0FHRSddKTsKKyAgICAgICAgICAgICRtc2dDb250YWlu ZXIucmVtb3ZlQ2xhc3MoJ2hpZGRlbicpOworICAgICAgICAgICAgaWYgKCRn cmlkQ29udGFpbmVyKSB7CisgICAgICAgICAgICAgICRncmlkQ29udGFpbmVy LmFkZENsYXNzKCdoaWRkZW4nKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICB9LCAyMDAwKTsKKwogICAgICAgICAgIC8vIFNldCB0aGUgdXJsLCBmZXRj aCB0aGUgZGF0YSBhbmQgdXBkYXRlIHRoZSBjb2xsZWN0aW9uCiAgICAgICAg ICAgY29sbGVjdGlvbi51cmwgPSB1cmw7CiAgICAgICAgICAgY29sbGVjdGlv bi5mZXRjaCh7CiAgICAgICAgICAgICByZXNldDogdHJ1ZSwKKyAgICAgICAg ICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICBjbGVh clRpbWVvdXQodGltZXIpOworICAgICAgICAgICAgICAkZ3JpZENvbnRhaW5l ci5yZW1vdmVDbGFzcygnaGlkZGVuJyk7CisgICAgICAgICAgICAgIGlmICgh JG1zZ0NvbnRhaW5lci5oYXNDbGFzcygnaGlkZGVuJykpIHsKKyAgICAgICAg ICAgICAgICAkbXNnQ29udGFpbmVyLmFkZENsYXNzKCdoaWRkZW4nKTsKKyAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgfSwKICAgICAgICAgICAgIGVy cm9yOiBmdW5jdGlvbihjb2xsLCB4aHIsIGVycm9yLCBtZXNzYWdlKSB7CiAg ICAgICAgICAgICAgIHZhciBfbGFiZWwgPSB0cmVlSGllcmFyY2h5W25fdHlw ZV0ubGFiZWw7CiAgICAgICAgICAgICAgIHBnQnJvd3Nlci5FdmVudHMudHJp Z2dlcigKQEAgLTI2MSw2ICsyNzksOCBAQCBkZWZpbmUoWwogICAgICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgICAgICk7CiAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgLy8gc2hvdyBmYWlsZWQgbWVzc2FnZS4KKyAg ICAgICAgICAgICAgJG1zZ0NvbnRhaW5lci50ZXh0KHBnQnJvd3Nlci5tZXNz YWdlc1snTE9BRElOR19GQUlMRUQnXSk7CiAgICAgICAgICAgICB9CiAgICAg ICAgICAgfSk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L21pc2Mvc3FsL3N0YXRpYy9qcy9zcWwuanMgYi93ZWIvcGdhZG1pbi9taXNj L3NxbC9zdGF0aWMvanMvc3FsLmpzCmluZGV4IDA0NDQ5NTQuLjQ5MzcwZjYg MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL21pc2Mvc3FsL3N0YXRpYy9qcy9z cWwuanMKKysrIGIvd2ViL3BnYWRtaW4vbWlzYy9zcWwvc3RhdGljL2pzL3Nx bC5qcwpAQCAtMSw2ICsxLDYgQEAKIGRlZmluZShbCiAgICd1bmRlcnNjb3Jl JywgJ3VuZGVyc2NvcmUuc3RyaW5nJywgJ2pxdWVyeScsICdwZ2FkbWluLmJy b3dzZXInLAotICAnYWxlcnRpZnknLCAncGdhZG1pbi5hbGVydGlmeWpzJwor ICAnYWxlcnRpZnknLCAncGdhZG1pbi5hbGVydGlmeWpzJywgJ3BnYWRtaW4u YnJvd3Nlci5tZXNzYWdlcycsCiBdLCBmdW5jdGlvbihfLCBTLCAkLCBwZ0Jy b3dzZXIsIEFsZXJ0aWZ5KSB7CgogICBwZ0Jyb3dzZXIuU2hvd05vZGVTUUwg PSBwZ0Jyb3dzZXIuU2hvd05vZGVTUUwgfHwge307CkBAIC04NCwxNSArODQs MjUgQEAgZGVmaW5lKFsKICAgICAgICAgICAgIGlmIChub2RlLmhhc1NRTCkg ewoKICAgICAgICAgICAgICAgc3FsID0gJyc7Ci0gICAgICAgICAgICAgIHZh ciB1cmwgPSBub2RlLmdlbmVyYXRlX3VybChpdGVtLCAnc3FsJywgZGF0YSwg dHJ1ZSk7CisgICAgICAgICAgICAgIHZhciB1cmwgPSBub2RlLmdlbmVyYXRl X3VybChpdGVtLCAnc3FsJywgZGF0YSwgdHJ1ZSksCisgICAgICAgICAgICAg ICAgICB0aW1lcjsKCiAgICAgICAgICAgICAgICQuYWpheCh7CiAgICAgICAg ICAgICAgICAgdXJsOiB1cmwsCiAgICAgICAgICAgICAgICAgdHlwZTonR0VU JywKKyAgICAgICAgICAgICAgICBiZWZvcmVTZW5kOiBmdW5jdGlvbihqcVhI Uiwgc2V0dGluZ3MpIHsKKyAgICAgICAgICAgICAgICAgIC8vIEdlbmVyYXRl IGEgdGltZXIgZm9yIHRoZSByZXF1ZXN0CisgICAgICAgICAgICAgICAgICB0 aW1lciA9IHNldFRpbWVvdXQoZnVuY3Rpb24oKXsKKyAgICAgICAgICAgICAg ICAgIC8vIG5vdGlmeSB1c2VyIGlmIHJlcXVlc3QgaXMgdGFraW5nIGxvbmdl ciB0aGFuIDIgc2Vjb25kcworCisgICAgICAgICAgICAgICAgICAgIHBnQWRt aW4uQnJvd3Nlci5lZGl0b3Iuc2V0VmFsdWUocGdCcm93c2VyLm1lc3NhZ2Vz WydMT0FESU5HX01FU1NBR0UnXSk7CisgICAgICAgICAgICAgICAgICB9LCAy MDAwKTsKKyAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgIHN1 Y2Nlc3M6IGZ1bmN0aW9uKHJlcykgewogICAgICAgICAgICAgICAgICAgaWYg KHBnQWRtaW4uQnJvd3Nlci5lZGl0b3IuZ2V0VmFsdWUoKSAhPSByZXMpIHsK ICAgICAgICAgICAgICAgICAgICAgcGdBZG1pbi5Ccm93c2VyLmVkaXRvci5z ZXRWYWx1ZShyZXMpOwogICAgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgICAgICAgY2xlYXJUaW1lb3V0KHRpbWVyKTsKICAgICAgICAgICAgICAg ICB9LAogICAgICAgICAgICAgICAgIGVycm9yOiBmdW5jdGlvbih4aHIsIGVy cm9yLCBtZXNzYWdlKSB7CiAgICAgICAgICAgICAgICAgICB2YXIgX2xhYmVs ID0gdHJlZUhpZXJhcmNoeVtuX3R5cGVdLmxhYmVsOwpkaWZmIC0tZ2l0IGEv d2ViL3BnYWRtaW4vbWlzYy9zdGF0aXN0aWNzL3N0YXRpYy9qcy9zdGF0aXN0 aWNzLmpzIGIvd2ViL3BnYWRtaW4vbWlzYy9zdGF0aXN0aWNzL3N0YXRpYy9q cy9zdGF0aXN0aWNzLmpzCmluZGV4IDQ3MTcwYjQuLjVjMzI1NzYgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGlzdGljcy9zdGF0aWMvanMv c3RhdGlzdGljcy5qcworKysgYi93ZWIvcGdhZG1pbi9taXNjL3N0YXRpc3Rp Y3Mvc3RhdGljL2pzL3N0YXRpc3RpY3MuanMKQEAgLTEsNiArMSw2IEBACiBk ZWZpbmUoWwogICAndW5kZXJzY29yZScsICd1bmRlcnNjb3JlLnN0cmluZycs ICdqcXVlcnknLCAncGdhZG1pbi5icm93c2VyJywgJ2JhY2tncmlkJywKLSAg J2FsZXJ0aWZ5JywgJ3djZG9ja2VyJywgJ3BnYWRtaW4uYmFja2dyaWQnLCAn cGdhZG1pbi5hbGVydGlmeWpzJworICAnYWxlcnRpZnknLCAnd2Nkb2NrZXIn LCAncGdhZG1pbi5iYWNrZ3JpZCcsICdwZ2FkbWluLmFsZXJ0aWZ5anMnLCAn cGdhZG1pbi5icm93c2VyLm1lc3NhZ2VzJywKIF0sIGZ1bmN0aW9uKF8sIFMs ICQsIHBnQnJvd3NlciwgQmFja2dyaWQsIEFsZXJ0aWZ5KSB7CgogICBpZiAo cGdCcm93c2VyLk5vZGVTdGF0aXN0aWNzKQpAQCAtMTc1LDE3ICsxNzUsMjgg QEAgZGVmaW5lKFsKICAgICAgICAgICAkKHBhbmVsWzBdKS5kYXRhKCdub2Rl LXByb3AnLCB0cmVlSGllcmFyY2h5KTsKIAogICAgICAgICBpZiAobm9kZS5o YXNTdGF0aXN0aWNzKSB7Ci0gICAgICAgICAgLyogU2V0IHRoZSBtZXNzYWdl IGJlY2F1c2UgYWpheCByZXF1ZXN0IG1heSB0YWtlIHRpbWUgdG8KLSAgICAg ICAgICAgKiBmZXRjaCB0aGUgaW5mb3JtYXRpb24gZnJvbSB0aGUgc2VydmVy LgotICAgICAgICAgICAqLwogICAgICAgICAgIG1zZyA9ICcnOwotICAgICAg ICAgICRtc2dDb250YWluZXIudGV4dChtc2cpOwotCisgICAgICAgICAgdmFy IHRpbWVyOwogICAgICAgICAgIC8vIFNldCB0aGUgdXJsLCBmZXRjaCB0aGUg ZGF0YSBhbmQgdXBkYXRlIHRoZSBjb2xsZWN0aW9uCiAgICAgICAgICAgJC5h amF4KHsKICAgICAgICAgICAgIHVybDogdXJsLAogICAgICAgICAgICAgdHlw ZTonR0VUJywKKyAgICAgICAgICAgIGJlZm9yZVNlbmQ6IGZ1bmN0aW9uKGpx WEhSLCBzZXR0aW5ncykgeworICAgICAgICAgICAgICAvLyBHZW5lcmF0ZSBh IHRpbWVyIGZvciB0aGUgcmVxdWVzdAorICAgICAgICAgICAgICB0aW1lciA9 IHNldFRpbWVvdXQoZnVuY3Rpb24oKXsKKyAgICAgICAgICAgICAgICAvLyBu b3RpZnkgdXNlciBpZiByZXF1ZXN0IGlzIHRha2luZyBsb25nZXIgdGhhbiAy IHNlY29uZHMKKworICAgICAgICAgICAgICAgICRtc2dDb250YWluZXIudGV4 dChwZ0Jyb3dzZXIubWVzc2FnZXNbJ0xPQURJTkdfTUVTU0FHRSddKTsKKyAg ICAgICAgICAgICAgICAkbXNnQ29udGFpbmVyLnJlbW92ZUNsYXNzKCdoaWRk ZW4nKTsKKyAgICAgICAgICAgICAgICBpZiAoc2VsZi5ncmlkKSB7CisgICAg ICAgICAgICAgICAgICBzZWxmLmdyaWQucmVtb3ZlKCk7CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICB9LCAyMDAwKTsKKyAgICAgICAgICAg IH0sCiAgICAgICAgICAgICBzdWNjZXNzOiBmdW5jdGlvbihyZXMpIHsKKyAg ICAgICAgICAgICAgLy8gY2xlYXIgdGltZXIgYW5kIHJlc2V0IG1lc3NhZ2Uu CisgICAgICAgICAgICAgIGNsZWFyVGltZW91dCh0aW1lcik7CisgICAgICAg ICAgICAgICRtc2dDb250YWluZXIudGV4dCgnJyk7CiAgICAgICAgICAgICAg IGlmIChyZXMuZGF0YSkgewogICAgICAgICAgICAgICAgIHZhciBkYXRhID0g cmVzLmRhdGE7CiAgICAgICAgICAgICAgICAgaWYgKG5vZGUuaGFzQ29sbGVj dGl2ZVN0YXRpc3RpY3MgfHwgZGF0YVsncm93cyddLmxlbmd0aCA+IDEpIHsK QEAgLTI0MSw2ICsyNTIsOCBAQCBkZWZpbmUoWwogICAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgICk7CiAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgLy8gc2hvdyBmYWlsZWQgbWVzc2FnZS4KKyAgICAgICAg ICAgICAgJG1zZ0NvbnRhaW5lci50ZXh0KHBnQnJvd3Nlci5tZXNzYWdlc1sn TE9BRElOR19GQUlMRUQnXSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg fSk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRp Yy9jc3MvcGdhZG1pbi5jc3MgYi93ZWIvcGdhZG1pbi9zdGF0aWMvY3NzL3Bn YWRtaW4uY3NzCmluZGV4IGNkZjQzMjcuLmU0MWQwYmIgMTAwNjQ0Ci0tLSBh L3dlYi9wZ2FkbWluL3N0YXRpYy9jc3MvcGdhZG1pbi5jc3MKKysrIGIvd2Vi L3BnYWRtaW4vc3RhdGljL2Nzcy9wZ2FkbWluLmNzcwpAQCAtNzYwLDMgKzc2 MCw5IEBAIGxnZy1lbC1jb250YWluZXJbZWw9bWRdIC5wZy1lbC1sZy04LAog LnBnYWRtaW4tY29udHJvbHMgPiB0ZXh0YXJlYS5mb3JtLWNvbnRyb2wgewog ICBwYWRkaW5nOiAzcHggNnB4OwogfQorLnBnLXBhbmVsLXByb3BlcnRpZXMt bWVzc2FnZSB7CisgIG1hcmdpbi10b3A6IDUwcHggIWltcG9ydGFudDsKK30K Ky5zaG93X3Byb2dyZXNzIHsKKyAgY3Vyc29yOiBwcm9ncmVzczsKK30KZGlm ZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2RlYnVnZ2VyL3RlbXBsYXRl cy9kZWJ1Z2dlci9qcy9kaXJlY3QuanMgYi93ZWIvcGdhZG1pbi90b29scy9k ZWJ1Z2dlci90ZW1wbGF0ZXMvZGVidWdnZXIvanMvZGlyZWN0LmpzCmluZGV4 IDdlYzVlOTUuLjQ1MjYxN2IgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rv b2xzL2RlYnVnZ2VyL3RlbXBsYXRlcy9kZWJ1Z2dlci9qcy9kaXJlY3QuanMK KysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvZGVidWdnZXIvdGVtcGxhdGVzL2Rl YnVnZ2VyL2pzL2RpcmVjdC5qcwpAQCAtMjY2LDYgKzI2NiwxMCBAQCBkZWZp bmUoCiAgICAgICAgICQuYWpheCh7CiAgICAgICAgICAgdXJsOiBiYXNlVXJs LAogICAgICAgICAgIG1ldGhvZDogJ0dFVCcsCisgICAgICAgICAgYmVmb3Jl U2VuZDogZnVuY3Rpb24oanFYSFIsIHNldHRpbmdzKSB7CisgICAgICAgICAg ICAvLyBzZXQgY3Vyc29yIHRvIHByb2dyZXNzIGJlZm9yZSBldmVyeSBwb2xs LgorICAgICAgICAgICAgJCgnLmRlYnVnZ2VyLWNvbnRhaW5lcicpLmFkZENs YXNzKCdzaG93X3Byb2dyZXNzJyk7CisgICAgICAgICAgfSwKICAgICAgICAg ICBzdWNjZXNzOiBmdW5jdGlvbihyZXMpIHsKICAgICAgICAgICAgIGlmIChy ZXMuZGF0YS5zdGF0dXMgPT09ICdTdWNjZXNzJykgewogICAgICAgICAgICAg ICAvLyBJZiBubyByZXN1bHQgdGhlbiBwb2xsIGFnYWluIHRvIHdhaXQgZm9y IHJlc3VsdHMuCkBAIC0zMTMsNiArMzE3LDggQEAgZGVmaW5lKAogICAgICAg ICAgICAgICAgICAgc2VsZi5HZXRTdGFja0luZm9ybWF0aW9uKHRyYW5zX2lk KTsKICAgICAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgICAgICAvLyBy ZW1vdmUgcHJvZ3Jlc3MgY3Vyc29yCisgICAgICAgICAgICAgICAgJCgnLmRl YnVnZ2VyLWNvbnRhaW5lcicpLnJlbW92ZUNsYXNzKCdzaG93X3Byb2dyZXNz Jyk7CiAgICAgICAgICAgICAgICAgLy8gRW5hYmxlIGFsbCB0aGUgYnV0dG9u cyBhcyB3ZSBnb3QgdGhlIHJlc3VsdHMKICAgICAgICAgICAgICAgICBzZWxm LmVuYWJsZSgnc3RvcCcsIHRydWUpOwogICAgICAgICAgICAgICAgIHNlbGYu ZW5hYmxlKCdzdGVwX292ZXInLCB0cnVlKTsK --001a1143d59896b4ed053d694aa6 Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers --001a1143d59896b4ed053d694aa6--