From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Thu, 30 Jul 2015 11:50:51 +0000 (+0300)
Subject: Fix calculation of latency of pgbench backslash commands.
X-Git-Tag: REL9_5_ALPHA2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e75be6660dbaaf2da09b98c54d47c9fe0ac8cfa;p=postgresql

Fix calculation of latency of pgbench backslash commands.

When we loop back to the top of doCustom after processing a backslash
command, we must reset the "now" timestamp, because that's used to
calculate the time spent executing the previous command.

Report and fix by Fabien Coelho. Backpatch to 9.5, where this was broken.
---

diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index ceaf14cde1..d48e5b7844 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -1154,11 +1154,12 @@ doCustom(TState *thread, CState *st, instr_time *conn_time, FILE *logfile, AggVa
 	 * first time it's needed, and reuse the same value throughout this
 	 * function after that. This also ensures that e.g. the calculated latency
 	 * reported in the log file and in the totals are the same. Zero means
-	 * "not set yet".
+	 * "not set yet". Reset "now" when we step to the next command with "goto
+	 * top", though.
 	 */
+top:
 	INSTR_TIME_SET_ZERO(now);
 
-top:
 	commands = sql_files[st->use_file];
 
 	/*