Merge pull request #65048 from rschu1ze/bump-absl

Bump abseil to latest HEAD

.clang-tidy

@@ -37,7 +37,6 @@ Checks: [
   '-cert-oop54-cpp',
   '-cert-oop57-cpp',
 
-  '-clang-analyzer-optin.core.EnumCastOutOfRange', # https://github.com/abseil/abseil-cpp/issues/1667
   '-clang-analyzer-optin.performance.Padding',
 
   '-clang-analyzer-unix.Malloc',

.gitmodules

@@ -161,9 +161,9 @@
 [submodule "contrib/xz"]
 	path = contrib/xz
 	url = https://github.com/xz-mirror/xz
-[submodule "contrib/abseil-cpp"]
+[submodule "abseil"]
 	path = contrib/abseil-cpp
-	url = https://github.com/abseil/abseil-cpp
+	url = https://github.com/ClickHouse/abseil-cpp.git
 [submodule "contrib/dragonbox"]
 	path = contrib/dragonbox
 	url = https://github.com/ClickHouse/dragonbox

contrib/abseil-cpp

@@ -1 +1 @@
-Subproject commit 3bd86026c93da5a40006fd53403dff9d5f5e30e3
+Subproject commit a3c4dd3e77f28b526efbb0eb394b72e29c633936

contrib/abseil-cpp-cmake/CMakeLists.txt

@@ -1,6 +1,8 @@
 set(ABSL_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
 set(ABSL_COMMON_INCLUDE_DIRS "${ABSL_ROOT_DIR}")
 
+# This is a minimized version of the function definition in CMake/AbseilHelpers.cmake
+
 #
 # Copyright 2017 The Abseil Authors.
 #
@@ -16,7 +18,6 @@ set(ABSL_COMMON_INCLUDE_DIRS "${ABSL_ROOT_DIR}")
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 function(absl_cc_library)
   cmake_parse_arguments(ABSL_CC_LIB
     "DISABLE_INSTALL;PUBLIC;TESTONLY"
@@ -76,6 +77,12 @@ function(absl_cc_library)
   add_library(absl::${ABSL_CC_LIB_NAME} ALIAS ${_NAME})
 endfunction()
 
+# The following definitions are an amalgamation of the CMakeLists.txt files in absl/*/
+# To refresh them when upgrading to a new version:
+# - copy them over from upstream
+# - remove calls of 'absl_cc_test'
+# - remove calls of `absl_cc_library` that contain `TESTONLY`
+# - append '${DIR}' to the file definitions
 
 set(DIR ${ABSL_ROOT_DIR}/absl/algorithm)
 
@@ -102,12 +109,12 @@ absl_cc_library(
     absl::algorithm
     absl::core_headers
     absl::meta
+    absl::nullability
   PUBLIC
 )
 
 set(DIR ${ABSL_ROOT_DIR}/absl/base)
 
-# Internal-only target, do not depend on directly.
 absl_cc_library(
   NAME
     atomic_hook
@@ -146,6 +153,18 @@ absl_cc_library(
     ${ABSL_DEFAULT_COPTS}
 )
 
+absl_cc_library(
+  NAME
+    no_destructor
+  HDRS
+    "${DIR}/no_destructor.h"
+  DEPS
+    absl::config
+    absl::nullability
+  COPTS
+    ${ABSL_DEFAULT_COPTS}
+)
+
 absl_cc_library(
   NAME
     nullability
@@ -305,6 +324,8 @@ absl_cc_library(
     ${ABSL_DEFAULT_COPTS}
   LINKOPTS
     ${ABSL_DEFAULT_LINKOPTS}
+    $<$<BOOL:${LIBRT}>:-lrt>
+    $<$<BOOL:${MINGW}>:-ladvapi32>
   DEPS
     absl::atomic_hook
     absl::base_internal
@@ -312,6 +333,7 @@ absl_cc_library(
     absl::core_headers
     absl::dynamic_annotations
     absl::log_severity
+    absl::nullability
     absl::raw_logging_internal
     absl::spinlock_wait
     absl::type_traits
@@ -357,6 +379,7 @@ absl_cc_library(
     absl::base
     absl::config
     absl::core_headers
+    absl::nullability
   PUBLIC
 )
 
@@ -467,10 +490,11 @@ absl_cc_library(
   LINKOPTS
     ${ABSL_DEFAULT_LINKOPTS}
   DEPS
-    absl::container_common
     absl::common_policy_traits
     absl::compare
     absl::compressed_tuple
+    absl::config
+    absl::container_common
     absl::container_memory
     absl::cord
     absl::core_headers
@@ -480,7 +504,6 @@ absl_cc_library(
     absl::strings
     absl::throw_delegate
     absl::type_traits
-    absl::utility
 )
 
 # Internal-only target, do not depend on directly.
@@ -523,7 +546,9 @@ absl_cc_library(
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
+    absl::base_internal
     absl::compressed_tuple
+    absl::config
     absl::core_headers
     absl::memory
     absl::span
@@ -548,18 +573,6 @@ absl_cc_library(
   PUBLIC
 )
 
-# Internal-only target, do not depend on directly.
-absl_cc_library(
-  NAME
-    counting_allocator
-  HDRS
-    "${DIR}/internal/counting_allocator.h"
-  COPTS
-    ${ABSL_DEFAULT_COPTS}
-  DEPS
-    absl::config
-)
-
 absl_cc_library(
   NAME
     flat_hash_map
@@ -570,7 +583,7 @@ absl_cc_library(
   DEPS
     absl::container_memory
     absl::core_headers
-    absl::hash_function_defaults
+    absl::hash_container_defaults
     absl::raw_hash_map
     absl::algorithm_container
     absl::memory
@@ -586,7 +599,7 @@ absl_cc_library(
     ${ABSL_DEFAULT_COPTS}
   DEPS
     absl::container_memory
-    absl::hash_function_defaults
+    absl::hash_container_defaults
     absl::raw_hash_set
     absl::algorithm_container
     absl::core_headers
@@ -604,7 +617,7 @@ absl_cc_library(
   DEPS
     absl::container_memory
     absl::core_headers
-    absl::hash_function_defaults
+    absl::hash_container_defaults
     absl::node_slot_policy
     absl::raw_hash_map
     absl::algorithm_container
@@ -620,8 +633,9 @@ absl_cc_library(
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
+    absl::container_memory
     absl::core_headers
-    absl::hash_function_defaults
+    absl::hash_container_defaults
     absl::node_slot_policy
     absl::raw_hash_set
     absl::algorithm_container
@@ -629,6 +643,19 @@ absl_cc_library(
   PUBLIC
 )
 
+absl_cc_library(
+  NAME
+    hash_container_defaults
+  HDRS
+    "${DIR}/hash_container_defaults.h"
+  COPTS
+    ${ABSL_DEFAULT_COPTS}
+  DEPS
+    absl::config
+    absl::hash_function_defaults
+  PUBLIC
+)
+
 # Internal-only target, do not depend on directly.
 absl_cc_library(
   NAME
@@ -655,9 +682,11 @@ absl_cc_library(
     ${ABSL_DEFAULT_COPTS}
   DEPS
     absl::config
+    absl::container_common
     absl::cord
     absl::hash
     absl::strings
+    absl::type_traits
   PUBLIC
 )
 
@@ -703,6 +732,7 @@ absl_cc_library(
     absl::base
     absl::config
     absl::exponential_biased
+    absl::no_destructor
     absl::raw_logging_internal
     absl::sample_recorder
     absl::synchronization
@@ -756,7 +786,9 @@ absl_cc_library(
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
+    absl::config
     absl::container_memory
+    absl::core_headers
     absl::raw_hash_set
     absl::throw_delegate
   PUBLIC
@@ -817,6 +849,7 @@ absl_cc_library(
   DEPS
     absl::config
     absl::core_headers
+    absl::debugging_internal
     absl::meta
     absl::strings
     absl::span
@@ -931,6 +964,7 @@ absl_cc_library(
     absl::crc32c
     absl::config
     absl::strings
+    absl::no_destructor
 )
 
 set(DIR ${ABSL_ROOT_DIR}/absl/debugging)
@@ -954,6 +988,8 @@ absl_cc_library(
     "${DIR}/stacktrace.cc"
   COPTS
     ${ABSL_DEFAULT_COPTS}
+  LINKOPTS
+    $<$<BOOL:${EXECINFO_LIBRARY}>:${EXECINFO_LIBRARY}>
   DEPS
     absl::debugging_internal
     absl::config
@@ -980,6 +1016,7 @@ absl_cc_library(
     ${ABSL_DEFAULT_COPTS}
   LINKOPTS
     ${ABSL_DEFAULT_LINKOPTS}
+    $<$<BOOL:${MINGW}>:-ldbghelp>
   DEPS
     absl::debugging_internal
     absl::demangle_internal
@@ -1058,8 +1095,10 @@ absl_cc_library(
     demangle_internal
   HDRS
     "${DIR}/internal/demangle.h"
+    "${DIR}/internal/demangle_rust.h"
   SRCS
     "${DIR}/internal/demangle.cc"
+    "${DIR}/internal/demangle_rust.cc"
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
@@ -1252,6 +1291,7 @@ absl_cc_library(
     absl::strings
     absl::synchronization
     absl::flat_hash_map
+    absl::no_destructor
 )
 
 # Internal-only target, do not depend on directly.
@@ -1283,12 +1323,9 @@ absl_cc_library(
 absl_cc_library(
   NAME
     flags
-  SRCS
-    "${DIR}/flag.cc"
   HDRS
     "${DIR}/declare.h"
     "${DIR}/flag.h"
-    "${DIR}/internal/flag_msvc.inc"
   COPTS
     ${ABSL_DEFAULT_COPTS}
   LINKOPTS
@@ -1299,7 +1336,6 @@ absl_cc_library(
     absl::flags_config
     absl::flags_internal
     absl::flags_reflection
-    absl::base
     absl::core_headers
     absl::strings
 )
@@ -1379,6 +1415,9 @@ absl_cc_library(
     absl::synchronization
 )
 
+############################################################################
+# Unit tests in alphabetical order.
+
 set(DIR ${ABSL_ROOT_DIR}/absl/functional)
 
 absl_cc_library(
@@ -1431,6 +1470,18 @@ absl_cc_library(
   PUBLIC
 )
 
+absl_cc_library(
+  NAME
+    overload
+  HDRS
+    "${DIR}/overload.h"
+  COPTS
+    ${ABSL_DEFAULT_COPTS}
+  DEPS
+    absl::meta
+  PUBLIC
+)
+
 set(DIR ${ABSL_ROOT_DIR}/absl/hash)
 
 absl_cc_library(
@@ -1640,6 +1691,7 @@ absl_cc_library(
     absl::log_internal_conditions
     absl::log_internal_message
     absl::log_internal_strip
+    absl::absl_vlog_is_on
 )
 
 absl_cc_library(
@@ -1721,6 +1773,7 @@ absl_cc_library(
     absl::log_entry
     absl::log_severity
     absl::log_sink
+    absl::no_destructor
     absl::raw_logging_internal
     absl::synchronization
     absl::span
@@ -1771,6 +1824,7 @@ absl_cc_library(
   LINKOPTS
     ${ABSL_DEFAULT_LINKOPTS}
   DEPS
+    absl::core_headers
     absl::log_internal_message
     absl::log_internal_nullstream
     absl::log_severity
@@ -1876,6 +1930,11 @@ absl_cc_library(
   PUBLIC
 )
 
+# Warning: Many linkers will strip the contents of this library because its
+# symbols are only used in a global constructor. A workaround is for clients
+# to link this using $<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags> instead of
+# the plain absl::log_flags.
+# TODO(b/320467376): Implement the equivalent of Bazel's alwayslink=True.
 absl_cc_library(
   NAME
     log_flags
@@ -1897,6 +1956,7 @@ absl_cc_library(
     absl::flags
     absl::flags_marshalling
     absl::strings
+    absl::vlog_config_internal
   PUBLIC
 )
 
@@ -1919,6 +1979,7 @@ absl_cc_library(
     absl::log_severity
     absl::raw_logging_internal
     absl::strings
+    absl::vlog_config_internal
 )
 
 absl_cc_library(
@@ -1952,6 +2013,7 @@ absl_cc_library(
     ${ABSL_DEFAULT_LINKOPTS}
   DEPS
     absl::log_internal_log_impl
+    absl::vlog_is_on
   PUBLIC
 )
 
@@ -2064,21 +2126,75 @@ absl_cc_library(
 )
 
 absl_cc_library(
-    NAME
+  NAME
-      log_internal_fnmatch
+    vlog_config_internal
-    SRCS
+  SRCS
-      "${DIR}/internal/fnmatch.cc"
+    "${DIR}/internal/vlog_config.cc"
-    HDRS
+  HDRS
-      "${DIR}/internal/fnmatch.h"
+    "${DIR}/internal/vlog_config.h"
-    COPTS
+  COPTS
-      ${ABSL_DEFAULT_COPTS}
+    ${ABSL_DEFAULT_COPTS}
-    LINKOPTS
+  LINKOPTS
-      ${ABSL_DEFAULT_LINKOPTS}
+    ${ABSL_DEFAULT_LINKOPTS}
-    DEPS
+  DEPS
-      absl::config
+    absl::base
-      absl::strings
+    absl::config
+    absl::core_headers
+    absl::log_internal_fnmatch
+    absl::memory
+    absl::no_destructor
+    absl::strings
+    absl::synchronization
+    absl::optional
 )
 
+absl_cc_library(
+  NAME
+    absl_vlog_is_on
+  COPTS
+    ${ABSL_DEFAULT_COPTS}
+  LINKOPTS
+    ${ABSL_DEFAULT_LINKOPTS}
+  HDRS
+    "${DIR}/absl_vlog_is_on.h"
+  DEPS
+    absl::vlog_config_internal
+    absl::config
+    absl::core_headers
+    absl::strings
+)
+
+absl_cc_library(
+  NAME
+    vlog_is_on
+  COPTS
+    ${ABSL_DEFAULT_COPTS}
+  LINKOPTS
+    ${ABSL_DEFAULT_LINKOPTS}
+  HDRS
+    "${DIR}/vlog_is_on.h"
+  DEPS
+    absl::absl_vlog_is_on
+)
+
+absl_cc_library(
+  NAME
+    log_internal_fnmatch
+  SRCS
+    "${DIR}/internal/fnmatch.cc"
+  HDRS
+    "${DIR}/internal/fnmatch.h"
+  COPTS
+    ${ABSL_DEFAULT_COPTS}
+  LINKOPTS
+    ${ABSL_DEFAULT_LINKOPTS}
+  DEPS
+    absl::config
+    absl::strings
+)
+
+# Test targets
+
 set(DIR ${ABSL_ROOT_DIR}/absl/memory)
 
 absl_cc_library(
@@ -2147,6 +2263,7 @@ absl_cc_library(
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
+    absl::compare
     absl::config
     absl::core_headers
     absl::bits
@@ -2176,6 +2293,8 @@ absl_cc_library(
   PUBLIC
 )
 
+set(DIR ${ABSL_ROOT_DIR}/absl/profiling)
+
 absl_cc_library(
   NAME
     sample_recorder
@@ -2188,8 +2307,6 @@ absl_cc_library(
     absl::synchronization
 )
 
-set(DIR ${ABSL_ROOT_DIR}/absl/profiling)
-
 absl_cc_library(
   NAME
     exponential_biased
@@ -2265,6 +2382,7 @@ absl_cc_library(
   LINKOPTS
     ${ABSL_DEFAULT_LINKOPTS}
   DEPS
+    absl::config
     absl::fast_type_id
     absl::optional
 )
@@ -2336,11 +2454,13 @@ absl_cc_library(
   DEPS
     absl::config
     absl::inlined_vector
+    absl::nullability
     absl::random_internal_pool_urbg
     absl::random_internal_salted_seed_seq
     absl::random_internal_seed_material
     absl::random_seed_gen_exception
     absl::span
+    absl::string_view
 )
 
 # Internal-only target, do not depend on directly.
@@ -2399,6 +2519,7 @@ absl_cc_library(
     ${ABSL_DEFAULT_COPTS}
   LINKOPTS
     ${ABSL_DEFAULT_LINKOPTS}
+    $<$<BOOL:${MINGW}>:-lbcrypt>
   DEPS
     absl::core_headers
     absl::optional
@@ -2658,6 +2779,29 @@ absl_cc_library(
     absl::config
 )
 
+# Internal-only target, do not depend on directly.
+absl_cc_library(
+  NAME
+    random_internal_distribution_test_util
+  SRCS
+    "${DIR}/internal/chi_square.cc"
+    "${DIR}/internal/distribution_test_util.cc"
+  HDRS
+    "${DIR}/internal/chi_square.h"
+    "${DIR}/internal/distribution_test_util.h"
+  COPTS
+    ${ABSL_DEFAULT_COPTS}
+  LINKOPTS
+    ${ABSL_DEFAULT_LINKOPTS}
+  DEPS
+    absl::config
+    absl::core_headers
+    absl::raw_logging_internal
+    absl::strings
+    absl::str_format
+    absl::span
+)
+
 # Internal-only target, do not depend on directly.
 absl_cc_library(
   NAME
@@ -2699,6 +2843,8 @@ absl_cc_library(
     absl::function_ref
     absl::inlined_vector
     absl::memory
+    absl::no_destructor
+    absl::nullability
     absl::optional
     absl::raw_logging_internal
     absl::span
@@ -2724,8 +2870,11 @@ absl_cc_library(
     absl::base
     absl::config
     absl::core_headers
+    absl::has_ostream_operator
+    absl::nullability
     absl::raw_logging_internal
     absl::status
+    absl::str_format
     absl::strings
     absl::type_traits
     absl::utility
@@ -2748,6 +2897,7 @@ absl_cc_library(
     absl::base
     absl::config
     absl::core_headers
+    absl::nullability
     absl::throw_delegate
   PUBLIC
 )
@@ -2762,6 +2912,7 @@ absl_cc_library(
     "${DIR}/has_absl_stringify.h"
     "${DIR}/internal/damerau_levenshtein_distance.h"
     "${DIR}/internal/string_constant.h"
+    "${DIR}/internal/has_absl_stringify.h"
     "${DIR}/match.h"
     "${DIR}/numbers.h"
     "${DIR}/str_cat.h"
@@ -2805,6 +2956,7 @@ absl_cc_library(
     absl::endian
     absl::int128
     absl::memory
+    absl::nullability
     absl::raw_logging_internal
     absl::throw_delegate
     absl::type_traits
@@ -2824,6 +2976,18 @@ absl_cc_library(
   PUBLIC
 )
 
+absl_cc_library(
+  NAME
+    has_ostream_operator
+  HDRS
+    "${DIR}/has_ostream_operator.h"
+  COPTS
+    ${ABSL_DEFAULT_COPTS}
+  DEPS
+    absl::config
+  PUBLIC
+)
+
 # Internal-only target, do not depend on directly.
 absl_cc_library(
   NAME
@@ -2855,7 +3019,12 @@ absl_cc_library(
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
+    absl::config
+    absl::core_headers
+    absl::nullability
+    absl::span
     absl::str_format_internal
+    absl::string_view
   PUBLIC
 )
 
@@ -2886,6 +3055,7 @@ absl_cc_library(
     absl::strings
     absl::config
     absl::core_headers
+    absl::fixed_array
     absl::inlined_vector
     absl::numeric_representation
     absl::type_traits
@@ -2989,6 +3159,7 @@ absl_cc_library(
   DEPS
     absl::base
     absl::config
+    absl::no_destructor
     absl::raw_logging_internal
     absl::synchronization
 )
@@ -3079,6 +3250,7 @@ absl_cc_library(
     absl::endian
     absl::function_ref
     absl::inlined_vector
+    absl::nullability
     absl::optional
     absl::raw_logging_internal
     absl::span
@@ -3246,6 +3418,8 @@ absl_cc_library(
     ${ABSL_DEFAULT_COPTS}
   DEPS
     Threads::Threads
+    # TODO(#1495): Use $<LINK_LIBRARY:FRAMEWORK,CoreFoundation> once our
+    # minimum CMake version >= 3.24
     $<$<PLATFORM_ID:Darwin>:-Wl,-framework,CoreFoundation>
 )
 
@@ -3286,8 +3460,8 @@ absl_cc_library(
   NAME
     bad_any_cast_impl
   SRCS
-   "${DIR}/bad_any_cast.h"
+    "${DIR}/bad_any_cast.h"
-   "${DIR}/bad_any_cast.cc"
+    "${DIR}/bad_any_cast.cc"
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
@@ -3307,6 +3481,7 @@ absl_cc_library(
   DEPS
     absl::algorithm
     absl::core_headers
+    absl::nullability
     absl::throw_delegate
     absl::type_traits
   PUBLIC
@@ -3327,6 +3502,7 @@ absl_cc_library(
     absl::config
     absl::core_headers
     absl::memory
+    absl::nullability
     absl::type_traits
     absl::utility
   PUBLIC
@@ -3389,6 +3565,7 @@ absl_cc_library(
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
+    absl::config
     absl::core_headers
     absl::type_traits
   PUBLIC