Remove the remaining parts of "unbundled" build

CMakeLists.txt

@@ -164,7 +164,6 @@ if (HAS_RESERVED_IDENTIFIER)
     add_compile_definitions (HAS_RESERVED_IDENTIFIER)
 endif ()
 
-# If turned `ON`, assumes the user has either the system GTest library or the bundled one.
 option(ENABLE_TESTS "Provide unit_test_dbms target with Google.Test unit tests" ON)
 option(ENABLE_EXAMPLES "Build all example programs in 'examples' subdirectories" OFF)
 

docker/server/Dockerfile.ubuntu

@@ -26,7 +26,7 @@ ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 # set non-empty deb_location_url url to create a docker image
 # from debs created by CI build, for example:
-# docker build . --network host --build-arg version="21.4.1.6282" --build-arg deb_location_url="https://clickhouse-builds.s3.yandex.net/21852/069cfbff388b3d478d1a16dc7060b48073f5d522/clickhouse_build_check/clang-11_relwithdebuginfo_none_bundled_unsplitted_disable_False_deb/" -t filimonovq/clickhouse-server:pr21852
+# docker build . --network host --build-arg version="21.4.1.6282" --build-arg deb_location_url="https://..." -t ...
 ARG deb_location_url=""
 
 # set non-empty single_binary_location_url to create docker image

docker/test/fuzzer/run-fuzzer.sh

@@ -12,7 +12,7 @@ stage=${stage:-}
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 echo "$script_dir"
 repo_dir=ch
-BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-14_debug_none_bundled_unsplitted_disable_False_binary"}
+BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-14_debug_none_unsplitted_disable_False_binary"}
 BINARY_URL_TO_DOWNLOAD=${BINARY_URL_TO_DOWNLOAD:="https://clickhouse-builds.s3.amazonaws.com/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/$BINARY_TO_DOWNLOAD/clickhouse"}
 
 function clone

docker/test/keeper-jepsen/run.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 
-CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.amazonaws.com/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-14_relwithdebuginfo_none_bundled_unsplitted_disable_False_binary/clickhouse"}
+CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.amazonaws.com/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-14_relwithdebuginfo_none_unsplitted_disable_False_binary/clickhouse"}
 CLICKHOUSE_REPO_PATH=${CLICKHOUSE_REPO_PATH:=""}
 
 

src/AggregateFunctions/AggregateFunctionFactory.cpp

@@ -176,11 +176,6 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
         /// storage stores AggregateFunction(uniqCombinedIf) and in SELECT you
         /// need to filter aggregation result based on another column.
 
-#if defined(UNBUNDLED)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstringop-overread"
-#endif
-
         if (!combinator->supportsNesting() && nested_name.ends_with(combinator_name))
         {
             throw Exception(ErrorCodes::ILLEGAL_AGGREGATION,
@@ -188,10 +183,6 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
                 combinator_name);
         }
 
-#if defined(UNBUNDLED)
-#pragma GCC diagnostic pop
-#endif
-
         DataTypes nested_types = combinator->transformArguments(argument_types);
         Array nested_parameters = combinator->transformParameters(parameters);
 

src/Functions/addressToLine.h

