Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1baJWv-0000LO-6L for pgadmin-hackers@arkaria.postgresql.org; Thu, 18 Aug 2016 09:22:29 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1baJWu-0002RJ-Ot for pgadmin-hackers@arkaria.postgresql.org; Thu, 18 Aug 2016 09:22:28 +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 1baJWg-000223-72 for pgadmin-hackers@postgresql.org; Thu, 18 Aug 2016 09:22:14 +0000 Received: from mail-qk0-x231.google.com ([2607:f8b0:400d:c09::231]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1baJWX-0002HH-7n for pgadmin-hackers@postgresql.org; Thu, 18 Aug 2016 09:22:13 +0000 Received: by mail-qk0-x231.google.com with SMTP id t7so10603894qkh.1 for ; Thu, 18 Aug 2016 02:22:05 -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=jCSz2/rctAEh3thse2qO3GAUh7aHvo37XLTqZxrfhs4=; b=Zm1Ru/wo/p/A1oR21buuOnn2n01DK0GR1ZR0JuYjDvn3gtqYhOtQd3GIVmyzqobyHD Z2skq/syRlaa9meqXhGWITGNUVxjEXr+j8rYEC80jnWC3EtnEbOfD3D6MVSZZnmRQIHl 8WAIiiEG2bvKldDVF8o1xCmbyJusXKHFCfoKRubsEr6lDrsad1khKriHAxUhuQ5vNxXH 7GiS7xfPJ0oCRYkB08MySvJphjseQ68sPu4deh/aJACLIW/j34xafvmkeOLO0ftjE8nI +FQhj7ZcazIuM2dqqJY32wpfQLLBuLBMXtzWKc/d+SComfi7432EsQKn0gjOHR894/qp m6KA== 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=jCSz2/rctAEh3thse2qO3GAUh7aHvo37XLTqZxrfhs4=; b=EBOaJEv4MpxaHKpuiYCgEuAKTbFmUXfUfVAgyCTBOkfjM6Eh5oJM8O/88UyJqt/RSx oGmuxfVD0dyKkhX2K7/+yPp34JCnnVBf83W83Gj9e0OFh+Wl8NmVopMf6cIypdE8PnqX /0vVq5Z3WZLaqXg+Fx0a/0esIWIz9UgNZuRMo5AcpyQkHtkN8C+OqSMsbPycWrzZcx/O 0ZTB2zjJKfiOPpmCZhYRb4tSmpL7ZikEVsb19diArUg3VrGYdH7bjAoUBuZUkAnHtutN x0thXBArCBIMaTeG2o6Urept/mLD0mJNWKDQXYB4XqZ63lWLiDthF9+JHW/wKmu7zeJd mfKA== X-Gm-Message-State: AEkoouvLhMwqRqNLhaFAPS2AtF1qk+GqaCo0pD2XbiM6vWG+RgXMVKSdxKAolXknzwS2D53P+dBg4iL6GmxpKQaV X-Received: by 10.55.98.15 with SMTP id w15mr1118188qkb.41.1471512123620; Thu, 18 Aug 2016 02:22:03 -0700 (PDT) MIME-Version: 1.0 Received: by 10.55.140.5 with HTTP; Thu, 18 Aug 2016 02:21:43 -0700 (PDT) In-Reply-To: References: From: Murtuza Zabuawala Date: Thu, 18 Aug 2016 14:51:43 +0530 Message-ID: Subject: Re: PATCH: To fix the issue where message panel was showing incomplete info (pgAdmin4) To: Dave Page Cc: Ashesh Vashi , pgadmin-hackers Content-Type: multipart/mixed; boundary=94eb2c056fa06998ec053a551dfe 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 --94eb2c056fa06998ec053a551dfe Content-Type: multipart/alternative; boundary=94eb2c056fa06998e7053a551dfc --94eb2c056fa06998e7053a551dfc Content-Type: text/plain; charset=UTF-8 Hi Dave, Please find updated patch with auto scrolling & also fixed duplicate messages issue. Please review. Regards, Murtuza -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company On Wed, Aug 17, 2016 at 7:09 PM, Dave Page wrote: > Hi > > On Tue, Aug 16, 2016 at 3:56 PM, Murtuza Zabuawala > wrote: > > Hi Dave, > > > > PFA updated patch. > > I just tested this, and found a number of issues: > > - For a query like VACUUM FULL ANALYZE VERBOSE, the query runtime is > not displayed at the end of the messages. It is for SELECT queries > (note: pgAdmin 3 returns "Query returned successfully with no result > in 6.6 secs."). > > - Messages seem to be duplicated. For example, the output from the > query above, run on pgAdmin3 is 95KB, whilst from pgAdmin4 it's > 3.1MB(!). I believe it's because you're not clearing __notices in > messages(). I'm not entirely clear why that's even needed though - > can't we just return messages from self.conn.notices and clear that > directly? > > - The messages div should scroll to the end as it's updated, per > discussion. > > Thanks. > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > --94eb2c056fa06998e7053a551dfc Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Dave,

Please find updated patch with= auto scrolling & also fixed duplicate messages issue.
Please= review.

Regards,
Murtuza

--<= div>Regards,
Murtuza Zabuawala
EnterpriseDB:=C2= =A0http://www.enterprisedb.com=
The Enterprise PostgreSQL Company

On Wed, Aug 17, 2016 at 7:09 PM, Dave Page <= span dir=3D"ltr"><dpage@pgadmin.org> wrote:
= Hi

On Tue, Aug 16, 2016 at 3:56 PM, Murtuza Zabuawala
<murtuza.zabuawala= @enterprisedb.com> wrote:
> Hi Dave,
>
> PFA updated patch.

I just tested this, and found a number of issues:

- For a query like VACUUM FULL ANALYZE VERBOSE, the query runtime is
not displayed at the end of the messages. It is for SELECT queries
(note: pgAdmin 3 returns "Query returned successfully with no result in 6.6 secs.").

- Messages seem to be duplicated. For example, the output from the
query above, run on pgAdmin3 is 95KB, whilst from pgAdmin4 it's
3.1MB(!). I believe it's because you're not clearing __notices in messages(). I'm not entirely clear why that's even needed though -<= br> can't we just return messages from self.conn.notices and clear that
directly?

- The messages div should scroll to the end as it's updated, per discus= sion.

Thanks.

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

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

--94eb2c056fa06998e7053a551dfc-- --94eb2c056fa06998ec053a551dfe Content-Type: text/x-patch; charset=US-ASCII; name="RM_1523_v4.patch" Content-Disposition: attachment; filename="RM_1523_v4.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_is04a0430 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9fX2lu aXRfXy5weSBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9fX2luaXRf Xy5weQppbmRleCBiYjVjMjZiLi42ZGU0MmIwIDEwMDY0NAotLS0gYS93ZWIv cGdhZG1pbi90b29scy9zcWxlZGl0b3IvX19pbml0X18ucHkKKysrIGIvd2Vi L3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL19faW5pdF9fLnB5CkBAIC00MDYs OCArNDA2LDEwIEBAIGRlZiBwb2xsKHRyYW5zX2lkKToKICAgICAgICAgdHJh bnNfaWQ6IHVuaXF1ZSB0cmFuc2FjdGlvbiBpZAogICAgICIiIgogICAgIGNv bF9pbmZvID0gTm9uZQorICAgIHJlc3VsdCA9IE5vbmUKICAgICBwcmltYXJ5 X2tleXMgPSBOb25lCiAgICAgcm93c19hZmZlY3RlZCA9IDAKKyAgICBhZGRp dGlvbmFsX3Jlc3VsdCA9IFtdCiAKICAgICAjIENoZWNrIHRoZSB0cmFuc2Fj dGlvbiBhbmQgY29ubmVjdGlvbiBzdGF0dXMKICAgICBzdGF0dXMsIGVycm9y X21zZywgY29ubiwgdHJhbnNfb2JqLCBzZXNzaW9uX29iaiA9IGNoZWNrX3Ry YW5zYWN0aW9uX3N0YXR1cyh0cmFuc19pZCkKQEAgLTQzMCw2ICs0MzIsMTAg QEAgZGVmIHBvbGwodHJhbnNfaWQpOgogICAgICAgICAgICAgc3RhdHVzID0g J0NhbmNlbCcKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHN0YXR1cyA9 ICdCdXN5JworICAgICAgICAgICAgbWVzc2FnZXMgPSBjb25uLm1lc3NhZ2Vz KCkKKyAgICAgICAgICAgIGlmIG1lc3NhZ2VzIGFuZCBsZW4obWVzc2FnZXMp ID4gMDoKKyAgICAgICAgICAgICAgICByZXN1bHQgPSAnJy5qb2luKG1lc3Nh Z2VzKQorCiAgICAgZWxzZToKICAgICAgICAgc3RhdHVzID0gJ05vdENvbm5l Y3RlZCcKICAgICAgICAgcmVzdWx0ID0gZXJyb3JfbXNnCkBAIC00NTAsMjAg KzQ1NiwyNSBAQCBkZWYgcG9sbCh0cmFuc19pZCk6CiAgICAgICAgICMgcmVz dG9yZSBpdCBhbmQgdXBkYXRlIHRoZSBzZXNzaW9uIHZhcmlhYmxlLgogICAg ICAgICBzZXNzaW9uX29ialsnY29sdW1uc19pbmZvJ10gPSBjb2x1bW5zCiAg ICAgICAgIHVwZGF0ZV9zZXNzaW9uX2dyaWRfdHJhbnNhY3Rpb24odHJhbnNf aWQsIHNlc3Npb25fb2JqKQotICAgIGVsc2U6Ci0gICAgICAgIGlmIHJlc3Vs dCBpcyBOb25lOgotICAgICAgICAgICAgcmVzdWx0ID0gY29ubi5zdGF0dXNf bWVzc2FnZSgpCi0gICAgICAgICAgICBhZGRpdGlvbmFsX3Jlc3VsdCA9IGNv bm4ubWVzc2FnZXMoKQotICAgICAgICAgICAgIiIiCi0gICAgICAgICAgICBQ cm9jZWR1cmUvRnVuY3Rpb24gb3V0cHV0IG1heSBjb21lcyBpbiB0aGUgZm9y bSBvZiBOb3RpY2VzIGZyb20gdGhlCi0gICAgICAgICAgICBkYXRhYmFzZSBz ZXJ2ZXIsIHNvIHdlIG5lZWQgdG8gYXBwZW5kIHRob3NlIG91dHB1dHMgd2l0 aCB0aGUKLSAgICAgICAgICAgIG9yaWdpbmFsIHJlc3VsdC4KLSAgICAgICAg ICAgICIiIgotICAgICAgICAgICAgaWYgaXNpbnN0YW5jZShhZGRpdGlvbmFs X3Jlc3VsdCwgbGlzdCkgXAotICAgICAgICAgICAgICAgICAgICBhbmQgbGVu KGFkZGl0aW9uYWxfcmVzdWx0KSA+IDA6Ci0gICAgICAgICAgICAgICAgcmVz dWx0ID0gInswfSB7MX0iLmZvcm1hdChhZGRpdGlvbmFsX3Jlc3VsdFstMV0s IHJlc3VsdCkKLQotICAgICAgICAgICAgcm93c19hZmZlY3RlZCA9IGNvbm4u cm93c19hZmZlY3RlZCgpCisKKyAgICAiIiIKKyAgICAgICAgUHJvY2VkdXJl L0Z1bmN0aW9uIG91dHB1dCBtYXkgY29tZXMgaW4gdGhlIGZvcm0gb2YgTm90 aWNlcyBmcm9tIHRoZQorICAgICAgICBkYXRhYmFzZSBzZXJ2ZXIsIHNvIHdl IG5lZWQgdG8gYXBwZW5kIHRob3NlIG91dHB1dHMgd2l0aCB0aGUKKyAgICAg ICAgb3JpZ2luYWwgcmVzdWx0LgorICAgICIiIgorICAgIGlmIHN0YXR1cyA9 PSAnU3VjY2VzcycgYW5kIHJlc3VsdCBpcyBOb25lOgorICAgICAgICByZXN1 bHQgPSBjb25uLnN0YXR1c19tZXNzYWdlKCkKKyAgICAgICAgbWVzc2FnZXMg PSBjb25uLm1lc3NhZ2VzKCkKKyAgICAgICAgaWYgbWVzc2FnZXM6CisgICAg ICAgICAgICBhZGRpdGlvbmFsX3Jlc3VsdCA9ICcnLmpvaW4obWVzc2FnZXMp CisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBhZGRpdGlvbmFsX3Jlc3Vs dCA9ICcnCisgICAgICAgIGlmIHJlc3VsdCAhPSAnU0VMRUNUIDEnIGFuZCBy ZXN1bHQgaXMgbm90IE5vbmU6CisgICAgICAgICAgICByZXN1bHQgPSBhZGRp dGlvbmFsX3Jlc3VsdCArIHJlc3VsdAorICAgICAgICBlbHNlOgorICAgICAg ICAgICAgcmVzdWx0ID0gYWRkaXRpb25hbF9yZXN1bHQKKworICAgICAgICBy b3dzX2FmZmVjdGVkID0gY29ubi5yb3dzX2FmZmVjdGVkKCkKIAogICAgIHJl dHVybiBtYWtlX2pzb25fcmVzcG9uc2UoCiAgICAgICAgIGRhdGE9ewpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRpYy9j c3Mvc3FsZWRpdG9yLmNzcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRv ci9zdGF0aWMvY3NzL3NxbGVkaXRvci5jc3MKaW5kZXggOTNjNzkyMS4uODRm YmYxYyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9y L3N0YXRpYy9jc3Mvc3FsZWRpdG9yLmNzcworKysgYi93ZWIvcGdhZG1pbi90 b29scy9zcWxlZGl0b3Ivc3RhdGljL2Nzcy9zcWxlZGl0b3IuY3NzCkBAIC0x NjAsNiArMTYwLDkgQEAKICAgZm9udC1mYW1pbHk6IG1vbm9zcGFjZTsKICAg cGFkZGluZy10b3A6IDVweDsKICAgcGFkZGluZy1sZWZ0OiAxMHB4OworICBv dmVyZmxvdzogYXV0bzsKKyAgaGVpZ2h0OiAxMDAlOworICBmb250LXNpemU6 IDAuOTI1ZW07CiB9CiAKIC5saW1pdC1lbmFibGVkIHsKZGlmZiAtLWdpdCBh L3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci90ZW1wbGF0ZXMvc3FsZWRp dG9yL2pzL3NxbGVkaXRvci5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVk aXRvci90ZW1wbGF0ZXMvc3FsZWRpdG9yL2pzL3NxbGVkaXRvci5qcwppbmRl eCAyMjMzNTg2Li4yOTcyNjJmIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90 b29scy9zcWxlZGl0b3IvdGVtcGxhdGVzL3NxbGVkaXRvci9qcy9zcWxlZGl0 b3IuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3RlbXBs YXRlcy9zcWxlZGl0b3IvanMvc3FsZWRpdG9yLmpzCkBAIC0xMjkxLDcgKzEy OTEsOSBAQCBkZWZpbmUoCiAgICAgICAgICAgICAgICAgICAgIGVsc2Ugewog ICAgICAgICAgICAgICAgICAgICAgIC8vIFNob3cgbWVzc2FnZSBpbiBtZXNz YWdlIGFuZCBoaXN0b3J5IHRhYiBpbiBjYXNlIG9mIHF1ZXJ5IHRvb2wKICAg ICAgICAgICAgICAgICAgICAgICBzZWxmLnRvdGFsX3RpbWUgPSBzZWxmLmdl dF9xdWVyeV9ydW5fdGltZShzZWxmLnF1ZXJ5X3N0YXJ0X3RpbWUsIHNlbGYu cXVlcnlfZW5kX3RpbWUpOwotICAgICAgICAgICAgICAgICAgICAgIHNlbGYu dXBkYXRlX21zZ19oaXN0b3J5KHRydWUsIHJlcy5kYXRhLnJlc3VsdCk7Cisg ICAgICAgICAgICAgICAgICAgICAgdmFyIG1zZyA9IFMoJ3t7IF8oJ1F1ZXJ5 IHJldHVybmVkIHN1Y2Nlc3NmdWxseSBpbiA6ICVzLicpIH19Jykuc3ByaW50 ZihzZWxmLnRvdGFsX3RpbWUpLnZhbHVlKCk7CisgICAgICAgICAgICAgICAg ICAgICAgcmVzLmRhdGEucmVzdWx0ICs9ICJcblxuIiArIG1zZzsKKyAgICAg ICAgICAgICAgICAgICAgICBzZWxmLnVwZGF0ZV9tc2dfaGlzdG9yeSh0cnVl LCByZXMuZGF0YS5yZXN1bHQsIGZhbHNlKTsKICAgICAgICAgICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICAgICAgICAgIC8vIEVuYWJsZS9EaXNhYmxl IHF1ZXJ5IHRvb2wgYnV0dG9uIG9ubHkgaWYgaXNfcXVlcnlfdG9vbCBpcyB0 cnVlLgpAQCAtMTMwNSw2ICsxMzA3LDkgQEAgZGVmaW5lKAogICAgICAgICAg ICAgICAgICAgICAvLyBJZiBzdGF0dXMgaXMgQnVzeSB0aGVuIHBvbGwgdGhl IHJlc3VsdCBieSByZWN1cnNpdmUgY2FsbCB0byB0aGUgcG9sbCBmdW5jdGlv bgogICAgICAgICAgICAgICAgICAgICBzZWxmLl9wb2xsKCk7CiAgICAgICAg ICAgICAgICAgICAgIGlzX3F1ZXJ5X3J1bm5pbmcgPSB0cnVlOworICAgICAg ICAgICAgICAgICAgICBpZiAocmVzLmRhdGEucmVzdWx0KSB7CisgICAgICAg ICAgICAgICAgICAgICAgc2VsZi51cGRhdGVfbXNnX2hpc3RvcnkocmVzLmRh dGEuc3RhdHVzLCByZXMuZGF0YS5yZXN1bHQsIGZhbHNlKTsKKyAgICAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgfQogICAgICAgICAg ICAgICAgICAgZWxzZSBpZiAocmVzLmRhdGEuc3RhdHVzID09PSAnTm90Q29u bmVjdGVkJykgewogCkBAIC0xMzEzLDEwICsxMzE4LDEwIEBAIGRlZmluZSgK ICAgICAgICAgICAgICAgICAgICAgICBzZWxmLmRpc2FibGVfdG9vbF9idXR0 b25zKGZhbHNlKTsKICAgICAgICAgICAgICAgICAgICAgICAkKCIjYnRuLWNh bmNlbC1xdWVyeSIpLnByb3AoJ2Rpc2FibGVkJywgdHJ1ZSk7CiAgICAgICAg ICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAgc2VsZi51cGRh dGVfbXNnX2hpc3RvcnkoZmFsc2UsIHJlcy5kYXRhLnJlc3VsdCk7CisgICAg ICAgICAgICAgICAgICAgIHNlbGYudXBkYXRlX21zZ19oaXN0b3J5KGZhbHNl LCByZXMuZGF0YS5yZXN1bHQsIHRydWUpOwogICAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgICAgZWxzZSBpZiAocmVzLmRhdGEuc3RhdHVz ID09PSAnQ2FuY2VsJykgewotICAgICAgICAgICAgICAgICAgICBzZWxmLnVw ZGF0ZV9tc2dfaGlzdG9yeShmYWxzZSwgIkV4ZWN1dGlvbiBDYW5jZWxsZWQh IikKKyAgICAgICAgICAgICAgICAgICAgc2VsZi51cGRhdGVfbXNnX2hpc3Rv cnkoZmFsc2UsICJFeGVjdXRpb24gQ2FuY2VsbGVkISIsIHRydWUpCiAgICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfSwKICAgICAgICAg ICAgICAgICBlcnJvcjogZnVuY3Rpb24oZSkgewpAQCAtMTY4NywzNSArMTY5 Miw0MyBAQCBkZWZpbmUoCiAgICAgICAgIC8vIFRoaXMgZnVuY3Rpb24gaXMg dXNlZCB0byByYWlzZSBhcHByb3ByaWF0ZSBtZXNzYWdlLgogICAgICAgICB1 cGRhdGVfbXNnX2hpc3Rvcnk6IGZ1bmN0aW9uKHN0YXR1cywgbXNnLCBjbGVh cl9ncmlkKSB7CiAgICAgICAgICAgdmFyIHNlbGYgPSB0aGlzOwotCiAgICAg ICAgICAgaWYgKGNsZWFyX2dyaWQgPT09IHVuZGVmaW5lZCkKICAgICAgICAg ICAgIGNsZWFyX2dyaWQgPSB0cnVlOwogCi0gICAgICAgICAgc2VsZi50cmln Z2VyKCdwZ2FkbWluLXNxbGVkaXRvcjpsb2FkaW5nLWljb246aGlkZScpOwot ICAgICAgICAgICQoIiNidG4tZmxhc2giKS5wcm9wKCdkaXNhYmxlZCcsIGZh bHNlKTsKLQotICAgICAgICAgICQoJy5zcWwtZWRpdG9yLW1lc3NhZ2UnKS50 ZXh0KG1zZyk7CiAgICAgICAgICAgc2VsZi5ncmlkVmlldy5tZXNzYWdlc19w YW5lbC5mb2N1cygpOwogCi0gICAgICAgICAgaWYgKHNlbGYuaXNfcXVlcnlf dG9vbCAmJiBjbGVhcl9ncmlkKSB7Ci0gICAgICAgICAgICAvLyBEZWxldGUg Z3JpZCBhbmQgcGFnaW5hdG9yCi0gICAgICAgICAgICBpZiAoc2VsZi5ncmlk Vmlldy5ncmlkKSB7Ci0gICAgICAgICAgICAgIHNlbGYuZ3JpZFZpZXcuZ3Jp ZC5yZW1vdmUoKTsKKyAgICAgICAgICBpZiAoc2VsZi5pc19xdWVyeV90b29s KSB7CisgICAgICAgICAgICBpZiAoY2xlYXJfZ3JpZCkgeworICAgICAgICAg ICAgICAvLyBEZWxldGUgZ3JpZCBhbmQgcGFnaW5hdG9yCisgICAgICAgICAg ICAgIGlmIChzZWxmLmdyaWRWaWV3LmdyaWQpIHsKKyAgICAgICAgICAgICAg ICBzZWxmLmdyaWRWaWV3LmdyaWQucmVtb3ZlKCk7CisgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgLy8gTWlzYyBjbGVhbmluZwogICAgICAgICAg ICAgICBzZWxmLmNvbHVtbnMgPSB1bmRlZmluZWQ7CiAgICAgICAgICAgICAg IHNlbGYuY29sbGVjdGlvbiA9IHVuZGVmaW5lZDsKLSAgICAgICAgICAgIH0K IAotICAgICAgICAgICAgaWYgKHNlbGYuZ3JpZFZpZXcucGFnaW5hdG9yKQot ICAgICAgICAgICAgIHNlbGYuZ3JpZFZpZXcucGFnaW5hdG9yLnJlbW92ZSgp OworICAgICAgICAgICAgICBpZiAoc2VsZi5ncmlkVmlldy5wYWdpbmF0b3Ip CisgICAgICAgICAgICAgICAgc2VsZi5ncmlkVmlldy5wYWdpbmF0b3IucmVt b3ZlKCk7CisgICAgICAgICAgICAgICQoJy5zcWwtZWRpdG9yLW1lc3NhZ2Un KS50ZXh0KG1zZyk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgICAkKCcuc3FsLWVkaXRvci1tZXNzYWdlJykuYXBwZW5kKG1zZyk7Cisg ICAgICAgICAgICB9CisgICAgICAgICAgfQorICAgICAgICAgIC8vIFNjcm9s bCBhdXRvbWF0aWNhbGx5IHdoZW4gbXNncyBhcHBlbmRzIHRvIGVsZW1lbnQK KyAgICAgICAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCl7CisgICAgICAgICAg ICAkKCIuc3FsLWVkaXRvci1tZXNzYWdlIikuc2Nyb2xsVG9wKCQoIi5zcWwt ZWRpdG9yLW1lc3NhZ2UiKVswXS5zY3JvbGxIZWlnaHQpOzsKKyAgICAgICAg ICB9LCAxMCk7CisKKyAgICAgICAgICBpZihzdGF0dXMgIT0gJ0J1c3knKSB7 CisgICAgICAgICAgICAkKCIjYnRuLWZsYXNoIikucHJvcCgnZGlzYWJsZWQn LCBmYWxzZSk7CisgICAgICAgICAgICBzZWxmLnRyaWdnZXIoJ3BnYWRtaW4t c3FsZWRpdG9yOmxvYWRpbmctaWNvbjpoaWRlJyk7CisgICAgICAgICAgICBz ZWxmLmdyaWRWaWV3Lmhpc3RvcnlfY29sbGVjdGlvbi5hZGQoeworICAgICAg ICAgICAgICAnc3RhdHVzJyA6IHN0YXR1cywgJ3N0YXJ0X3RpbWUnOiBzZWxm LnF1ZXJ5X3N0YXJ0X3RpbWUudG9TdHJpbmcoKSwKKyAgICAgICAgICAgICAg J3F1ZXJ5Jzogc2VsZi5xdWVyeSwgJ3Jvd19hZmZlY3RlZCc6IHNlbGYucm93 c19hZmZlY3RlZCwKKyAgICAgICAgICAgICAgJ3RvdGFsX3RpbWUnOiBzZWxm LnRvdGFsX3RpbWUsICdtZXNzYWdlJzptc2cKKyAgICAgICAgICAgIH0pOwor ICAgICAgICAgICAgc2VsZi5ncmlkVmlldy5oaXN0b3J5X2NvbGxlY3Rpb24u c29ydCgpOwogICAgICAgICAgIH0KLQotICAgICAgICAgIHNlbGYuZ3JpZFZp ZXcuaGlzdG9yeV9jb2xsZWN0aW9uLmFkZCgKLSAgICAgICAgICAgIHsnc3Rh dHVzJyA6IHN0YXR1cywgJ3N0YXJ0X3RpbWUnOiBzZWxmLnF1ZXJ5X3N0YXJ0 X3RpbWUudG9TdHJpbmcoKSwKLSAgICAgICAgICAgICAncXVlcnknOiBzZWxm LnF1ZXJ5LCAncm93X2FmZmVjdGVkJzogc2VsZi5yb3dzX2FmZmVjdGVkLAot ICAgICAgICAgICAgICd0b3RhbF90aW1lJzogc2VsZi50b3RhbF90aW1lLCAn bWVzc2FnZSc6bXNnCi0gICAgICAgICAgfSk7Ci0KLSAgICAgICAgICBzZWxm LmdyaWRWaWV3Lmhpc3RvcnlfY29sbGVjdGlvbi5zb3J0KCk7CiAgICAgICAg IH0sCiAKICAgICAgICAgLy8gVGhpcyBmdW5jdGlvbiB3aWxsIHJldHVybiB0 aGUgdG90YWwgcXVlcnkgZXhlY3V0aW9uIFRpbWUuCkBAIC0yMTQwLDEwICsy MTUzLDEyIEBAIGRlZmluZSgKICAgICAgICAgICB2YXIgc2VsZiA9IHRoaXM7 CiAKICAgICAgICAgICAvLyBTdGFydCBleGVjdXRpb24gb2YgdGhlIHF1ZXJ5 LgotICAgICAgICAgIGlmIChzZWxmLmlzX3F1ZXJ5X3Rvb2wpCisgICAgICAg ICAgaWYgKHNlbGYuaXNfcXVlcnlfdG9vbCkgeworICAgICAgICAgICAgJCgn LnNxbC1lZGl0b3ItbWVzc2FnZScpLmh0bWwoJycpOwogICAgICAgICAgICAg c2VsZi5fZXhlY3V0ZSgpOwotICAgICAgICAgIGVsc2UKKyAgICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgc2VsZi5fZXhlY3V0ZV9kYXRhX3F1ZXJ5 KCk7CisgICAgICAgICAgfQogICAgICAgICB9LAogCiAgICAgICAgIC8vIFRo aXMgZnVuY3Rpb24gd2lsbCBzaG93IHRoZSBmaWx0ZXIgaW4gdGhlIHRleHQg YXJlYS4KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3V0aWxzL2RyaXZlci9w c3ljb3BnMi9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL3V0aWxzL2RyaXZl ci9wc3ljb3BnMi9fX2luaXRfXy5weQppbmRleCBmYmRlNjAzLi4wNTYyMmU2 IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi91dGlscy9kcml2ZXIvcHN5Y29w ZzIvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vdXRpbHMvZHJpdmVy L3BzeWNvcGcyL19faW5pdF9fLnB5CkBAIC0xNzgsNiArMTc4LDcgQEAgY2xh c3MgQ29ubmVjdGlvbihCYXNlQ29ubmVjdGlvbik6CiAgICAgICAgIHNlbGYu X19iYWNrZW5kX3BpZCA9IE5vbmUKICAgICAgICAgc2VsZi5leGVjdXRpb25f YWJvcnRlZCA9IEZhbHNlCiAgICAgICAgIHNlbGYucm93X2NvdW50ID0gMAor ICAgICAgICBzZWxmLl9fbm90aWNlcyA9IE5vbmUKIAogICAgICAgICBzdXBl cihDb25uZWN0aW9uLCBzZWxmKS5fX2luaXRfXygpCiAKQEAgLTYzOSw2ICs2 NDAsNyBAQCBBdHRlbXB0IHRvIHJlY29ubmVjdCBpdCBmYWlsZWQgd2l0aCB0 aGUgZXJyb3I6CiAgICAgICAgICkKIAogICAgICAgICB0cnk6CisgICAgICAg ICAgICBzZWxmLl9fbm90aWNlcyA9IFtdCiAgICAgICAgICAgICBzZWxmLmV4 ZWN1dGlvbl9hYm9ydGVkID0gRmFsc2UKICAgICAgICAgICAgIGN1ci5leGVj dXRlKHF1ZXJ5LCBwYXJhbXMpCiAgICAgICAgICAgICByZXMgPSBzZWxmLl93 YWl0X3RpbWVvdXQoY3VyLmNvbm5lY3Rpb24sIEFTWU5DX1dBSVRfVElNRU9V VCkKQEAgLTkwNCwzMSArOTA2LDkgQEAgRmFpbGVkIHRvIHJlc2V0IHRoZSBj b25uZWN0aW9uIHRvIHRoZSBzZXJ2ZXIgZHVlIHRvIGZvbGxvd2luZyBlcnJv cjoKICAgICAgICAgaWYgc3RhdGUgPT0gcHN5Y29wZzIuZXh0ZW5zaW9ucy5Q T0xMX09LOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuQVNZTkNfT0sKICAg ICAgICAgZWxpZiBzdGF0ZSA9PSBwc3ljb3BnMi5leHRlbnNpb25zLlBPTExf V1JJVEU6Ci0gICAgICAgICAgICAjIFdhaXQgZm9yIHRoZSBnaXZlbiB0aW1l IGFuZCB0aGVuIGNoZWNrIHRoZSByZXR1cm4gc3RhdHVzCi0gICAgICAgICAg ICAjIElmIHRocmVlIGVtcHR5IGxpc3RzIGFyZSByZXR1cm5lZCB0aGVuIHRo ZSB0aW1lLW91dCBpcyByZWFjaGVkLgotICAgICAgICAgICAgdGltZW91dF9z dGF0dXMgPSBzZWxlY3Quc2VsZWN0KFtdLCBbY29ubi5maWxlbm8oKV0sIFtd LCB0aW1lKQotICAgICAgICAgICAgaWYgdGltZW91dF9zdGF0dXMgPT0gKFtd LCBbXSwgW10pOgotICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLkFTWU5D X1dSSVRFX1RJTUVPVVQKLQotICAgICAgICAgICAgIyBwb2xsIGFnYWluIHRv IGNoZWNrIHRoZSBzdGF0ZSBpZiBpdCBpcyBzdGlsbCBQT0xMX1dSSVRFCi0g ICAgICAgICAgICAjIHRoZW4gcmV0dXJuIEFTWU5DX1dSSVRFX1RJTUVPVVQg ZWxzZSByZXR1cm4gQVNZTkNfT0suCi0gICAgICAgICAgICBzdGF0ZSA9IGNv bm4ucG9sbCgpCi0gICAgICAgICAgICBpZiBzdGF0ZSA9PSBwc3ljb3BnMi5l eHRlbnNpb25zLlBPTExfV1JJVEU6Ci0gICAgICAgICAgICAgICAgcmV0dXJu IHNlbGYuQVNZTkNfV1JJVEVfVElNRU9VVAotICAgICAgICAgICAgcmV0dXJu IHNlbGYuQVNZTkNfT0sKKyAgICAgICAgICAgIHJldHVybiBzZWxmLkFTWU5D X1dSSVRFX1RJTUVPVVQKICAgICAgICAgZWxpZiBzdGF0ZSA9PSBwc3ljb3Bn Mi5leHRlbnNpb25zLlBPTExfUkVBRDoKLSAgICAgICAgICAgICMgV2FpdCBm b3IgdGhlIGdpdmVuIHRpbWUgYW5kIHRoZW4gY2hlY2sgdGhlIHJldHVybiBz dGF0dXMKLSAgICAgICAgICAgICMgSWYgdGhyZWUgZW1wdHkgbGlzdHMgYXJl IHJldHVybmVkIHRoZW4gdGhlIHRpbWUtb3V0IGlzIHJlYWNoZWQuCi0gICAg ICAgICAgICB0aW1lb3V0X3N0YXR1cyA9IHNlbGVjdC5zZWxlY3QoW2Nvbm4u ZmlsZW5vKCldLCBbXSwgW10sIHRpbWUpCi0gICAgICAgICAgICBpZiB0aW1l b3V0X3N0YXR1cyA9PSAoW10sIFtdLCBbXSk6Ci0gICAgICAgICAgICAgICAg cmV0dXJuIHNlbGYuQVNZTkNfUkVBRF9USU1FT1VUCi0KLSAgICAgICAgICAg ICMgcG9sbCBhZ2FpbiB0byBjaGVjayB0aGUgc3RhdGUgaWYgaXQgaXMgc3Rp bGwgUE9MTF9SRUFECi0gICAgICAgICAgICAjIHRoZW4gcmV0dXJuIEFTWU5D X1JFQURfVElNRU9VVCBlbHNlIHJldHVybiBBU1lOQ19PSy4KLSAgICAgICAg ICAgIHN0YXRlID0gY29ubi5wb2xsKCkKLSAgICAgICAgICAgIGlmIHN0YXRl ID09IHBzeWNvcGcyLmV4dGVuc2lvbnMuUE9MTF9SRUFEOgotICAgICAgICAg ICAgICAgIHJldHVybiBzZWxmLkFTWU5DX1JFQURfVElNRU9VVAotICAgICAg ICAgICAgcmV0dXJuIHNlbGYuQVNZTkNfT0sKKyAgICAgICAgICAgIHJldHVy biBzZWxmLkFTWU5DX1JFQURfVElNRU9VVAogICAgICAgICBlbHNlOgogICAg ICAgICAgICAgcmFpc2UgcHN5Y29wZzIuT3BlcmF0aW9uYWxFcnJvcigKICAg ICAgICAgICAgICAgICAicG9sbCgpIHJldHVybmVkICVzIGZyb20gX3dhaXRf dGltZW91dCBmdW5jdGlvbiIgJSBzdGF0ZQpAQCAtOTY1LDYgKzk0NSwxMCBA QCBGYWlsZWQgdG8gcmVzZXQgdGhlIGNvbm5lY3Rpb24gdG8gdGhlIHNlcnZl ciBkdWUgdG8gZm9sbG93aW5nIGVycm9yOgogICAgICAgICAgICAgZXJybXNn ID0gc2VsZi5fZm9ybWF0dGVkX2V4Y2VwdGlvbl9tc2cocGUsIGZvcm1hdHRl ZF9leGNlcHRpb25fbXNnKQogICAgICAgICAgICAgcmV0dXJuIEZhbHNlLCBl cnJtc2csIE5vbmUKIAorICAgICAgICBpZiBzZWxmLmNvbm4ubm90aWNlcyBh bmQgc2VsZi5fX25vdGljZXMgaXMgbm90IE5vbmU6CisgICAgICAgICAgICB3 aGlsZSBzZWxmLmNvbm4ubm90aWNlczoKKyAgICAgICAgICAgICAgICBzZWxm Ll9fbm90aWNlcy5hcHBlbmQoc2VsZi5jb25uLm5vdGljZXMucG9wKDApWzpd KQorCiAgICAgICAgIGNvbGluZm8gPSBOb25lCiAgICAgICAgIHJlc3VsdCA9 IE5vbmUKICAgICAgICAgc2VsZi5yb3dfY291bnQgPSAwCkBAIC05OTYsNyAr OTgwLDYgQEAgRmFpbGVkIHRvIHJlc2V0IHRoZSBjb25uZWN0aW9uIHRvIHRo ZSBzZXJ2ZXIgZHVlIHRvIGZvbGxvd2luZyBlcnJvcjoKICAgICAgICAgICAg ICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoZGljdChyb3cpKQogICAgICAg ICAgICAgICAgIGV4Y2VwdCBwc3ljb3BnMi5Qcm9ncmFtbWluZ0Vycm9yOgog ICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSBOb25lCi0KICAgICAgICAg cmV0dXJuIHN0YXR1cywgcmVzdWx0LCBjb2xpbmZvCiAKICAgICBkZWYgc3Rh dHVzX21lc3NhZ2Uoc2VsZik6CkBAIC0xMDk0LDcgKzEwNzcsMTAgQEAgRmFp bGVkIHRvIHJlc2V0IHRoZSBjb25uZWN0aW9uIHRvIHRoZSBzZXJ2ZXIgZHVl IHRvIGZvbGxvd2luZyBlcnJvcjoKICAgICAgICAgIiIiCiAgICAgICAgIFJl dHVybnMgdGhlIGxpc3Qgb2YgdGhlIG1lc3NhZ2VzL25vdGljZXMgc2VuZCBm cm9tIHRoZSBkYXRhYmFzZSBzZXJ2ZXIuCiAgICAgICAgICIiIgotICAgICAg ICByZXR1cm4gc2VsZi5jb25uLm5vdGljZXMgaWYgc2VsZi5jb25uIGVsc2Ug W10KKyAgICAgICAgcmVzcCA9IFtdCisgICAgICAgIHdoaWxlIHNlbGYuX19u b3RpY2VzOgorICAgICAgICAgICAgcmVzcC5hcHBlbmQoc2VsZi5fX25vdGlj ZXMucG9wKDApKQorICAgICAgICByZXR1cm4gcmVzcAogCiAgICAgZGVmIF9m b3JtYXR0ZWRfZXhjZXB0aW9uX21zZyhzZWxmLCBleGNlcHRpb25fb2JqLCBm b3JtYXR0ZWRfbXNnKToKICAgICAgICAgIiIiCg== --94eb2c056fa06998ec053a551dfe 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 --94eb2c056fa06998ec053a551dfe--