From a4f3435aeb45a1b56531171d2364a620ff134ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Ko=C5=82aczkowski?= <pkolaczk@gmail.com>
Date: Mon, 22 Jul 2024 10:19:59 +0200
Subject: [PATCH] Minor report formatting adjustments

(cherry picked from commit eee13939437f83174bd1cfdf075cab3402ba785e)
---
 src/report.rs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/report.rs b/src/report.rs
index 26b8d80..23bc633 100644
--- a/src/report.rs
+++ b/src/report.rs
@@ -490,16 +490,22 @@ impl<'a> Display for RunConfigCmp<'a> {
             self.line("Cluster", "", |conf| {
                 OptionDisplay(conf.cluster_name.clone())
             }),
+            self.line("Datacenter", "", |conf| {
+                conf.connection.datacenter.clone().unwrap_or_default()
+            }),
             self.line("Cass. version", "", |conf| {
                 OptionDisplay(conf.cass_version.clone())
             }),
-            self.line("Tags", "", |conf| conf.tags.iter().join(", ")),
             self.line("Workload", "", |conf| {
                 conf.workload
                     .file_name()
                     .map(|n| n.to_string_lossy().to_string())
                     .unwrap_or_default()
             }),
+            self.line("Consistency", "", |conf| {
+                conf.connection.consistency.scylla_consistency().to_string()
+            }),
+            self.line("Tags", "", |conf| conf.tags.iter().join(", ")),
         ];
 
         for l in lines {
@@ -532,12 +538,6 @@ impl<'a> Display for RunConfigCmp<'a> {
         }
 
         let lines: Vec<Box<dyn Display>> = vec![
-            self.line("Datacenter", "", |conf| {
-                conf.connection.datacenter.clone().unwrap_or_default()
-            }),
-            self.line("Consistency", "", |conf| {
-                conf.connection.consistency.scylla_consistency().to_string()
-            }),
             self.line("Threads", "", |conf| Quantity::from(conf.threads)),
             self.line("Connections", "", |conf| {
                 Quantity::from(conf.connection.count)
@@ -588,8 +588,8 @@ impl<'a> Display for RunConfigCmp<'a> {
 
 pub fn print_log_header() {
     println!("{}", fmt_section_header("LOG"));
-    println!("{}", style("    Time      Cycles      Errors  Throughput         ───────────────────────────── Latency [ms] ────────────────────────────").yellow().bold().for_stdout());
-    println!("{}", style("     [s]        [op]        [op]      [op/s]                 Min        50        75        90        95        99       Max").yellow().for_stdout());
+    println!("{}", style("    Time    Cycles    Errors    Thrpt.     ────────────────────────────────── Latency [ms/op] ──────────────────────────────").yellow().bold().for_stdout());
+    println!("{}", style("     [s]      [op]      [op]    [op/s]             Min        50        75        90        95        99      99.9       Max").yellow().for_stdout());
 }
 
 impl Display for Sample {
@@ -616,7 +616,7 @@ impl Display for Sample {
         }
         write!(
             f,
-            "{:8.3} {:11.0} {:11.0} {:11.0}           {:9.3} {:9.3} {:9.3} {:9.3} {:9.3} {:9.3} {:9.3}",
+            "{:8.3} {:9.0} {:9.0} {:9.0}       {:9.3} {:9.3} {:9.3} {:9.3} {:9.3} {:9.3} {:9.3} {:9.3}",
             self.time_s + self.duration_s,
             self.cycle_count,
             self.cycle_error_count,
@@ -627,6 +627,7 @@ impl Display for Sample {
             self.cycle_time_percentiles[Percentile::P90 as usize],
             self.cycle_time_percentiles[Percentile::P95 as usize],
             self.cycle_time_percentiles[Percentile::P99 as usize],
+            self.cycle_time_percentiles[Percentile::P99_9 as usize],
             self.cycle_time_percentiles[Percentile::Max as usize]
         )
     }