From 3384f3b77e6fe71f8b8f4e6b74fb48d54d6b94f9 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 May 2020 21:07:38 +0300
Subject: [PATCH] Progress on task

---
 .../MergingSortedBlockInputStream.cpp          | 18 +++++++-----------
 .../Merges/MergingSortedTransform.cpp          | 18 +++++++-----------
 .../MergeTree/MergeTreeDataMergerMutator.cpp   | 11 ++++-------
 3 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/src/DataStreams/MergingSortedBlockInputStream.cpp b/src/DataStreams/MergingSortedBlockInputStream.cpp
index f78522ccff..bba58fd19a 100644
--- a/src/DataStreams/MergingSortedBlockInputStream.cpp
+++ b/src/DataStreams/MergingSortedBlockInputStream.cpp
@@ -263,17 +263,13 @@ void MergingSortedBlockInputStream::readSuffixImpl()
     const BlockStreamProfileInfo & profile_info = getProfileInfo();
     double seconds = profile_info.total_stopwatch.elapsedSeconds();
 
-    std::stringstream message;
-    message << std::fixed << std::setprecision(2)
-        << "Merge sorted " << profile_info.blocks << " blocks, " << profile_info.rows << " rows"
-        << " in " << seconds << " sec.";
-
-    if (seconds)
-        message << ", "
-            << profile_info.rows / seconds << " rows/sec., "
-            << profile_info.bytes / 1000000.0 / seconds << " MB/sec.";
-
-    LOG_DEBUG(log, message.str());
+    if (!seconds)
+        LOG_DEBUG_FORMATTED(log, "Merge sorted {} blocks, {} rows in 0 sec.", profile_info.blocks, profile_info.rows);
+    else
+        LOG_DEBUG_FORMATTED(log, "Merge sorted {} blocks, {} rows in {} sec., {} rows/sec., {}/sec",
+            profile_info.blocks, profile_info.rows, seconds,
+            profile_info.rows / seconds,
+            formatReadableSizeWithBinarySuffix(profile_info.bytes / seconds));
 }
 
 }
diff --git a/src/Processors/Merges/MergingSortedTransform.cpp b/src/Processors/Merges/MergingSortedTransform.cpp
index c7597e4da6..11246c30aa 100644
--- a/src/Processors/Merges/MergingSortedTransform.cpp
+++ b/src/Processors/Merges/MergingSortedTransform.cpp
@@ -47,17 +47,13 @@ void MergingSortedTransform::onFinish()
 
     double seconds = total_stopwatch.elapsedSeconds();
 
-    std::stringstream message;
-    message << std::fixed << std::setprecision(2)
-            << "Merge sorted " << merged_data.totalChunks() << " blocks, " << merged_data.totalMergedRows() << " rows"
-            << " in " << seconds << " sec.";
-
-    if (seconds != 0)
-        message << ", "
-                << merged_data.totalMergedRows() / seconds << " rows/sec., "
-                << merged_data.totalAllocatedBytes() / 1000000.0 / seconds << " MB/sec.";
-
-    LOG_DEBUG(log, message.str());
+    if (!seconds)
+        LOG_DEBUG_FORMATTED(log, "Merge sorted {} blocks, {} rows in 0 sec.", merged_data.totalChunks(), merged_data.totalMergedRows());
+    else
+        LOG_DEBUG_FORMATTED(log, "Merge sorted {} blocks, {} rows in {} sec., {} rows/sec., {}/sec",
+            merged_data.totalChunks(), merged_data.totalMergedRows(), seconds,
+            merged_data.totalMergedRows() / seconds,
+            formatReadableSizeWithBinarySuffix(merged_data.totalAllocatedBytes() / seconds));
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index 11cac2245c..e124189b31 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -949,13 +949,10 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
     /// Print overall profiling info. NOTE: it may duplicates previous messages
     {
         double elapsed_seconds = merge_entry->watch.elapsedSeconds();
-        LOG_DEBUG(log,
-            "Merge sorted " << merge_entry->rows_read << " rows"
-            << ", containing " << all_column_names.size() << " columns"
-            << " (" << merging_column_names.size() << " merged, " << gathering_column_names.size() << " gathered)"
-            << " in " << elapsed_seconds << " sec., "
-            << merge_entry->rows_read / elapsed_seconds << " rows/sec., "
-            << merge_entry->bytes_read_uncompressed / 1000000.0 / elapsed_seconds << " MB/sec.");
+        LOG_DEBUG_FORMATTED(log, "Merge sorted {} rows, containing {} columns ({} merged, {} gathered) in {} sec., {} rows/sec., {}/sec.",
+            merge_entry->rows_read, all_column_names.size(), merging_column_names.size(), gathering_column_names.size(),
+            elapsed_seconds, merge_entry->rows_read / elapsed_seconds,
+            formatReadableSizeWithBinarySuffix(merge_entry->bytes_read_uncompressed / elapsed_seconds));
     }
 
     if (merge_alg != MergeAlgorithm::Vertical)
-- 
GitLab