Fix tidy build

ianton-ru · ianton-ru · commit 547e34e05790 · 2025-06-04T17:41:07.000+02:00
diff --git a/src/Storages/ObjectStorageQueue/ObjectStorageQueueOrderedFileMetadata.cpp b/src/Storages/ObjectStorageQueue/ObjectStorageQueueOrderedFileMetadata.cpp
@@ -202,7 +202,6 @@ bool ObjectStorageQueueOrderedFileMetadata::getMaxProcessedFilesByHive(
     Strings paths;
     for (const auto & hive_partition : hives)
     {
-        std::string file_path;
         std::filesystem::path node_path = processed_node_path_;
         node_path /= hive_partition;
         paths.push_back(node_path.string());
@@ -550,17 +549,17 @@ void ObjectStorageQueueOrderedFileMetadata::prepareProcessedRequestsImpl(Coordin
     prepareProcessedRequests(requests, zk_client, processed_node_path, /* ignore_if_exists */false);
 }
 
-void ObjectStorageQueueOrderedFileMetadata::prepareHiveProcessedMap(HiveLastProcessedFileInfoMap & file_name)
+void ObjectStorageQueueOrderedFileMetadata::prepareHiveProcessedMap(HiveLastProcessedFileInfoMap & file_map)
 {
     std::string hive_part(getHivePart(node_metadata.file_path));
     std::filesystem::path node_path = processed_node_path;
     node_path /= hive_part;
 
-    auto file_info = file_name.find(node_path.string());
-    if (file_info == file_name.end())
+    auto file_info = file_map.find(node_path.string());
+    if (file_info == file_map.end())
     {
         const auto zk_client = getZooKeeper();
-        file_name[node_path.string()] = {zk_client->exists(node_path), node_metadata.file_path};
+        file_map[node_path.string()] = {zk_client->exists(node_path), node_metadata.file_path};
     }
     else
     {
diff --git a/src/Storages/VirtualColumnUtils.cpp b/src/Storages/VirtualColumnUtils.cpp
@@ -193,8 +193,8 @@ std::string_view findHivePartitioningInPath(const String & path)
 
     // All keys and values are string_view over 'path', so starts and ends must be inside 'path'
     auto kv = key_values.begin();
-    auto start = kv->first.data();
-    auto end = kv->second.data() + kv->second.size();
+    const auto * start = kv->first.data();
+    const auto * end = kv->second.data() + kv->second.size();
     ++kv;
     while (kv != key_values.end())
     {

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,6 @@ bool ObjectStorageQueueOrderedFileMetadata::getMaxProcessedFilesByHive(`
`202`	`202`	`Strings paths;`
`203`	`203`	`for (const auto & hive_partition : hives)`
`204`	`204`	`{`
`205`		`- std::string file_path;`
`206`	`205`	`std::filesystem::path node_path = processed_node_path_;`
`207`	`206`	`node_path /= hive_partition;`
`208`	`207`	`paths.push_back(node_path.string());`
`@@ -550,17 +549,17 @@ void ObjectStorageQueueOrderedFileMetadata::prepareProcessedRequestsImpl(Coordin`
`550`	`549`	`prepareProcessedRequests(requests, zk_client, processed_node_path, /* ignore_if_exists */false);`
`551`	`550`	`}`
`552`	`551`
`553`		`-void ObjectStorageQueueOrderedFileMetadata::prepareHiveProcessedMap(HiveLastProcessedFileInfoMap & file_name)`
	`552`	`+void ObjectStorageQueueOrderedFileMetadata::prepareHiveProcessedMap(HiveLastProcessedFileInfoMap & file_map)`
`554`	`553`	`{`
`555`	`554`	`std::string hive_part(getHivePart(node_metadata.file_path));`
`556`	`555`	`std::filesystem::path node_path = processed_node_path;`
`557`	`556`	`node_path /= hive_part;`
`558`	`557`
`559`		`- auto file_info = file_name.find(node_path.string());`
`560`		`- if (file_info == file_name.end())`
	`558`	`+ auto file_info = file_map.find(node_path.string());`
	`559`	`+ if (file_info == file_map.end())`
`561`	`560`	`{`
`562`	`561`	`const auto zk_client = getZooKeeper();`
`563`		`- file_name[node_path.string()] = {zk_client->exists(node_path), node_metadata.file_path};`
	`562`	`+ file_map[node_path.string()] = {zk_client->exists(node_path), node_metadata.file_path};`
`564`	`563`	`}`
`565`	`564`	`else`
`566`	`565`	`{`