Merge pull request ClickHouse#79588 from ClickHouse/prepare-for-clang-20

thevar1able · web-flow · commit f787426b89ca · 2025-04-25T18:09:50.000Z
Prepare for `clang20`
diff --git a/base/base/find_symbols.h b/base/base/find_symbols.h
@@ -274,7 +274,7 @@ inline const char * find_first_symbols_sse42(const char * const begin, const cha
     const char * pos = begin;
 
 #if defined(__SSE4_2__)
-    constexpr int mode = _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT;
+    constexpr int mode = _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT;  // NOLINT(misc-redundant-expression)
 
     __m128i set = _mm_setr_epi8(c01, c02, c03, c04, c05, c06, c07, c08, c09, c10, c11, c12, c13, c14, c15, c16);
 
diff --git a/src/Columns/ColumnAggregateFunction.cpp b/src/Columns/ColumnAggregateFunction.cpp
@@ -300,7 +300,7 @@ void ColumnAggregateFunction::doInsertRangeFrom(const IColumn & from, size_t sta
 
         size_t old_size = data.size();
         data.resize(old_size + length);
-        memcpy(data.data() + old_size, &from_concrete.data[start], length * sizeof(data[0]));
+        memcpy(data.data() + old_size, &from_concrete.data[start], length * sizeof(data[0]));  // NOLINT(bugprone-bitwise-pointer-cast)
     }
 }
 
diff --git a/src/Coordination/tests/gtest_coordination_storage.cpp b/src/Coordination/tests/gtest_coordination_storage.cpp
@@ -879,11 +879,11 @@ TYPED_TEST(CoordinationTest, TestUncommittedStateBasicCrud)
     storage.preprocessRequest(create_request, 0, 0, 1);
     storage.preprocessRequest(create_request, 0, 0, 2);
 
-    ASSERT_FALSE(get_committed_data());
+    ASSERT_EQ(get_committed_data(), std::nullopt);
 
     const auto after_create_get = preprocess_get(3);
 
-    ASSERT_FALSE(get_committed_data());
+    ASSERT_EQ(get_committed_data(), std::nullopt);
 
     const auto set_request = std::make_shared<ZooKeeperSetRequest>();
     set_request->path = path;
@@ -892,7 +892,7 @@ TYPED_TEST(CoordinationTest, TestUncommittedStateBasicCrud)
 
     const auto after_set_get = preprocess_get(5);
 
-    ASSERT_FALSE(get_committed_data());
+    ASSERT_EQ(get_committed_data(), std::nullopt);
 
     const auto remove_request = std::make_shared<ZooKeeperRemoveRequest>();
     remove_request->path = path;
@@ -901,7 +901,7 @@ TYPED_TEST(CoordinationTest, TestUncommittedStateBasicCrud)
 
     const auto after_remove_get = preprocess_get(8);
 
-    ASSERT_FALSE(get_committed_data());
+    ASSERT_EQ(get_committed_data(), std::nullopt);
 
     {
         const auto responses = storage.processRequest(create_request, 0, 1);
@@ -957,7 +957,7 @@ TYPED_TEST(CoordinationTest, TestUncommittedStateBasicCrud)
         ASSERT_EQ(get_response.error, Error::ZNONODE);
     }
 
-    ASSERT_FALSE(get_committed_data());
+    ASSERT_EQ(get_committed_data(), std::nullopt);
 }
 
 #endif
diff --git a/src/Daemon/SentryWriter.cpp b/src/Daemon/SentryWriter.cpp
@@ -262,7 +262,6 @@ void SentryWriter::resetInstance() {}
 
 SentryWriter::SentryWriter(Poco::Util::LayeredConfiguration &) {}
 SentryWriter::~SentryWriter() = default;
-void SentryWriter::sendError(Type, int, const std::string &, const FramePointers &, size_t, size_t) {}
 void SentryWriter::onSignal(int, const std::string &, const FramePointers &, size_t, size_t) {}
 void SentryWriter::onException(int, const std::string &, const FramePointers &, size_t, size_t) {}
 
diff --git a/src/Daemon/SentryWriter.h b/src/Daemon/SentryWriter.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "config.h"
+
 #include <string>
 #include <Common/StackTrace.h>
 
@@ -49,13 +51,14 @@ class SentryWriter
     ~SentryWriter();
 
 private:
+    explicit SentryWriter(Poco::Util::LayeredConfiguration & config);
+
+#if USE_SENTRY
     static std::unique_ptr<SentryWriter> instance;
     bool initialized = false;
     bool anonymize = false;
     std::string server_data_path;
 
-    explicit SentryWriter(Poco::Util::LayeredConfiguration & config);
-
     enum Type
     {
         SIGNAL,
@@ -71,4 +74,5 @@ class SentryWriter
         const FramePointers & frame_pointers,
         size_t offset,
         size_t size);
+#endif
 };
