Fix aggregate logging of pgbench.

Remove meaningless "failures" column from the aggregate logging. It
was just a sum of "serialization failures" and "deadlock failures".
Pointed out by Tom Lane. Patch reviewed by Fabien COELHO.

Discussion: https://postgr.es/m/4183048.1649536705%40sss.pgh.pa.us

diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml
index 387a836287012eeea69352b1f37a242a87d80d5b..dbae4e2321a2b8dc1c3ffd81dc37bbbabf008dfb 100644 (file)
--- a/doc/src/sgml/ref/pgbench.sgml
+++ b/doc/src/sgml/ref/pgbench.sgml
@@ -2591,15 +2591,6 @@ END;
      </listitem>
     </varlistentry>
 
-    <varlistentry>
-     <term><replaceable>failures</replaceable></term>
-     <listitem>
-      <para>
-       number of transactions that ended with a failed SQL command
-      </para>
-     </listitem>
-    </varlistentry>
-
     <varlistentry>
      <term><replaceable>serialization_failures</replaceable></term>
      <listitem>
@@ -2629,8 +2620,8 @@ END;
 <screen>
 <userinput>pgbench --aggregate-interval=10 --time=20 --client=10 --log --rate=1000 --latency-limit=10 --failures-detailed --max-tries=10 test</userinput>
 
-1649114136 5815 27552565 177846919143 1078 21716 2756787 7264696105 0 9661 0 7854 31472 4022 4022 0
-1649114146 5958 28460110 182785513108 1083 20391 2539395 6411761497 0 7268 0 8127 32595 4101 4101 0
+1650260552 5178 26171317 177284491527 1136 44462 2647617 7321113867 0 9866 64 7564 28340 4148 0
+1650260562 4808 25573984 220121792172 1171 62083 3037380 9666800914 0 9998 598 7392 26621 4527 0
 </screen>
   </para>
 

diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index e63cea56a1cc19a916ce10d908dd9397e33d1bd5..f8bcb1ab6deabcf407ff053b7d1248659f4c8a58 100644 (file)
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -4498,7 +4498,6 @@ doLog(TState *thread, CState *st,
                        int64           skipped = 0;
                        int64           serialization_failures = 0;
                        int64           deadlock_failures = 0;
-                       int64           serialization_or_deadlock_failures = 0;
                        int64           retried = 0;
                        int64           retries = 0;
 
@@ -4540,9 +4539,7 @@ doLog(TState *thread, CState *st,
                                serialization_failures = agg->serialization_failures;
                                deadlock_failures = agg->deadlock_failures;
                        }
-                       serialization_or_deadlock_failures = serialization_failures + deadlock_failures;
-                       fprintf(logfile, " " INT64_FORMAT " " INT64_FORMAT " " INT64_FORMAT,
-                                       serialization_or_deadlock_failures,
+                       fprintf(logfile, " " INT64_FORMAT " " INT64_FORMAT,
                                        serialization_failures,
                                        deadlock_failures);