Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.80) (envelope-from ) id 1aQHdV-0008OE-BO for pgsql-hackers@arkaria.postgresql.org; Mon, 01 Feb 2016 16:47:33 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84) (envelope-from ) id 1aQHdU-0003qA-PA for pgsql-hackers@arkaria.postgresql.org; Mon, 01 Feb 2016 16:47: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.84) (envelope-from ) id 1aQHdT-0003pK-Cz for pgsql-hackers@postgresql.org; Mon, 01 Feb 2016 16:47:31 +0000 Received: from jiboia.ensmp.fr ([194.214.158.137]) by makus.postgresql.org with esmtp (Exim 4.84) (envelope-from ) id 1aQHdP-0006GU-Nw for pgsql-hackers@postgresql.org; Mon, 01 Feb 2016 16:47:29 +0000 Received: from cri.ensmp.fr (nat-any-rnt.cri.ensmp.fr [195.83.117.252]) (authenticated bits=0) by jiboia.ensmp.fr (8.15.2/8.15.1/JMMC-22/Oct/2013) with ESMTPSA id u11GlKOI005425 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 1 Feb 2016 17:47:21 +0100 Date: Mon, 1 Feb 2016 17:46:45 +0100 (CET) From: Fabien COELHO X-X-Sender: fabien@sto To: Michael Paquier cc: Alvaro Herrera , "pgsql-hackers@postgresql.org" Subject: Re: pgbench stats per script & other stuff In-Reply-To: Message-ID: References: <20160129120903.GA765057@alvherre.pgsql> User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="8323329-2092700148-1454345206=:13459" X-Miltered: at jiboia.ensmp.fr with ID 56AF8C18.008 by Joe's j-chkmail (http : // j-chkmail dot ensmp dot fr)! X-j-chkmail-Auth: USER-ID fabien.coelho X-j-chkmail-Enveloppe: 56AF8C18.008 from nat-any-rnt.cri.ensmp.fr/nat-any-rnt.cri.ensmp.fr/195.83.117.252/cri.ensmp.fr/ X-Pg-Spam-Score: -2.4 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgsql-hackers Precedence: bulk Sender: pgsql-hackers-owner@postgresql.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323329-2092700148-1454345206=:13459 Content-Type: TEXT/PLAIN; format=flowed; charset=ISO-8859-15 Content-Transfer-Encoding: 8BIT Hello Michaël, Two rebase attached. >> - 15-e: prefix selection for -b > - if (strncmp(builtin_script[i].name, name, > - strlen(builtin_script[i].name)) == 0) > + if (strncmp(builtin_script[i].name, name, len) == 0) > > I agree with Alvaro here: this should remain unchanged. It seems to be > a rebase mistake. I do not understand. I tested it and it works as expected. If I put the above strlen instead the suffix detection does not work: fabien@sto:bin/pgbench> git diff diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index 783cbf9..0c33012 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -2684,7 +2684,7 @@ findBuiltin(const char *name, char **desc) for (i = 0; i < N_BUILTIN; i++) { - if (strncmp(builtin_script[i].name, name, len) == 0) + if (strncmp(builtin_script[i].name, name, strlen(builtin_script[i].name)) == 0) { *desc = builtin_script[i].desc; commands = builtin_script[i].commands; ./pgbench -b t no builtin script found for name "t" Available builtin scripts: tpcb-like simple-update select-only Indeed, then it can only match if the provided "name" is as long as the recorded len. The point of the "suffix" selection is to align to the short supplied string. -- Fabien. --8323329-2092700148-1454345206=:13459 Content-Type: TEXT/x-diff; name=pgbench-script-stats-16-d.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=pgbench-script-stats-16-d.patch ZGlmZiAtLWdpdCBhL2RvYy9zcmMvc2dtbC9yZWYvcGdiZW5jaC5zZ21sIGIv ZG9jL3NyYy9zZ21sL3JlZi9wZ2JlbmNoLnNnbWwNCmluZGV4IGFkZTFiNTMu LmNhM2UxNTggMTAwNjQ0DQotLS0gYS9kb2Mvc3JjL3NnbWwvcmVmL3BnYmVu Y2guc2dtbA0KKysrIGIvZG9jL3NyYy9zZ21sL3JlZi9wZ2JlbmNoLnNnbWwN CkBAIC0yNjIsMTEgKzI2MiwxMyBAQCBwZ2JlbmNoIDxvcHRpb25hbD4gPHJl cGxhY2VhYmxlPm9wdGlvbnM8Lz4gPC9vcHRpb25hbD4gPHJlcGxhY2VhYmxl PmRibmFtZTwvPg0KIA0KICAgICA8dmFyaWFibGVsaXN0Pg0KICAgICAgPHZh cmxpc3RlbnRyeT4NCi0gICAgICA8dGVybT48b3B0aW9uPi1iPC8+IDxyZXBs YWNlYWJsZT5zY3JpcHRuYW1lPC8+PC90ZXJtPg0KLSAgICAgIDx0ZXJtPjxv cHRpb24+LS1idWlsdGluPC8+IDxyZXBsYWNlYWJsZT5zY3JpcHRuYW1lPC8+ PC90ZXJtPg0KKyAgICAgIDx0ZXJtPjxvcHRpb24+LWI8Lz4gPHJlcGxhY2Vh YmxlPnNjcmlwdG5hbWVbQHdlaWdodF08Lz48L3Rlcm0+DQorICAgICAgPHRl cm0+PG9wdGlvbj4tLWJ1aWx0aW48Lz4gPHJlcGxhY2VhYmxlPnNjcmlwdG5h bWVbQHdlaWdodF08Lz48L3Rlcm0+DQogICAgICAgPGxpc3RpdGVtPg0KICAg ICAgICA8cGFyYT4NCiAgICAgICAgIEFkZCB0aGUgc3BlY2lmaWVkIGJ1aWx0 aW4gc2NyaXB0IHRvIHRoZSBsaXN0IG9mIGV4ZWN1dGVkIHNjcmlwdHMuDQor ICAgICAgICBBbiBvcHRpb25hbCBpbnRlZ2VyIHdlaWdodCBhZnRlciA8bGl0 ZXJhbD5APC8+IGFsbG93cyB0byBhZGp1c3QgdGhlDQorICAgICAgICBwcm9i YWJpbGl0eSBvZiBkcmF3aW5nIHRoZSB0ZXN0Lg0KICAgICAgICAgQXZhaWxh YmxlIGJ1aWx0aW4gc2NyaXB0cyBhcmU6IDxsaXRlcmFsPnRwY2ItbGlrZTwv PiwNCiAgICAgICAgIDxsaXRlcmFsPnNpbXBsZS11cGRhdGU8Lz4gYW5kIDxs aXRlcmFsPnNlbGVjdC1vbmx5PC8+Lg0KICAgICAgICAgV2l0aCBzcGVjaWFs IG5hbWUgPGxpdGVyYWw+bGlzdDwvPiwgc2hvdyB0aGUgbGlzdCBvZiBidWls dGluIHNjcmlwdHMNCkBAIC0zMjEsMTIgKzMyMywxNCBAQCBwZ2JlbmNoIDxv cHRpb25hbD4gPHJlcGxhY2VhYmxlPm9wdGlvbnM8Lz4gPC9vcHRpb25hbD4g PHJlcGxhY2VhYmxlPmRibmFtZTwvPg0KICAgICAgPC92YXJsaXN0ZW50cnk+ DQogDQogICAgICA8dmFybGlzdGVudHJ5Pg0KLSAgICAgIDx0ZXJtPjxvcHRp b24+LWY8Lz4gPHJlcGxhY2VhYmxlPmZpbGVuYW1lPC8+PC90ZXJtPg0KLSAg ICAgIDx0ZXJtPjxvcHRpb24+LS1maWxlPTwvPjxyZXBsYWNlYWJsZT5maWxl bmFtZTwvPjwvdGVybT4NCisgICAgICA8dGVybT48b3B0aW9uPi1mPC8+IDxy ZXBsYWNlYWJsZT5maWxlbmFtZVtAd2VpZ2h0XTwvPjwvdGVybT4NCisgICAg ICA8dGVybT48b3B0aW9uPi0tZmlsZT08Lz48cmVwbGFjZWFibGU+ZmlsZW5h bWVbQHdlaWdodF08Lz48L3Rlcm0+DQogICAgICAgPGxpc3RpdGVtPg0KICAg ICAgICA8cGFyYT4NCiAgICAgICAgIEFkZCBhIHRyYW5zYWN0aW9uIHNjcmlw dCByZWFkIGZyb20gPHJlcGxhY2VhYmxlPmZpbGVuYW1lPC8+IHRvDQogICAg ICAgICB0aGUgbGlzdCBvZiBleGVjdXRlZCBzY3JpcHRzLg0KKyAgICAgICAg QW4gb3B0aW9uYWwgaW50ZWdlciB3ZWlnaHQgYWZ0ZXIgPGxpdGVyYWw+QDwv PiBhbGxvd3MgdG8gYWRqdXN0IHRoZQ0KKyAgICAgICAgcHJvYmFiaWxpdHkg b2YgZHJhd2luZyB0aGUgdGVzdC4NCiAgICAgICAgIFNlZSBiZWxvdyBmb3Ig ZGV0YWlscy4NCiAgICAgICAgPC9wYXJhPg0KICAgICAgIDwvbGlzdGl0ZW0+ DQpAQCAtNjg5LDYgKzY5Myw5IEBAIHBnYmVuY2ggPG9wdGlvbmFsPiA8cmVw bGFjZWFibGU+b3B0aW9uczwvPiA8L29wdGlvbmFsPiA8cmVwbGFjZWFibGU+ ZGJuYW1lPC8+DQogICAgUGdiZW5jaCBleGVjdXRlcyB0ZXN0IHNjcmlwdHMg Y2hvc2VuIHJhbmRvbWx5IGZyb20gYSBzcGVjaWZpZWQgbGlzdC4NCiAgICBU aGV5IGluY2x1ZGUgYnVpbHQtaW4gc2NyaXB0cyB3aXRoIDxvcHRpb24+LWI8 Lz4gYW5kDQogICAgdXNlci1wcm92aWRlZCBjdXN0b20gc2NyaXB0cyB3aXRo IDxvcHRpb24+LWY8Lz4uDQorICAgRWFjaCBzY3JpcHQgbWF5IGJlIGdpdmVu IGEgcmVsYXRpdmUgd2VpZ2h0IHNwZWNpZmllZCBhZnRlciBhDQorICAgPGxp dGVyYWw+QDwvPiBzbyBhcyB0byBjaGFuZ2UgaXRzIGRyYXdpbmcgcHJvYmFi aWxpdHkuDQorICAgVGhlIGRlZmF1bHQgd2VpZ2h0IGlzIDxsaXRlcmFsPjE8 Lz4uDQogIDwvcGFyYT4NCiANCiAgIDxwYXJhPg0KQEAgLTExMzcsNyArMTE0 NCw3IEBAIG51bWJlciBvZiB0cmFuc2FjdGlvbnMgcGVyIGNsaWVudDogMTAw MA0KIG51bWJlciBvZiB0cmFuc2FjdGlvbnMgYWN0dWFsbHkgcHJvY2Vzc2Vk OiAxMDAwMC8xMDAwMA0KIHRwcyA9IDYxOC43NjQ1NTUgKGluY2x1ZGluZyBj b25uZWN0aW9ucyBlc3RhYmxpc2hpbmcpDQogdHBzID0gNjIyLjk3NzY5OCAo ZXhjbHVkaW5nIGNvbm5lY3Rpb25zIGVzdGFibGlzaGluZykNCi1TUUwgc2Ny aXB0IDE6ICZsdDtidWlsdGluOiBUUEMtQiAoc29ydCBvZikmZ3Q7DQorU1FM IHNjcmlwdCAxLCB3ZWlnaHQgMTogJmx0O2J1aWx0aW46IFRQQy1CIChzb3J0 IG9mKSZndDsNCiAgLSAxMDAwMCB0cmFuc2FjdGlvbnMgKDEwMC4wJSBvZiB0 b3RhbCwgdHBzID0gNjE4Ljc2NDU1NSkNCiAgLSBsYXRlbmN5IGF2ZXJhZ2Ug PSAxNS44NDQgbXMNCiAgLSBsYXRlbmN5IHN0ZGRldiA9IDIuNzE1IG1zDQpk aWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ2JlbmNoL3BnYmVuY2guYyBiL3NyYy9i aW4vcGdiZW5jaC9wZ2JlbmNoLmMNCmluZGV4IDdlYjZhMmQuLjVkMjQ3Njgg MTAwNjQ0DQotLS0gYS9zcmMvYmluL3BnYmVuY2gvcGdiZW5jaC5jDQorKysg Yi9zcmMvYmluL3BnYmVuY2gvcGdiZW5jaC5jDQpAQCAtMTc5LDYgKzE3OSw4 IEBAIGNoYXIJICAgKmxvZ2luID0gTlVMTDsNCiBjaGFyCSAgICpkYk5hbWU7 DQogY29uc3QgY2hhciAqcHJvZ25hbWU7DQogDQorI2RlZmluZSBXU0VQICdA JyAvKiB3ZWlnaHQgc2VwYXJhdG9yICovDQorDQogdm9sYXRpbGUgYm9vbCB0 aW1lcl9leGNlZWRlZCA9IGZhbHNlOwkvKiBmbGFnIGZyb20gc2lnbmFsIGhh bmRsZXIgKi8NCiANCiAvKiB2YXJpYWJsZSBkZWZpbml0aW9ucyAqLw0KQEAg LTI5OSwxMSArMzAxLDE0IEBAIHR5cGVkZWYgc3RydWN0DQogc3RhdGljIHN0 cnVjdA0KIHsNCiAJY29uc3QgY2hhciAqbmFtZTsNCisJaW50IHdlaWdodDsN CiAJQ29tbWFuZCAgICoqY29tbWFuZHM7DQogCVN0YXRzRGF0YSBzdGF0czsN CiB9CXNxbF9zY3JpcHRbTUFYX1NDUklQVFNdOwkvKiBTUUwgc2NyaXB0IGZp bGVzICovDQogc3RhdGljIGludAludW1fc2NyaXB0czsJCS8qIG51bWJlciBv ZiBzY3JpcHRzIGluIHNxbF9zY3JpcHRbXSAqLw0KIHN0YXRpYyBpbnQJbnVt X2NvbW1hbmRzID0gMDsJLyogdG90YWwgbnVtYmVyIG9mIENvbW1hbmQgc3Ry dWN0cyAqLw0KK3N0YXRpYyBpbnQgIHRvdGFsX3dlaWdodCA9IDA7DQorDQog c3RhdGljIGludAlkZWJ1ZyA9IDA7CQkJLyogZGVidWcgZmxhZyAqLw0KIA0K IC8qIERlZmluZSBidWlsdGluIHRlc3Qgc2NyaXB0cyAqLw0KQEAgLTM4OSw5 ICszOTQsOSBAQCB1c2FnZSh2b2lkKQ0KIAkgIiAgLS10YWJsZXNwYWNlPVRB QkxFU1BBQ0UgIGNyZWF0ZSB0YWJsZXMgaW4gdGhlIHNwZWNpZmllZCB0YWJs ZXNwYWNlXG4iDQogCQkgICAiICAtLXVubG9nZ2VkLXRhYmxlcyAgICAgICAg Y3JlYXRlIHRhYmxlcyBhcyB1bmxvZ2dlZCB0YWJsZXNcbiINCiAJCSAgICJc bk9wdGlvbnMgdG8gc2VsZWN0IHdoYXQgdG8gcnVuOlxuIg0KLQkJICAgIiAg LWIsIC0tYnVpbHRpbj1OQU1FICAgICAgIGFkZCBidWl0aW4gc2NyaXB0ICh1 c2UgXCItYiBsaXN0XCIgdG8gZGlzcGxheVxuIg0KLQkJICAgIiAgICAgICAg ICAgICAgICAgICAgICAgICAgIGF2YWlsYWJsZSBzY3JpcHRzKVxuIg0KLQkJ ICAgIiAgLWYsIC0tZmlsZT1GSUxFTkFNRSAgICAgIGFkZCB0cmFuc2FjdGlv biBzY3JpcHQgZnJvbSBGSUxFTkFNRVxuIg0KKwkJICAgIiAgLWIsIC0tYnVp bHRpbj1OQU1FW0BXXSAgIGFkZCB3ZWlnaHRlZCBidWl0aW4gc2NyaXB0ICh1 c2UgXCItYiBsaXN0XCJcbiINCisJCSAgICIgICAgICAgICAgICAgICAgICAg ICAgICAgICB0byBkaXNwbGF5IGF2YWlsYWJsZSBzY3JpcHRzKVxuIg0KKwkJ ICAgIiAgLWYsIC0tZmlsZT1GSUxFTkFNRVtAV10gIGFkZCB3ZWlnaHRlZCB0 cmFuc2FjdGlvbiBzY3JpcHQgZnJvbSBGSUxFTkFNRVxuIg0KIAkJICAgIiAg LU4sIC0tc2tpcC1zb21lLXVwZGF0ZXMgIHNraXAgdXBkYXRlcyBvZiBwZ2Jl bmNoX3RlbGxlcnMgYW5kIHBnYmVuY2hfYnJhbmNoZXNcbiINCiAJCSAgICIg ICAgICAgICAgICAgICAgICAgICAgICAgICAoc2FtZSBhcyBcIi1iIHNpbXBs ZS11cGRhdGVcIilcbiINCiAJCSAgICIgIC1TLCAtLXNlbGVjdC1vbmx5ICAg ICAgICBwZXJmb3JtIFNFTEVDVC1vbmx5IHRyYW5zYWN0aW9uc1xuIg0KQEAg LTEyMzgsMTAgKzEyNDMsMTcgQEAgY2xpZW50RG9uZShDU3RhdGUgKnN0LCBi b29sIG9rKQ0KIHN0YXRpYyBpbnQNCiBjaG9vc2VTY3JpcHQoVFN0YXRlICp0 aHJlYWQpDQogew0KKwlpbnQgaSA9IDAsIHcgPSAwLCB3YzsNCisNCiAJaWYg KG51bV9zY3JpcHRzID09IDEpDQogCQlyZXR1cm4gMDsNCiANCi0JcmV0dXJu IGdldHJhbmQodGhyZWFkLCAwLCBudW1fc2NyaXB0cyAtIDEpOw0KKwl3YyA9 IChpbnQpIGdldHJhbmQodGhyZWFkLCAwLCB0b3RhbF93ZWlnaHQgLSAxKTsN CisJZG8gew0KKwkJdyArPSBzcWxfc2NyaXB0W2krK10ud2VpZ2h0Ow0KKwl9 IHdoaWxlICh3IDw9IHdjKTsNCisNCisJcmV0dXJuIGkgLSAxOw0KIH0NCiAN CiAvKiByZXR1cm4gZmFsc2UgaWZmIGNsaWVudCBzaG91bGQgYmUgZGlzY29u bmVjdGVkICovDQpAQCAtMjY4Myw4ICsyNjk1LDQxIEBAIGZpbmRCdWlsdGlu KGNvbnN0IGNoYXIgKm5hbWUsIGNoYXIgKipkZXNjKQ0KIAlleGl0KDEpOw0K IH0NCiANCisvKiBQb3NzaWJ5IHRydW5jYXRlIG9wdGlvbiBhbmQgcmV0dXJu IHdlaWdodCAqLw0KK3N0YXRpYyBpbnQNCitnZXRXZWlnaHQoY2hhciAqb3B0 aW9uKQ0KK3sNCisJY2hhciAgICpzZXA7DQorCWludAkJd2VpZ2h0Ow0KKw0K KwlpZiAoKHNlcCA9IHN0cnJjaHIob3B0aW9uLCBXU0VQKSkpDQorCXsNCisJ CWNoYXIgKnM7DQorCQkqc2VwKysgPSAnXDAnOw0KKw0KKwkJLyogY2hlY2sg dGhhdCB0aGUgd2VpZ2h0IGlzIGEgcG9zaXRpdmUgaW50ZWdlciAqLw0KKwkJ cyA9IHNlcDsNCisJCXdoaWxlICgnMCcgPD0gKnMgJiYgKnMgPD0gJzknKQ0K KwkJCXMrKzsNCisJCWlmICgqcyAhPSAnXDAnIHx8IHMgPT0gc2VwKQ0KKwkJ ew0KKwkJCS8qIGVtcHR5IG9yIGFueSBvdGhlciBjaGFyICovDQorCQkJZnBy aW50ZihzdGRlcnIsDQorCQkJCQkid2VpZ2h0IGZvciBzY3JpcHQgXCIlc1wi IG11c3QgYmUgYW4gaW50ZWdlciwgZ290IFwiJXNcIlxuIiwNCisJCQkJCW9w dGlvbiwgc2VwKTsNCisJCQlleGl0KDEpOw0KKwkJfQ0KKw0KKwkJd2VpZ2h0 ID0gYXRvaShzZXApOw0KKwl9DQorCWVsc2UNCisJCXdlaWdodCA9IDE7DQor DQorCXJldHVybiB3ZWlnaHQ7DQorfQ0KKw0KIHN0YXRpYyB2b2lkDQotYWRk U2NyaXB0KGNvbnN0IGNoYXIgKm5hbWUsIENvbW1hbmQgKipjb21tYW5kcykN CithZGRTY3JpcHQoY29uc3QgY2hhciAqbmFtZSwgQ29tbWFuZCAqKmNvbW1h bmRzLCBpbnQgd2VpZ2h0KQ0KIHsNCiAJaWYgKGNvbW1hbmRzID09IE5VTEwp DQogCXsNCkBAIC0yNjk5LDYgKzI3NDQsNyBAQCBhZGRTY3JpcHQoY29uc3Qg Y2hhciAqbmFtZSwgQ29tbWFuZCAqKmNvbW1hbmRzKQ0KIAl9DQogDQogCXNx bF9zY3JpcHRbbnVtX3NjcmlwdHNdLm5hbWUgPSBuYW1lOw0KKwlzcWxfc2Ny aXB0W251bV9zY3JpcHRzXS53ZWlnaHQgPSB3ZWlnaHQ7DQogCXNxbF9zY3Jp cHRbbnVtX3NjcmlwdHNdLmNvbW1hbmRzID0gY29tbWFuZHM7DQogCWluaXRT dGF0cygmc3FsX3NjcmlwdFtudW1fc2NyaXB0c10uc3RhdHMsIDAuMCk7DQog CW51bV9zY3JpcHRzKys7DQpAQCAtMjc5MSw5ICsyODM3LDkgQEAgcHJpbnRS ZXN1bHRzKFRTdGF0ZSAqdGhyZWFkcywgU3RhdHNEYXRhICp0b3RhbCwgaW5z dHJfdGltZSB0b3RhbF90aW1lLA0KIA0KIAkJZm9yIChpID0gMDsgaSA8IG51 bV9zY3JpcHRzOyBpKyspDQogCQl7DQotCQkJcHJpbnRmKCJTUUwgc2NyaXB0 ICVkOiAlc1xuIg0KLQkJCSIgLSAiIElOVDY0X0ZPUk1BVCAiIHRyYW5zYWN0 aW9ucyAoJS4xZiUlIG9mIHRvdGFsLCB0cHMgPSAlZilcbiIsDQotCQkJCSAg IGkgKyAxLCBzcWxfc2NyaXB0W2ldLm5hbWUsDQorCQkJcHJpbnRmKCJTUUwg c2NyaXB0ICVkLCB3ZWlnaHQgJWQ6ICVzXG4iDQorCQkJCSIgLSAiSU5UNjRf Rk9STUFUIiB0cmFuc2FjdGlvbnMgKCUuMWYlJSBvZiB0b3RhbCwgdHBzID0g JWYpXG4iLA0KKwkJCQkgICBpICsgMSwgc3FsX3NjcmlwdFtpXS53ZWlnaHQs IHNxbF9zY3JpcHRbaV0ubmFtZSwNCiAJCQkJICAgc3FsX3NjcmlwdFtpXS5z dGF0cy5jbnQsDQogCQkJCSAgIDEwMC4wICogc3FsX3NjcmlwdFtpXS5zdGF0 cy5jbnQgLyB0b3RhbC0+Y250LA0KIAkJCQkgICBzcWxfc2NyaXB0W2ldLnN0 YXRzLmNudCAvIHRpbWVfaW5jbHVkZSk7DQpAQCAtMjg4Nyw2ICsyOTMzLDcg QEAgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpDQogCWluc3RyX3RpbWUJ Y29ubl90b3RhbF90aW1lOw0KIAlpbnQ2NAkJbGF0ZW5jeV9sYXRlID0gMDsN CiAJU3RhdHNEYXRhCXN0YXRzOw0KKwlpbnQJCQl3ZWlnaHQ7DQogCWNoYXIJ ICAgKmRlc2M7DQogDQogCWludAkJCWk7DQpAQCAtMzA2NiwyNyArMzExMywz MiBAQCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikNCiAJCQkJCWV4aXQo MCk7DQogCQkJCX0NCiANCisJCQkJd2VpZ2h0ID0gZ2V0V2VpZ2h0KG9wdGFy Zyk7DQogCQkJCWFkZFNjcmlwdChkZXNjLA0KLQkJCQkJCSAgcHJvY2Vzc19i dWlsdGluKGZpbmRCdWlsdGluKG9wdGFyZywgJmRlc2MpLCBkZXNjKSk7DQor CQkJCQkJICBwcm9jZXNzX2J1aWx0aW4oZmluZEJ1aWx0aW4ob3B0YXJnLCAm ZGVzYyksIGRlc2MpLA0KKwkJCQkJCSAgd2VpZ2h0KTsNCiAJCQkJYmVuY2ht YXJraW5nX29wdGlvbl9zZXQgPSB0cnVlOw0KIAkJCQlpbnRlcm5hbF9zY3Jp cHRfdXNlZCA9IHRydWU7DQogCQkJCWJyZWFrOw0KIAkJCWNhc2UgJ1MnOg0K IAkJCQlhZGRTY3JpcHQoZGVzYywNCiAJCQkJCQkgIHByb2Nlc3NfYnVpbHRp bihmaW5kQnVpbHRpbigic2VsZWN0LW9ubHkiLCAmZGVzYyksDQotCQkJCQkJ CQkJCSAgZGVzYykpOw0KKwkJCQkJCQkJCQkgIGRlc2MpLA0KKwkJCQkJCSAg MSk7DQogCQkJCWJlbmNobWFya2luZ19vcHRpb25fc2V0ID0gdHJ1ZTsNCiAJ CQkJaW50ZXJuYWxfc2NyaXB0X3VzZWQgPSB0cnVlOw0KIAkJCQlicmVhazsN CiAJCQljYXNlICdOJzoNCiAJCQkJYWRkU2NyaXB0KGRlc2MsDQogCQkJCQkJ ICBwcm9jZXNzX2J1aWx0aW4oZmluZEJ1aWx0aW4oInNpbXBsZS11cGRhdGUi LCAmZGVzYyksDQotCQkJCQkJCQkJCSAgZGVzYykpOw0KKwkJCQkJCQkJCQkg IGRlc2MpLA0KKwkJCQkJCSAgMSk7DQogCQkJCWJlbmNobWFya2luZ19vcHRp b25fc2V0ID0gdHJ1ZTsNCiAJCQkJaW50ZXJuYWxfc2NyaXB0X3VzZWQgPSB0 cnVlOw0KIAkJCQlicmVhazsNCiAJCQljYXNlICdmJzoNCi0JCQkJYWRkU2Ny aXB0KG9wdGFyZywgcHJvY2Vzc19maWxlKG9wdGFyZykpOw0KKwkJCQl3ZWln aHQgPSBnZXRXZWlnaHQob3B0YXJnKTsNCisJCQkJYWRkU2NyaXB0KG9wdGFy ZywgcHJvY2Vzc19maWxlKG9wdGFyZyksIHdlaWdodCk7DQogCQkJCWJlbmNo bWFya2luZ19vcHRpb25fc2V0ID0gdHJ1ZTsNCiAJCQkJYnJlYWs7DQogCQkJ Y2FzZSAnRCc6DQpAQCAtMzIyNSwxMSArMzI3NywxNiBAQCBtYWluKGludCBh cmdjLCBjaGFyICoqYXJndikNCiAJaWYgKG51bV9zY3JpcHRzID09IDAgJiYg IWlzX2luaXRfbW9kZSkNCiAJew0KIAkJYWRkU2NyaXB0KGRlc2MsDQotCQkJ CSAgcHJvY2Vzc19idWlsdGluKGZpbmRCdWlsdGluKCJ0cGNiLWxpa2UiLCAm ZGVzYyksIGRlc2MpKTsNCisJCQkJICBwcm9jZXNzX2J1aWx0aW4oZmluZEJ1 aWx0aW4oInRwY2ItbGlrZSIsICZkZXNjKSwgZGVzYyksDQorCQkJCSAgMSk7 DQogCQliZW5jaG1hcmtpbmdfb3B0aW9uX3NldCA9IHRydWU7DQogCQlpbnRl cm5hbF9zY3JpcHRfdXNlZCA9IHRydWU7DQogCX0NCiANCisJLyogY29tcHV0 ZSB0b3RhbF93ZWlnaHQgKi8NCisJZm9yIChpID0gMDsgaSA8IG51bV9zY3Jp cHRzOyBpKyspDQorCQl0b3RhbF93ZWlnaHQgKz0gc3FsX3NjcmlwdFtpXS53 ZWlnaHQ7DQorDQogCS8qIHNob3cgcGVyIHNjcmlwdCBzdGF0cyBpZiBzZXZl cmFsIHNjcmlwdHMgYXJlIHVzZWQgKi8NCiAJaWYgKG51bV9zY3JpcHRzID4g MSkNCiAJCXBlcl9zY3JpcHRfc3RhdHMgPSB0cnVlOw0K --8323329-2092700148-1454345206=:13459 Content-Type: TEXT/x-diff; name=pgbench-script-stats-16-e-prefix.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=pgbench-script-stats-16-e-prefix.patch ZGlmZiAtLWdpdCBhL2RvYy9zcmMvc2dtbC9yZWYvcGdiZW5jaC5zZ21sIGIv ZG9jL3NyYy9zZ21sL3JlZi9wZ2JlbmNoLnNnbWwNCmluZGV4IGNhM2UxNTgu LjUyZGMxNDIgMTAwNjQ0DQotLS0gYS9kb2Mvc3JjL3NnbWwvcmVmL3BnYmVu Y2guc2dtbA0KKysrIGIvZG9jL3NyYy9zZ21sL3JlZi9wZ2JlbmNoLnNnbWwN CkBAIC0yNzEsNiArMjcxLDkgQEAgcGdiZW5jaCA8b3B0aW9uYWw+IDxyZXBs YWNlYWJsZT5vcHRpb25zPC8+IDwvb3B0aW9uYWw+IDxyZXBsYWNlYWJsZT5k Ym5hbWU8Lz4NCiAgICAgICAgIHByb2JhYmlsaXR5IG9mIGRyYXdpbmcgdGhl IHRlc3QuDQogICAgICAgICBBdmFpbGFibGUgYnVpbHRpbiBzY3JpcHRzIGFy ZTogPGxpdGVyYWw+dHBjYi1saWtlPC8+LA0KICAgICAgICAgPGxpdGVyYWw+ c2ltcGxlLXVwZGF0ZTwvPiBhbmQgPGxpdGVyYWw+c2VsZWN0LW9ubHk8Lz4u DQorICAgICAgICBUaGUgcHJvdmlkZWQgPHJlcGxhY2VhYmxlPnNjcmlwdG5h bWU8Lz4gbmVlZHMgb25seSBiZSBhbiB1bmFtYmlndW91cw0KKyAgICAgICAg cHJlZml4IG9mIHRoZSBidWlsdGluIG5hbWUsIGhlbmNlIDxsaXRlcmFsPnNp PC8+IHdvdWxkIGJlIGVub3VnaCB0bw0KKyAgICAgICAgc2VsZWN0IDxsaXRl cmFsPnNpbXBsZS11cGRhdGU8Lz4uDQogICAgICAgICBXaXRoIHNwZWNpYWwg bmFtZSA8bGl0ZXJhbD5saXN0PC8+LCBzaG93IHRoZSBsaXN0IG9mIGJ1aWx0 aW4gc2NyaXB0cw0KICAgICAgICAgYW5kIGV4aXQgaW1tZWRpYXRlbHkuDQog ICAgICAgIDwvcGFyYT4NCmRpZmYgLS1naXQgYS9zcmMvYmluL3BnYmVuY2gv cGdiZW5jaC5jIGIvc3JjL2Jpbi9wZ2JlbmNoL3BnYmVuY2guYw0KaW5kZXgg NWQyNDc2OC4uNzgzY2JmOSAxMDA2NDQNCi0tLSBhL3NyYy9iaW4vcGdiZW5j aC9wZ2JlbmNoLmMNCisrKyBiL3NyYy9iaW4vcGdiZW5jaC9wZ2JlbmNoLmMN CkBAIC0yNjc1LDIyICsyNjc1LDMyIEBAIGxpc3RBdmFpbGFibGVTY3JpcHRz KHZvaWQpDQogCWZwcmludGYoc3RkZXJyLCAiXG4iKTsNCiB9DQogDQorLyog cmV0dXJuIGNvbW1hbmRzIGZvciBzZWxlY3RlZCBidWlsdGluIHNjcmlwdCwg aWYgdW5hbWJpZ3VvdXMgKi8NCiBzdGF0aWMgY2hhciAqDQogZmluZEJ1aWx0 aW4oY29uc3QgY2hhciAqbmFtZSwgY2hhciAqKmRlc2MpDQogew0KLQlpbnQJ CQlpOw0KKwlpbnQJCQlpLCBmb3VuZCA9IDAsIGxlbiA9IHN0cmxlbihuYW1l KTsNCisJY2hhcgkgICAqY29tbWFuZHMgPSBOVUxMOw0KIA0KIAlmb3IgKGkg PSAwOyBpIDwgTl9CVUlMVElOOyBpKyspDQogCXsNCi0JCWlmIChzdHJuY21w KGJ1aWx0aW5fc2NyaXB0W2ldLm5hbWUsIG5hbWUsDQotCQkJCQlzdHJsZW4o YnVpbHRpbl9zY3JpcHRbaV0ubmFtZSkpID09IDApDQorCQlpZiAoc3RybmNt cChidWlsdGluX3NjcmlwdFtpXS5uYW1lLCBuYW1lLCBsZW4pID09IDApDQog CQl7DQogCQkJKmRlc2MgPSBidWlsdGluX3NjcmlwdFtpXS5kZXNjOw0KLQkJ CXJldHVybiBidWlsdGluX3NjcmlwdFtpXS5jb21tYW5kczsNCisJCQljb21t YW5kcyA9IGJ1aWx0aW5fc2NyaXB0W2ldLmNvbW1hbmRzOw0KKwkJCWZvdW5k Kys7DQogCQl9DQogCX0NCiANCi0JZnByaW50ZihzdGRlcnIsICJubyBidWls dGluIHNjcmlwdCBmb3VuZCBmb3IgbmFtZSBcIiVzXCJcbiIsIG5hbWUpOw0K KwlpZiAoZm91bmQgPT0gMSkNCisJCXJldHVybiBjb21tYW5kczsNCisNCisJ LyogZXJyb3IgY2FzZXMgKi8NCisJaWYgKGZvdW5kID09IDApDQorCQlmcHJp bnRmKHN0ZGVyciwgIm5vIGJ1aWx0aW4gc2NyaXB0IGZvdW5kIGZvciBuYW1l IFwiJXNcIlxuIiwgbmFtZSk7DQorCWVsc2UgLyogZm91bmQgPiAxICovDQor CQlmcHJpbnRmKHN0ZGVyciwNCisJCQkJIiVkIGJ1aWx0aW4gc2NyaXB0cyBm b3VuZCBmb3IgcHJlZml4IFwiJXNcIlxuIiwgZm91bmQsIG5hbWUpOw0KIAls aXN0QXZhaWxhYmxlU2NyaXB0cygpOw0KIAlleGl0KDEpOw0KIH0NCg== --8323329-2092700148-1454345206=:13459 Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --8323329-2092700148-1454345206=:13459--