fix style

CheSema · CheSema · commit 29d4585c3df5 · 2025-05-22T11:57:22.000+02:00
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -4839,21 +4839,6 @@ Strings getPartFiles(MergeTreeData::MutableDataPartPtr & part, bool with_project
 }
 
 
-String getDebugString(const Strings & arg)
-{
-    WriteBufferFromOwnString out;
-    {
-        auto it = arg.begin();
-        if (it != arg.end())
-            out << *it;
-        ++it;
-        for (; it != arg.end(); ++it)
-            out << ", " << *it;
-    }
-    return out.str();
-}
-
-
 void MergeTreeData::checkChecksumsFileIsConsistentWithFileSystem(MutableDataPartPtr & part)
 {
     Strings files_in_part = getPartFiles(part);
@@ -4877,18 +4862,16 @@ void MergeTreeData::checkChecksumsFileIsConsistentWithFileSystem(MutableDataPart
     LOG_DEBUG(getLogger("checkChecksumsFileIsConsistentWithFileSystem"), "checksums has {} files, new part has {} files, files in checksums: {}, files in part: {}",
         part->checksums.files.size(),
         files_in_part.size(),
-        getDebugString(files_in_checksums),
-        getDebugString(files_in_part));
+        fmt::join(files_in_checksums, ", "),
+        fmt::join(files_in_part, ", "));
 
     if (files_in_part != files_in_checksums)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "checksums.txt file is not consistent with the files on file system, checksums.txt file has {} files, part '{}' has {} files, files in checksums: {}, files in part: {}",
             part->checksums.files.size(),
             part->name,
             files_in_part.size(),
-            getDebugString(files_in_checksums),
-            getDebugString(files_in_part));
-
-
+            fmt::join(files_in_checksums, ", "),
+            fmt::join(files_in_part, ", "));
 }
 
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
@@ -1,6 +1,10 @@
 #pragma once
 
 #include <base/types.h>
+#include <Disks/IDisk.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <Core/Types_fwd.h>
 
 #include <map>
 #include <optional>
diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
@@ -1801,8 +1801,6 @@ class MutateSomePartColumnsTask : public IExecutableTask
 
         NameSet hardlinked_files;
 
-
-
         /// NOTE: Renames must be done in order
         for (const auto & [rename_from, rename_to] : ctx->files_to_rename)
         {
@@ -1845,7 +1843,7 @@ class MutateSomePartColumnsTask : public IExecutableTask
             String destination = it->name();
 
             LOG_DEBUG(getLogger("MutateSomePartColumnsTask"), "rename unchanged {} -> {}",
-            file_name, destination);
+                file_name, destination);
 
             if (it->isFile())
             {

Original file line number	Diff line number	Diff line change
`@@ -1801,8 +1801,6 @@ class MutateSomePartColumnsTask : public IExecutableTask`
`1801`	`1801`
`1802`	`1802`	`NameSet hardlinked_files;`
`1803`	`1803`
`1804`		`-`
`1805`		`-`
`1806`	`1804`	`/// NOTE: Renames must be done in order`
`1807`	`1805`	`for (const auto & [rename_from, rename_to] : ctx->files_to_rename)`
`1808`	`1806`	`{`
`@@ -1845,7 +1843,7 @@ class MutateSomePartColumnsTask : public IExecutableTask`
`1845`	`1843`	`String destination = it->name();`
`1846`	`1844`
`1847`	`1845`	`LOG_DEBUG(getLogger("MutateSomePartColumnsTask"), "rename unchanged {} -> {}",`
`1848`		`- file_name, destination);`
	`1846`	`+ file_name, destination);`
`1849`	`1847`
`1850`	`1848`	`if (it->isFile())`
`1851`	`1849`	`{`