diff --git a/src/Functions/padString.cpp b/src/Functions/padString.cpp
@@ -61,10 +61,10 @@ namespace
             {
                 if (num_chars <= step)
                 {
-                    writeSlice(StringSource::Slice{std::bit_cast<const UInt8 *>(pad_string.data()), numCharsToNumBytes(num_chars)}, res_sink);
+                    writeSlice(StringSource::Slice{reinterpret_cast<const UInt8 *>(pad_string.data()), numCharsToNumBytes(num_chars)}, res_sink);
                     break;
                 }
-                writeSlice(StringSource::Slice{std::bit_cast<const UInt8 *>(pad_string.data()), numCharsToNumBytes(step)}, res_sink);
+                writeSlice(StringSource::Slice{reinterpret_cast<const UInt8 *>(pad_string.data()), numCharsToNumBytes(step)}, res_sink);
                 num_chars -= step;
             }
         }
diff --git a/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.cpp b/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.cpp
@@ -61,6 +61,7 @@ namespace
             , schedule(schedule_)
             , log(log_)
             , max_single_part_upload_size(settings_->max_single_part_upload_size)
+            , normal_part_size(0)
         {
         }
 
diff --git a/src/IO/S3/copyS3File.cpp b/src/IO/S3/copyS3File.cpp
@@ -84,6 +84,8 @@ namespace
             , schedule(schedule_)
             , blob_storage_log(blob_storage_log_)
             , log(log_)
+            , num_parts(0)
+            , normal_part_size(0)
         {
         }
 
diff --git a/src/Interpreters/tests/gtest_filecache.cpp b/src/Interpreters/tests/gtest_filecache.cpp
@@ -381,7 +381,7 @@ TEST_F(FileCacheTest, LRUPolicy)
     const size_t file_size = INT_MAX; // the value doesn't really matter because boundary_alignment == 1.
 
 
