diff --git a/.gitmodules b/.gitmodules index b4e21f4a4a8..62b2f9d7766 100644 --- a/.gitmodules +++ b/.gitmodules @@ -201,7 +201,7 @@ [submodule "contrib/boringssl"] path = contrib/boringssl url = https://github.com/ClickHouse/boringssl.git - branch = MergeWithUpstream + branch = unknown_branch_from_artur [submodule "contrib/NuRaft"] path = contrib/NuRaft url = https://github.com/ClickHouse/NuRaft.git diff --git a/contrib/boringssl b/contrib/boringssl index c1e01a441d6..8061ac62d67 160000 --- a/contrib/boringssl +++ b/contrib/boringssl @@ -1 +1 @@ -Subproject commit c1e01a441d6db234f4f12e63a7657d1f9e6db9c1 +Subproject commit 8061ac62d67953e61b793042e33baf1352e67510 diff --git a/contrib/curl-cmake/curl_config.h b/contrib/curl-cmake/curl_config.h index 1efdd88600f..f56ba3eccd5 100644 --- a/contrib/curl-cmake/curl_config.h +++ b/contrib/curl-cmake/curl_config.h @@ -44,6 +44,8 @@ #define HAVE_SETJMP_H #define HAVE_SYS_STAT_H #define HAVE_UNISTD_H +#define HAVE_POLL_H +#define HAVE_PTHREAD_H #define ENABLE_IPV6 #define USE_OPENSSL diff --git a/contrib/krb5 b/contrib/krb5 index 5149dea4e2b..d879821c7a4 160000 --- a/contrib/krb5 +++ b/contrib/krb5 @@ -1 +1 @@ -Subproject commit 5149dea4e2be0f67707383d2682b897c14631374 +Subproject commit d879821c7a4c70b0c3ad739d9951d1a2b1903df7 diff --git a/contrib/nats-io b/contrib/nats-io index 6b2227f3675..1e2597c5461 160000 --- a/contrib/nats-io +++ b/contrib/nats-io @@ -1 +1 @@ -Subproject commit 6b2227f36757da090321e2d317569d2bd42c4cc1 +Subproject commit 1e2597c54616015077e53a26d56b6bac448eb1b6 diff --git a/contrib/nats-io-cmake/CMakeLists.txt b/contrib/nats-io-cmake/CMakeLists.txt index 5588d5750c4..579bf6f8ae4 100644 --- a/contrib/nats-io-cmake/CMakeLists.txt +++ b/contrib/nats-io-cmake/CMakeLists.txt @@ -18,6 +18,8 @@ elseif(WIN32) set(NATS_PLATFORM_INCLUDE "apple") endif() +add_definitions(-DNATS_HAS_TLS) + file(GLOB PS_SOURCES "${NATS_IO_SOURCE_DIR}/${NATS_PLATFORM_INCLUDE}/*.c") set(SRCS "${NATS_IO_SOURCE_DIR}/asynccb.c" diff --git a/src/Common/Config/ConfigReloader.cpp b/src/Common/Config/ConfigReloader.cpp index 65e12e09333..de7011b67bf 100644 --- a/src/Common/Config/ConfigReloader.cpp +++ b/src/Common/Config/ConfigReloader.cpp @@ -13,8 +13,6 @@ namespace fs = std::filesystem; namespace DB { -constexpr decltype(ConfigReloader::reload_interval) ConfigReloader::reload_interval; - ConfigReloader::ConfigReloader( const std::string & path_, const std::string & include_from_path_, diff --git a/src/Dictionaries/PolygonDictionaryUtils.cpp b/src/Dictionaries/PolygonDictionaryUtils.cpp index 313743c09b6..c28c7c15aa7 100644 --- a/src/Dictionaries/PolygonDictionaryUtils.cpp +++ b/src/Dictionaries/PolygonDictionaryUtils.cpp @@ -131,7 +131,6 @@ void SlabsPolygonIndex::indexBuild(const std::vector & polygons) /** Map of interesting edge ids to the index of left x, the index of right x */ std::vector edge_left(m, n), edge_right(m, n); - size_t total_index_edges = 0; size_t edges_it = 0; for (size_t l = 0, r = 1; r < sorted_x.size(); ++l, ++r) { @@ -170,12 +169,10 @@ void SlabsPolygonIndex::indexBuild(const std::vector & polygons) if (l & 1) { edges_index_tree[l++].emplace_back(all_edges[i]); - ++total_index_edges; } if (r & 1) { edges_index_tree[--r].emplace_back(all_edges[i]); - ++total_index_edges; } } } diff --git a/src/Interpreters/JoinToSubqueryTransformVisitor.cpp b/src/Interpreters/JoinToSubqueryTransformVisitor.cpp index e07430c0feb..3426c0a1b17 100644 --- a/src/Interpreters/JoinToSubqueryTransformVisitor.cpp +++ b/src/Interpreters/JoinToSubqueryTransformVisitor.cpp @@ -229,7 +229,6 @@ bool needRewrite(ASTSelectQuery & select, std::vectortable_join->as(); if (join.kind == ASTTableJoin::Kind::Comma) throw Exception("COMMA to CROSS JOIN rewriter is not enabled or cannot rewrite query", ErrorCodes::NOT_IMPLEMENTED); - - if (join.using_expression_list) - ++num_using; } if (num_tables - num_array_join <= 2) diff --git a/src/Interpreters/ProfileEventsExt.cpp b/src/Interpreters/ProfileEventsExt.cpp index 94f67713551..1a8176624d2 100644 --- a/src/Interpreters/ProfileEventsExt.cpp +++ b/src/Interpreters/ProfileEventsExt.cpp @@ -162,9 +162,8 @@ void getProfileEvents( dumpMemoryTracker(group_snapshot, columns, server_display_name); Block curr_block; - size_t rows = 0; - for (; profile_queue->tryPop(curr_block); ++rows) + while (profile_queue->tryPop(curr_block)) { auto curr_columns = curr_block.getColumns(); for (size_t j = 0; j < curr_columns.size(); ++j) diff --git a/src/Interpreters/SessionLog.cpp b/src/Interpreters/SessionLog.cpp index 5f303ab64b4..29357875488 100644 --- a/src/Interpreters/SessionLog.cpp +++ b/src/Interpreters/SessionLog.cpp @@ -182,12 +182,10 @@ void SessionLogElement::appendToBlock(MutableColumns & columns) const auto & names_col = *settings_tuple_col.getColumnPtr(0)->assumeMutable(); auto & values_col = assert_cast(*settings_tuple_col.getColumnPtr(1)->assumeMutable()); - size_t items_added = 0; for (const auto & kv : settings) { names_col.insert(kv.first); values_col.insert(kv.second); - ++items_added; } auto & offsets = settings_array_col.getOffsets(); diff --git a/src/Parsers/ASTIdentifier.cpp b/src/Parsers/ASTIdentifier.cpp index a889680c81f..ca8ac0e8e64 100644 --- a/src/Parsers/ASTIdentifier.cpp +++ b/src/Parsers/ASTIdentifier.cpp @@ -32,7 +32,7 @@ ASTIdentifier::ASTIdentifier(std::vector && name_parts_, bool special, s semantic->legacy_compound = true; if (!name_params.empty()) { - size_t params = 0; + [[maybe_unused]] size_t params = 0; for (const auto & part [[maybe_unused]] : name_parts) { if (part.empty()) diff --git a/utils/zookeeper-test/main.cpp b/utils/zookeeper-test/main.cpp index 5d0b54aa74b..2149dedf594 100644 --- a/utils/zookeeper-test/main.cpp +++ b/utils/zookeeper-test/main.cpp @@ -282,11 +282,9 @@ void createConcurrent(zkutil::ZooKeeper & testzk, const std::string & zkhost, si asyncs.push_back(std::async(std::launch::async, callback)); } - size_t i = 0; for (auto & async : asyncs) { async.wait(); - i++; } }