@@ -97,6 +97,8 @@ protected:
 
         if (const auto * object = symbol_index.findObject(reinterpret_cast<const void *>(addr)))
         {
+            std::cerr << object->elf << "\n";
+
             auto dwarf_it = cache.dwarfs.try_emplace(object->name, object->elf).first;
             if (!std::filesystem::exists(object->name))
                 return {};
@@ -104,6 +106,7 @@ protected:
             Dwarf::LocationInfo location;
             std::vector<Dwarf::SymbolizedFrame> frames; // NOTE: not used in FAST mode.
             ResultT result;
+
             if (dwarf_it->second.findAddress(addr - uintptr_t(object->address_begin), location, locationInfoMode, frames))
             {
                 setResult(result, location, frames);

tests/ci/build_check.py

@@ -38,8 +38,6 @@ BUILD_LOG_NAME = "build_log.log"
 def _can_export_binaries(build_config: BuildConfig) -> bool:
     if build_config["package_type"] != "deb":
         return False
-    if build_config["bundled"] != "bundled":
-        return False
     if build_config["libraries"] == "shared":
         return False
     if build_config["sanitizer"] != "":

tests/ci/build_report_check.py

@@ -37,7 +37,6 @@ class BuildResult:
         compiler,
         build_type,
         sanitizer,
-        bundled,
         libraries,
         status,
         elapsed_seconds,
@@ -46,7 +45,6 @@ class BuildResult:
         self.compiler = compiler
         self.build_type = build_type
         self.sanitizer = sanitizer
-        self.bundled = bundled
         self.libraries = libraries
         self.status = status
         self.elapsed_seconds = elapsed_seconds
@@ -91,7 +89,6 @@ def get_failed_report(
         compiler="unknown",
         build_type="unknown",
         sanitizer="unknown",
-        bundled="unknown",
         libraries="unknown",
         status=message,
         elapsed_seconds=0,
@@ -108,7 +105,6 @@ def process_report(
         compiler=build_config["compiler"],
         build_type=build_config["build_type"],
         sanitizer=build_config["sanitizer"],
-        bundled=build_config["bundled"],
         libraries=build_config["libraries"],
         status="success" if build_report["status"] else "failure",
         elapsed_seconds=build_report["elapsed_seconds"],

tests/ci/ci_config.py

@@ -13,7 +13,6 @@ CI_CONFIG = {
             "sanitizer": "",
             "package_type": "deb",
             "static_binary_name": "amd64",
-            "bundled": "bundled",
             "libraries": "static",
             "additional_pkgs": True,
             "tidy": "disable",
@@ -24,7 +23,6 @@ CI_CONFIG = {
             "build_type": "",
             "sanitizer": "",
             "package_type": "coverity",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
@@ -36,7 +34,6 @@ CI_CONFIG = {
             "sanitizer": "",
             "package_type": "deb",
             "static_binary_name": "aarch64",
-            "bundled": "bundled",
             "libraries": "static",
             "additional_pkgs": True,
             "tidy": "disable",
@@ -47,7 +44,6 @@ CI_CONFIG = {
             "build_type": "",
             "sanitizer": "address",
             "package_type": "deb",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
@@ -57,7 +53,6 @@ CI_CONFIG = {
             "build_type": "",
             "sanitizer": "undefined",
             "package_type": "deb",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
@@ -67,7 +62,6 @@ CI_CONFIG = {
             "build_type": "",
             "sanitizer": "thread",
             "package_type": "deb",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
@@ -77,7 +71,6 @@ CI_CONFIG = {
             "build_type": "",
             "sanitizer": "memory",
             "package_type": "deb",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
@@ -87,7 +80,6 @@ CI_CONFIG = {
             "build_type": "debug",
             "sanitizer": "",
             "package_type": "deb",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
@@ -97,7 +89,6 @@ CI_CONFIG = {
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
@@ -108,7 +99,6 @@ CI_CONFIG = {
             "sanitizer": "",
             "package_type": "binary",
             "static_binary_name": "debug-amd64",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "enable",
             "with_coverage": False,
@@ -118,7 +108,6 @@ CI_CONFIG = {
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",
-            "bundled": "bundled",
             "libraries": "shared",
             "tidy": "disable",
             "with_coverage": False,
@@ -129,7 +118,6 @@ CI_CONFIG = {
             "sanitizer": "",
             "package_type": "binary",
             "static_binary_name": "macos",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
@@ -139,7 +127,6 @@ CI_CONFIG = {
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
@@ -150,7 +137,6 @@ CI_CONFIG = {
             "sanitizer": "",
             "package_type": "binary",
             "static_binary_name": "freebsd",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
@@ -161,7 +147,6 @@ CI_CONFIG = {
             "sanitizer": "",
             "package_type": "binary",
             "static_binary_name": "macos-aarch64",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
@@ -172,7 +157,6 @@ CI_CONFIG = {
             "sanitizer": "",
             "package_type": "binary",
             "static_binary_name": "powerpc64le",
-            "bundled": "bundled",
             "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,

tests/ci/report.py

@@ -283,7 +283,6 @@ tr:hover td {{filter: brightness(95%);}}
 <th>Compiler</th>
 <th>Build type</th>
 <th>Sanitizer</th>
-<th>Bundled</th>
 <th>Libraries</th>
 <th>Status</th>
 <th>Build log</th>
@@ -328,7 +327,6 @@ def create_build_html_report(
         else:
             row += "<td>{}</td>".format("none")
 
-        row += "<td>{}</td>".format(build_result.bundled)
         row += "<td>{}</td>".format(build_result.libraries)
 
         if build_result.status:

tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/main.clj

@@ -79,8 +79,7 @@
     :default ""]
    [nil, "--bench-opts STR" "Run perf-test mode"
     :default "--generator list_medium_nodes -c 30 -i 1000"]
-   ["-c" "--clickhouse-source URL" "URL for clickhouse deb or tgz package"
+   ["-c" "--clickhouse-source URL" "URL for clickhouse deb or tgz package"]
-    :default "https://clickhouse-builds.s3.yandex.net/21677/ef82333089156907a0979669d9374c2e18daabe5/clickhouse_build_check/clang-11_relwithdebuginfo_none_bundled_unsplitted_disable_False_deb/clickhouse-common-static_21.4.1.6313_amd64.deb"]
    [nil "--bench-path path" "Path to keeper-bench util"
     :default "/home/alesap/code/cpp/BuildCH/utils/keeper-bench/keeper-bench"]])