-    const auto user = FileCache::getCommonUser();
+    const auto & user = FileCache::getCommonUser();
     {
         std::cerr << "Step 1\n";
         auto cache = DB::FileCache("1", settings);
@@ -839,7 +839,7 @@ TEST_F(FileCacheTest, writeBuffer)
 
     FileCache cache("6", settings);
     cache.initialize();
-    const auto user = FileCache::getCommonUser();
+    const auto & user = FileCache::getCommonUser();
 
     auto write_to_cache = [&, this](const String & key, const Strings & data, bool flush, ReadBufferPtr * out_read_buffer = nullptr)
     {
@@ -973,7 +973,7 @@ try
     DB::FileCache file_cache("7", settings);
     file_cache.initialize();
 
-    const auto user = FileCache::getCommonUser();
+    const auto & user = FileCache::getCommonUser();
     auto tmp_data_scope = std::make_shared<TemporaryDataOnDiskScope>(&file_cache, TemporaryDataOnDiskSettings{});
 
     auto some_data_holder = file_cache.getOrSet(FileCacheKey::fromPath("some_data"), 0, 5_KiB, 5_KiB, CreateFileSegmentSettings{}, 0, user);
@@ -1129,7 +1129,7 @@ TEST_F(FileCacheTest, CachedReadBuffer)
     cache->initialize();
 
     auto key = DB::FileCacheKey::fromPath(file_path);
-    const auto user = FileCache::getCommonUser();
+    const auto & user = FileCache::getCommonUser();
 
     {
         auto cached_buffer = std::make_shared<CachedOnDiskReadBufferFromFile>(
@@ -1241,7 +1241,7 @@ TEST_F(FileCacheTest, SLRUPolicy)
 
     const size_t file_size = -1; // the value doesn't really matter because boundary_alignment == 1.
     size_t file_cache_name = 0;
-    const auto user = FileCache::getCommonUser();
+    const auto & user = FileCache::getCommonUser();
 
     {
         auto cache = DB::FileCache(std::to_string(++file_cache_name), settings);
@@ -1431,7 +1431,7 @@ TEST_F(FileCacheTest, FileCacheGetOrSet)
     settings[FileCacheSetting::max_file_segment_size] = 25;
     settings[FileCacheSetting::load_metadata_asynchronously] = false;
 
-    const auto user = FileCache::getCommonUser();
+    const auto & user = FileCache::getCommonUser();
     const auto key = DB::FileCacheKey::fromPath("key1");
 
     auto cache = DB::FileCache("1", settings);
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.h b/src/Processors/Formats/Impl/AvroRowInputFormat.h
@@ -86,10 +86,12 @@ class AvroDeserializer
 
         explicit Action(SkipFn skip_fn_)
             : type(Skip)
+            , target_column_idx(0)
             , skip_fn(skip_fn_) {}
 
         Action(const std::vector<size_t> & nested_column_indexes_, const std::vector<DeserializeFn> & nested_deserializers_)
             : type(Nested)
+            , target_column_idx(0)
             , nested_column_indexes(nested_column_indexes_)
             , nested_deserializers(nested_deserializers_) {}
 
@@ -130,6 +132,7 @@ class AvroDeserializer
     private:
         Action(Type type_, std::vector<Action> actions_)
             : type(type_)
+            , target_column_idx(0)
             , actions(actions_) {}
 
         void deserializeNested(MutableColumns & columns, avro::Decoder & decoder, RowReadExtension & ext) const;
diff --git a/src/Processors/Sources/RemoteSource.h b/src/Processors/Sources/RemoteSource.h
@@ -60,7 +60,9 @@ class RemoteSource final : public ISource
     size_t rows = 0;
     bool manually_add_rows_before_limit_counter = false;
     std::atomic_bool preprocessed_packet = false;
+#if defined(OS_LINUX)
     EventFD startup_event_fd;
+#endif
 };
 
 /// Totals source from RemoteQueryExecutor.
diff --git a/src/QueryPipeline/RemoteQueryExecutor.h b/src/QueryPipeline/RemoteQueryExecutor.h
@@ -304,7 +304,9 @@ class RemoteQueryExecutor
       */
     bool got_duplicated_part_uuids = false;
 
+#if defined(OS_LINUX)
     bool packet_in_progress = false;
+#endif
 
     /// Parts uuids, collected from remote replicas
     std::vector<UUID> duplicated_part_uuids;
diff --git a/src/Storages/System/StorageSystemZooKeeper.cpp b/src/Storages/System/StorageSystemZooKeeper.cpp
@@ -620,7 +620,7 @@ Chunk SystemZooKeeperSource::generate()
                 // Remove nodes that do not match specified prefix
                 std::erase_if(nodes, [&task] (const String & node)
                 {
-                    return (task.path_part + '/' + node).substr(0, task.prefix.size()) != task.prefix;
+                    return !(task.path_part + '/' + node).starts_with(task.prefix);
                 });
             }
 
diff --git a/utils/self-extracting-executable/decompressor.cpp b/utils/self-extracting-executable/decompressor.cpp
@@ -492,7 +492,7 @@ int main(int/* argc*/, char* argv[])
 
         /// size 1 of lock file indicates that another decompressor has found active executable
         if (lock_info.st_size == 1)
-            execv(self, argv);
+            execv(self, argv);  // NOLINT(clang-analyzer-optin.taint.GenericTaint)
 
         printf("No target executable - decompression only was performed.\n"); // NOLINT(modernize-use-std-print)
         return 0;
@@ -576,7 +576,7 @@ int main(int/* argc*/, char* argv[])
             /// execution should be performed
             write(lock, "1", 1);
 #endif
-            execv(self, argv);
+            execv(self, argv); // NOLINT(clang-analyzer-optin.taint.GenericTaint)
 
             /// This part of code will be reached only if error happened
             perror("execv");

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ void ColumnAggregateFunction::doInsertRangeFrom(const IColumn & from, size_t sta`
`300`	`300`
`301`	`301`	`size_t old_size = data.size();`
`302`	`302`	`data.resize(old_size + length);`
`303`		`- memcpy(data.data() + old_size, &from_concrete.data[start], length * sizeof(data[0]));`
	`303`	`+ memcpy(data.data() + old_size, &from_concrete.data[start], length * sizeof(data[0])); // NOLINT(bugprone-bitwise-pointer-cast)`
`304`	`304`	`}`
`305`	`305`	`}`
`306`	`306`
Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,10 @@ namespace`
`61`	`61`	`{`
`62`	`62`	`if (num_chars <= step)`
`63`	`63`	`{`
`64`		`- writeSlice(StringSource::Slice{std::bit_cast<const UInt8 *>(pad_string.data()), numCharsToNumBytes(num_chars)}, res_sink);`
	`64`	`+ writeSlice(StringSource::Slice{reinterpret_cast<const UInt8 *>(pad_string.data()), numCharsToNumBytes(num_chars)}, res_sink);`
`65`	`65`	`break;`
`66`	`66`	`}`
`67`		`- writeSlice(StringSource::Slice{std::bit_cast<const UInt8 *>(pad_string.data()), numCharsToNumBytes(step)}, res_sink);`
	`67`	`+ writeSlice(StringSource::Slice{reinterpret_cast<const UInt8 *>(pad_string.data()), numCharsToNumBytes(step)}, res_sink);`
`68`	`68`	`num_chars -= step;`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ namespace`
`61`	`61`	`, schedule(schedule_)`
`62`	`62`	`, log(log_)`
`63`	`63`	`, max_single_part_upload_size(settings_->max_single_part_upload_size)`
	`64`	`+ , normal_part_size(0)`
`64`	`65`	`{`
`65`	`66`	`}`
`66`	`67`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,8 @@ namespace`
`84`	`84`	`, schedule(schedule_)`
`85`	`85`	`, blob_storage_log(blob_storage_log_)`
`86`	`86`	`, log(log_)`
	`87`	`+ , num_parts(0)`
	`88`	`+ , normal_part_size(0)`
`87`	`89`	`{`
`88`	`90`	`}`
`89`	`91`