Print test parameters like "foo: 123", and results like "foo = 123".

The way "latency average" was printed was differently if it was calculated
from the overall run time or was measured on a per-transaction basis.
Also, the per-script weight is a test parameter, rather than a result, so
use the "weight: %f" style for that.

Backpatch to 9.6, since the inconsistency on "latency average" was
introduced there.

Fabien Coelho

Discussion: <alpine.DEB.2.20.1607131015370.7486@sto>

diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index 254ca95f3de2760929baca8ae1b25009864b6c78..531671a00b4ccfbd48d7a40e2b9f9e9e3ee870f8 100644 (file)
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -3257,6 +3257,7 @@ printResults(TState *threads, StatsData *total, instr_time total_time,
        tps_exclude = total->cnt / (time_include -
                                                (INSTR_TIME_GET_DOUBLE(conn_total_time) / nclients));
 
+       /* Report test parameters. */
        printf("transaction type: %s\n",
                   num_scripts == 1 ? sql_script[0].desc : "multiple scripts");
        printf("scaling factor: %d\n", scale);
@@ -3295,7 +3296,7 @@ printResults(TState *threads, StatsData *total, instr_time total_time,
        else
        {
                /* no measurement, show average latency computed from run time */
-               printf("latency average: %.3f ms\n",
+               printf("latency average = %.3f ms\n",
                           1000.0 * time_include * nclients / total->cnt);
        }
 
@@ -3323,7 +3324,7 @@ printResults(TState *threads, StatsData *total, instr_time total_time,
                {
                        if (num_scripts > 1)
                                printf("SQL script %d: %s\n"
-                                          " - weight = %d (targets %.1f%% of total)\n"
+                                          " - weight: %d (targets %.1f%% of total)\n"
                                           " - " INT64_FORMAT " transactions (%.1f%% of total, tps = %f)\n",
                                           i + 1, sql_script[i].desc,
                                           sql_script[i].weight,