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>
This commit is contained in:
Heikki Linnakangas 2016-09-21 13:24:13 +03:00
parent 65c6556384
commit 2a7f4f7643

View File

@ -3260,6 +3260,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);
@ -3298,7 +3299,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);
}
@ -3326,7 +3327,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,