Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ltnE4-0000vv-8d for pgsql-hackers@arkaria.postgresql.org; Thu, 17 Jun 2021 08:18:12 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1ltnE2-0001uG-Up for pgsql-hackers@arkaria.postgresql.org; Thu, 17 Jun 2021 08:18:10 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ltnE2-0001u7-J4 for pgsql-hackers@lists.postgresql.org; Thu, 17 Jun 2021 08:18:10 +0000 Received: from sfr-1.cri.mines-paristech.fr ([77.158.180.225] helo=smtp.cri.ensmp.fr) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ltnDx-0000c0-S2 for pgsql-hackers@postgresql.org; Thu, 17 Jun 2021 08:18:09 +0000 Received: from petersbourg.cri.ensmp.fr (petersbourg.cri.ensmp.fr [10.2.14.5]) by smtp.cri.ensmp.fr (Postfix) with ESMTPSA id 04099C0227; Thu, 17 Jun 2021 10:19:58 +0200 (CEST) Date: Thu, 17 Jun 2021 10:18:03 +0200 (CEST) From: Fabien COELHO X-X-Sender: fabien@pseudo Reply-To: Fabien COELHO To: Michael Paquier cc: Thomas Munro , Gregory Smith , PostgreSQL-development , david.christensen@crunchydata.com Subject: Re: pgbench logging broken by time logic changes In-Reply-To: Message-ID: References: User-Agent: Alpine 2.22 (DEB 394 2020-01-19) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="2056645051-1270177212-1623917883=:2693553" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --2056645051-1270177212-1623917883=:2693553 Content-Type: text/plain; format=flowed; charset=US-ASCII >> Wouldn't it be better to put all those fixes into the same bag? > > Attached. Even better if the patch is not empty. -- Fabien. --2056645051-1270177212-1623917883=:2693553 Content-Type: text/x-diff; name=pgbench-log-fix-6.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=pgbench-log-fix-6.patch ZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdiZW5jaC9wZ2JlbmNoLmMgYi9zcmMv YmluL3BnYmVuY2gvcGdiZW5jaC5jDQppbmRleCBkNzQ3OTkyNWNiLi4zZGY5 MmJkZDJiIDEwMDY0NA0KLS0tIGEvc3JjL2Jpbi9wZ2JlbmNoL3BnYmVuY2gu Yw0KKysrIGIvc3JjL2Jpbi9wZ2JlbmNoL3BnYmVuY2guYw0KQEAgLTM0Miw2 ICszNDIsMTIgQEAgdHlwZWRlZiBzdHJ1Y3QgU3RhdHNEYXRhDQogCVNpbXBs ZVN0YXRzIGxhZzsNCiB9IFN0YXRzRGF0YTsNCiANCisvKg0KKyAqIEZvciBk aXNwbGF5aW5nIGVwb2NoIHRpbWVzdGFtcCwgYXMgc29tZSB0aW1lIGZ1bmN0 aW9ucyBtYXkgaGF2ZQ0KKyAqIGFub3RoZXIgcmVmZXJlbmNlLg0KKyAqLw0K K3BnX3RpbWVfdXNlY190IGVwb2NoX3NoaWZ0Ow0KKw0KIC8qDQogICogU3Ry dWN0IHRvIGtlZXAgcmFuZG9tIHN0YXRlLg0KICAqLw0KQEAgLTY0OCw3ICs2 NTQsNyBAQCBzdGF0aWMgdm9pZCBzZXREb3VibGVWYWx1ZShQZ0JlbmNoVmFs dWUgKnB2LCBkb3VibGUgZHZhbCk7DQogc3RhdGljIGJvb2wgZXZhbHVhdGVF eHByKENTdGF0ZSAqc3QsIFBnQmVuY2hFeHByICpleHByLA0KIAkJCQkJCSBQ Z0JlbmNoVmFsdWUgKnJldHZhbCk7DQogc3RhdGljIENvbm5lY3Rpb25TdGF0 ZUVudW0gZXhlY3V0ZU1ldGFDb21tYW5kKENTdGF0ZSAqc3QsIHBnX3RpbWVf dXNlY190ICpub3cpOw0KLXN0YXRpYyB2b2lkIGRvTG9nKFRTdGF0ZSAqdGhy ZWFkLCBDU3RhdGUgKnN0LA0KK3N0YXRpYyB2b2lkIGRvTG9nKFRTdGF0ZSAq dGhyZWFkLCBDU3RhdGUgKnN0LCBib29sIHR4LA0KIAkJCQkgIFN0YXRzRGF0 YSAqYWdnLCBib29sIHNraXBwZWQsIGRvdWJsZSBsYXRlbmN5LCBkb3VibGUg bGFnKTsNCiBzdGF0aWMgdm9pZCBwcm9jZXNzWGFjdFN0YXRzKFRTdGF0ZSAq dGhyZWFkLCBDU3RhdGUgKnN0LCBwZ190aW1lX3VzZWNfdCAqbm93LA0KIAkJ CQkJCQkgYm9vbCBza2lwcGVkLCBTdGF0c0RhdGEgKmFnZyk7DQpAQCAtMzc2 NSwxNiArMzc3MSw0NyBAQCBleGVjdXRlTWV0YUNvbW1hbmQoQ1N0YXRlICpz dCwgcGdfdGltZV91c2VjX3QgKm5vdykNCiAJcmV0dXJuIENTVEFURV9FTkRf Q09NTUFORDsNCiB9DQogDQorLyogcHJpbnQgYWdncmVnYXRlZCByZXBvcnQg dG8gbG9nZmlsZSAqLw0KK3N0YXRpYyB2b2lkDQorbG9nQWdnKEZJTEUgKmxv Z2ZpbGUsIFN0YXRzRGF0YSAqYWdnKQ0KK3sNCisJZnByaW50Zihsb2dmaWxl LCBJTlQ2NF9GT1JNQVQgIiAiIElOVDY0X0ZPUk1BVCAiICUuMGYgJS4wZiAl LjBmICUuMGYiLA0KKwkJCWFnZy0+c3RhcnRfdGltZSArIGVwb2NoX3NoaWZ0 LA0KKwkJCWFnZy0+Y250LA0KKwkJCWFnZy0+bGF0ZW5jeS5zdW0sDQorCQkJ YWdnLT5sYXRlbmN5LnN1bTIsDQorCQkJYWdnLT5sYXRlbmN5Lm1pbiwNCisJ CQlhZ2ctPmxhdGVuY3kubWF4KTsNCisJaWYgKHRocm90dGxlX2RlbGF5KQ0K Kwl7DQorCQlmcHJpbnRmKGxvZ2ZpbGUsICIgJS4wZiAlLjBmICUuMGYgJS4w ZiIsDQorCQkJCWFnZy0+bGFnLnN1bSwNCisJCQkJYWdnLT5sYWcuc3VtMiwN CisJCQkJYWdnLT5sYWcubWluLA0KKwkJCQlhZ2ctPmxhZy5tYXgpOw0KKwkJ aWYgKGxhdGVuY3lfbGltaXQpDQorCQkJZnByaW50Zihsb2dmaWxlLCAiICIg SU5UNjRfRk9STUFULCBhZ2ctPnNraXBwZWQpOw0KKwl9DQorCWZwdXRjKCdc bicsIGxvZ2ZpbGUpOw0KK30NCisNCiAvKg0KICAqIFByaW50IGxvZyBlbnRy eSBhZnRlciBjb21wbGV0aW5nIG9uZSB0cmFuc2FjdGlvbi4NCiAgKg0KKyAq IFBhcmFtIHR4IHRlbGxzIHdoZXRoZXIgdGhlIGNhbGwgYWN0dWFsbHkgcmVw cmVzZW50cyBhIHRyYW5zYWN0aW9uLA0KKyAqIG9yIGlmIGl0IGlzIHVzZWQg dG8gZmx1c2ggYWdncmVnYXRlZCBsb2dzLg0KKyAqDQorICogVGhlIGZ1bmN0 aW9uIGJlaGF2aW9yIGNoYW5nZXMgZGVwZW5kaW5nIG9uIHNhbXBsZV9yYXRl IChhIGZyYWN0aW9uIG9mDQorICogdHJhbnNhY3Rpb24gaXMgcmVwb3J0ZWQp IGFuZCBhZ2dfaW50ZXJ2YWwgKHRyYW5zYWN0aW9ucyBhcmUgYWdncmVnYXRl ZA0KKyAqIGFuZCByZXBvcnRlZCBvbmNlIGV2ZXJ5IGFnZ19pbnRlcnZhbCBz ZWNvbmRzKS4NCisgKg0KICAqIFdlIHByaW50IFVuaXgtZXBvY2ggdGltZXN0 YW1wcyBpbiB0aGUgbG9nLCBzbyB0aGF0IGVudHJpZXMgY2FuIGJlDQogICog Y29ycmVsYXRlZCBhZ2FpbnN0IG90aGVyIGxvZ3MuICBPbiBzb21lIHBsYXRm b3JtcyB0aGlzIGNvdWxkIGJlIG9idGFpbmVkDQogICogZnJvbSB0aGUgY2Fs bGVyLCBidXQgcmF0aGVyIHRoYW4gZ2V0IGVudGFuZ2xlZCB3aXRoIHRoYXQs IHdlIGp1c3QgZWF0DQogICogdGhlIGNvc3Qgb2YgYW4gZXh0cmEgc3lzY2Fs bCBpbiBhbGwgY2FzZXMuDQogICovDQogc3RhdGljIHZvaWQNCi1kb0xvZyhU U3RhdGUgKnRocmVhZCwgQ1N0YXRlICpzdCwNCitkb0xvZyhUU3RhdGUgKnRo cmVhZCwgQ1N0YXRlICpzdCwgYm9vbCB0eCwNCiAJICBTdGF0c0RhdGEgKmFn ZywgYm9vbCBza2lwcGVkLCBkb3VibGUgbGF0ZW5jeSwgZG91YmxlIGxhZykN CiB7DQogCUZJTEUJICAgKmxvZ2ZpbGUgPSB0aHJlYWQtPmxvZ2ZpbGU7DQpA QCAtMzc5Myw0MyArMzgzMCwzNiBAQCBkb0xvZyhUU3RhdGUgKnRocmVhZCwg Q1N0YXRlICpzdCwNCiAJLyogc2hvdWxkIHdlIGFnZ3JlZ2F0ZSB0aGUgcmVz dWx0cyBvciBub3Q/ICovDQogCWlmIChhZ2dfaW50ZXJ2YWwgPiAwKQ0KIAl7 DQorCQlwZ190aW1lX3VzZWNfdAluZXh0Ow0KKw0KIAkJLyoNCiAJCSAqIExv b3AgdW50aWwgd2UgcmVhY2ggdGhlIGludGVydmFsIG9mIHRoZSBjdXJyZW50 IG1vbWVudCwgYW5kIHByaW50DQogCQkgKiBhbnkgZW1wdHkgaW50ZXJ2YWxz IGluIGJldHdlZW4gKHRoaXMgbWF5IGhhcHBlbiB3aXRoIHZlcnkgbG93IHRw cywNCiAJCSAqIGUuZy4gLS1yYXRlPTAuMSkuDQogCQkgKi8NCi0NCi0JCXdo aWxlIChhZ2ctPnN0YXJ0X3RpbWUgKyBhZ2dfaW50ZXJ2YWwgPD0gbm93KQ0K KwkJd2hpbGUgKChuZXh0ID0gYWdnLT5zdGFydF90aW1lICsgYWdnX2ludGVy dmFsICogSU5UNjRDT05TVCgxMDAwMDAwKSkgPD0gbm93KQ0KIAkJew0KLQkJ CS8qIHByaW50IGFnZ3JlZ2F0ZWQgcmVwb3J0IHRvIGxvZ2ZpbGUgKi8NCi0J CQlmcHJpbnRmKGxvZ2ZpbGUsIElOVDY0X0ZPUk1BVCAiICIgSU5UNjRfRk9S TUFUICIgJS4wZiAlLjBmICUuMGYgJS4wZiIsDQotCQkJCQlhZ2ctPnN0YXJ0 X3RpbWUsDQotCQkJCQlhZ2ctPmNudCwNCi0JCQkJCWFnZy0+bGF0ZW5jeS5z dW0sDQotCQkJCQlhZ2ctPmxhdGVuY3kuc3VtMiwNCi0JCQkJCWFnZy0+bGF0 ZW5jeS5taW4sDQotCQkJCQlhZ2ctPmxhdGVuY3kubWF4KTsNCi0JCQlpZiAo dGhyb3R0bGVfZGVsYXkpDQotCQkJew0KLQkJCQlmcHJpbnRmKGxvZ2ZpbGUs ICIgJS4wZiAlLjBmICUuMGYgJS4wZiIsDQotCQkJCQkJYWdnLT5sYWcuc3Vt LA0KLQkJCQkJCWFnZy0+bGFnLnN1bTIsDQotCQkJCQkJYWdnLT5sYWcubWlu LA0KLQkJCQkJCWFnZy0+bGFnLm1heCk7DQotCQkJCWlmIChsYXRlbmN5X2xp bWl0KQ0KLQkJCQkJZnByaW50Zihsb2dmaWxlLCAiICIgSU5UNjRfRk9STUFU LCBhZ2ctPnNraXBwZWQpOw0KLQkJCX0NCi0JCQlmcHV0YygnXG4nLCBsb2dm aWxlKTsNCisJCQlsb2dBZ2cobG9nZmlsZSwgYWdnKTsNCiANCiAJCQkvKiBy ZXNldCBkYXRhIGFuZCBtb3ZlIHRvIG5leHQgaW50ZXJ2YWwgKi8NCi0JCQlp bml0U3RhdHMoYWdnLCBhZ2ctPnN0YXJ0X3RpbWUgKyBhZ2dfaW50ZXJ2YWwp Ow0KKwkJCWluaXRTdGF0cyhhZ2csIG5leHQpOw0KIAkJfQ0KIA0KLQkJLyog YWNjdW11bGF0ZSB0aGUgY3VycmVudCB0cmFuc2FjdGlvbiAqLw0KLQkJYWNj dW1TdGF0cyhhZ2csIHNraXBwZWQsIGxhdGVuY3ksIGxhZyk7DQorCQlpZiAo dHgpDQorCQkJLyogYWNjdW11bGF0ZSB0aGUgY3VycmVudCB0cmFuc2FjdGlv biAqLw0KKwkJCWFjY3VtU3RhdHMoYWdnLCBza2lwcGVkLCBsYXRlbmN5LCBs YWcpOw0KKwkJZWxzZQ0KKwkJCS8qIGZpbmFsIGNhbGwgdG8gc2hvdyB0aGUg bGFzdCBhZ2dyZWdhdGUgKi8NCisJCQlsb2dBZ2cobG9nZmlsZSwgYWdnKTsN CiAJfQ0KIAllbHNlDQogCXsNCisJCS8qIHN3aXRjaCB0byBlcG9jaCAqLw0K KwkJbm93ICs9IGVwb2NoX3NoaWZ0Ow0KKw0KKwkJLyogIXR4IG9ubHkgdXNl ZCBmb3IgYWdncmVnYXRlZCBkYXRhICovDQorCQlBc3NlcnQodHgpOw0KKw0K IAkJLyogbm8sIHByaW50IHJhdyB0cmFuc2FjdGlvbnMgKi8NCiAJCWlmIChz a2lwcGVkKQ0KIAkJCWZwcmludGYobG9nZmlsZSwgIiVkICIgSU5UNjRfRk9S TUFUICIgc2tpcHBlZCAlZCAiIElOVDY0X0ZPUk1BVCAiICINCkBAIC0zODg5 LDcgKzM5MTksNyBAQCBwcm9jZXNzWGFjdFN0YXRzKFRTdGF0ZSAqdGhyZWFk LCBDU3RhdGUgKnN0LCBwZ190aW1lX3VzZWNfdCAqbm93LA0KIAlzdC0+Y250 Kys7DQogDQogCWlmICh1c2VfbG9nKQ0KLQkJZG9Mb2codGhyZWFkLCBzdCwg YWdnLCBza2lwcGVkLCBsYXRlbmN5LCBsYWcpOw0KKwkJZG9Mb2codGhyZWFk LCBzdCwgdHJ1ZSwgYWdnLCBza2lwcGVkLCBsYXRlbmN5LCBsYWcpOw0KIA0K IAkvKiBYWFggY291bGQgdXNlIGEgbXV0ZXggaGVyZSwgYnV0IHdlIGNob29z ZSBub3QgdG8gKi8NCiAJaWYgKHBlcl9zY3JpcHRfc3RhdHMpDQpAQCAtNTc3 NSw2ICs1ODA1LDExIEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQ0K IAljaGFyCSAgICplbnY7DQogDQogCWludAkJCWV4aXRfY29kZSA9IDA7DQor CXN0cnVjdCB0aW1ldmFsIHR2Ow0KKw0KKwkvKiByZWNvcmQgc2hpZnQgYmV0 d2VlbiBlcG9jaCBhbmQgbm93KCkgKi8NCisJZ2V0dGltZW9mZGF5KCZ0diwg TlVMTCk7DQorCWVwb2NoX3NoaWZ0ID0gdHYudHZfc2VjICogMTAwMDAwMCAr IHR2LnR2X3VzZWMgLSBwZ190aW1lX25vdygpOw0KIA0KIAlwZ19sb2dnaW5n X2luaXQoYXJndlswXSk7DQogCXByb2duYW1lID0gZ2V0X3Byb2duYW1lKGFy Z3ZbMF0pOw0KQEAgLTY3OTQsOCArNjgyOSw5IEBAIGRvbmU6DQogCQlpZiAo YWdnX2ludGVydmFsID4gMCkNCiAJCXsNCiAJCQkvKiBsb2cgYWdncmVnYXRl ZCBidXQgbm90IHlldCByZXBvcnRlZCB0cmFuc2FjdGlvbnMgKi8NCi0JCQlk b0xvZyh0aHJlYWQsIHN0YXRlLCAmYWdncywgZmFsc2UsIDAsIDApOw0KKwkJ CWRvTG9nKHRocmVhZCwgc3RhdGUsIGZhbHNlLCAmYWdncywgZmFsc2UsIDAu MCwgMC4wKTsNCiAJCX0NCisNCiAJCWZjbG9zZSh0aHJlYWQtPmxvZ2ZpbGUp Ow0KIAkJdGhyZWFkLT5sb2dmaWxlID0gTlVMTDsNCiAJfQ0K --2056645051-1270177212-1623917883=:2693553--