Merge pull request ClickHouse#79549 from Algunenano/public_sync_20250424

Sync some files

Author: Algunenano

contrib/sparse-checkout/update-aws.sh

@@ -9,6 +9,7 @@ echo '/src/aws-cpp-sdk-core/*' >> $FILES_TO_CHECKOUT
 echo '/generated/src/aws-cpp-sdk-s3/*' >> $FILES_TO_CHECKOUT
 echo '/generated/src/aws-cpp-sdk-aws/*' >> $FILES_TO_CHECKOUT
 echo '/generated/src/aws-cpp-sdk-glue/*' >> $FILES_TO_CHECKOUT
+echo '/generated/src/aws-cpp-sdk-kms/*' >> $FILES_TO_CHECKOUT
 
 git config core.sparsecheckout true
 git checkout $1

programs/server/config.xml

@@ -292,6 +292,12 @@
     <!-- For 'Connection: keep-alive' in HTTP 1.1 -->
     <keep_alive_timeout>10</keep_alive_timeout>
 
+    <!-- Enable verbose output in /replicas_status handler. -->
+    <!-- <enable_verbose_replicas_status/>true<enable_verbose_replicas_status>-->
+
+    <!-- Enable stacktrace in default http handler. -->
+    <!-- <enable_http_stacktrace/>true<enable_http_stacktrace>-->
+
     <!-- gRPC protocol (see src/Server/grpc_protos/clickhouse_grpc.proto for the API) -->
     <!-- <grpc_port>9100</grpc_port> -->
     <grpc>

src/Access/Credentials.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "config.h"
+
 #include <Common/SSHWrapper.h>
 
 #if USE_SSL
@@ -8,8 +10,6 @@
 
 #include <base/types.h>
 
-#include "config.h"
-
 namespace Poco::Net
 {
     class HTTPRequest;

src/Backups/BackupCoordinationReplicatedTables.cpp

@@ -290,7 +290,7 @@ void BackupCoordinationReplicatedTables::prepare() const
             for (const auto & [part_name, part_replicas] : table_info.replicas_by_part_name)
             {
                 auto part_info = MergeTreePartInfo::fromPartName(part_name, MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING);
-                const auto & partition_id = part_info.getPartitionId();
+                [[maybe_unused]] const auto & partition_id = part_info.getPartitionId();
 
                 auto & min_data_versions_by_partition = table_info.min_data_versions_by_partition;
                 auto it2 = min_data_versions_by_partition.find(partition_id);

src/Client/Connection.cpp

@@ -95,7 +95,7 @@ Connection::Connection(const String & host_, UInt16 port_,
     const String & user_, const String & password_,
     const String & proto_send_chunked_, const String & proto_recv_chunked_,
     [[maybe_unused]] const SSHKey & ssh_private_key_,
-    const String & jwt_,
+    [[maybe_unused]] const String & jwt_,
     const String & quota_key_,
     const String & cluster_,
     const String & cluster_secret_,
@@ -110,7 +110,9 @@ Connection::Connection(const String & host_, UInt16 port_,
     , ssh_private_key(ssh_private_key_)
 #endif
     , quota_key(quota_key_)
+#if USE_JWT_CPP && USE_SSL
     , jwt(jwt_)
+#endif
     , cluster(cluster_)
     , cluster_secret(cluster_secret_)
     , client_name(client_name_)
@@ -446,11 +448,13 @@ void Connection::sendHello([[maybe_unused]] const Poco::Timespan & handshake_tim
         performHandshakeForSSHAuth(handshake_timeout);
     }
 #endif
+#if USE_JWT_CPP && USE_SSL
     else if (!jwt.empty())
     {
         writeStringBinary(EncodedUserInfo::JWT_AUTHENTICAION_MARKER, *out);
         writeStringBinary(jwt, *out);
     }
+#endif
     else
     {
         writeStringBinary(user, *out);

src/Client/Connection.h

@@ -193,7 +193,9 @@ class Connection : public IServerConnection
     SSHKey ssh_private_key;
 #endif
     String quota_key;
+#if USE_JWT_CPP && USE_SSL
     String jwt;
+#endif
 
     /// For inter-server authorization
     String cluster;

src/Client/ConnectionParameters.cpp

@@ -77,7 +77,11 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
 
     if (config.has("jwt"))
     {
+#if USE_JWT_CPP && USE_SSL
         jwt = config.getString("jwt");
+#else
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "JWT is disabled, because ClickHouse is built without JWT or SSL support");
+#endif
     }
     else if (config.has("ssh-key-file"))
     {

src/Common/ZooKeeper/examples/zkutil_test_commands_new_lib.cpp

@@ -3,6 +3,7 @@
 #include <Poco/Event.h>
 #include <Common/StringUtils.h>
 #include <Common/ZooKeeper/ZooKeeperImpl.h>
+#include <Common/ZooKeeper/ShuffleHost.h>
 #include <Common/typeid_cast.h>
 #include <iostream>
 #include <memory>

src/Common/benchmarks/orc_string_dictionary.cpp

@@ -5,6 +5,8 @@
 
 #include <benchmark/benchmark.h>
 
+#include <unordered_map>
+
 class OldSortedStringDictionary
 {
 public:

src/Common/config.h.in

@@ -69,6 +69,7 @@
 #cmakedefine01 USE_PROMETHEUS_PROTOBUFS
 #cmakedefine01 USE_MONGODB
 #cmakedefine01 USE_NUMACTL
+#cmakedefine01 USE_JWT_CPP
 #cmakedefine01 USE_FUZZING_MODE
 #cmakedefine01 USE_BUZZHOUSE
 #cmakedefine01 USE_DELTA_KERNEL_RS