Skip to content

Commit 4aa8cb2

Browse files
KochetovNicolaiKochetovNicolai
authored
Merge branch 'master' into cond-93233
2 parents 4272e2d + 8ab2d35 commit 4aa8cb2

393 files changed

Lines changed: 9553 additions & 3555 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,6 @@
303303
[submodule "contrib/c-ares"]
304304
path = contrib/c-ares
305305
url = https://github.com/c-ares/c-ares.git
306-
[submodule "contrib/incbin"]
307-
path = contrib/incbin
308-
url = https://github.com/graphitemaster/incbin.git
309306
[submodule "contrib/usearch"]
310307
path = contrib/usearch
311308
url = https://github.com/ClickHouse/usearch.git

‎CMakeLists.txt‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -137,19 +137,6 @@ endif ()
137137
include (cmake/check_flags.cmake)
138138
include (cmake/add_warning.cmake)
139139

140-
# generate ranges for fast "addr2line" search
141-
if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
142-
# NOTE: that clang has a bug because of it does not emit .debug_aranges
143-
# with ThinLTO, so custom ld.lld wrapper is shipped in docker images.
144-
set(COMPILER_FLAGS "${COMPILER_FLAGS} -gdwarf-aranges")
145-
endif ()
146-
147-
# See https://blog.llvm.org/posts/2021-04-05-constructor-homing-for-debug-info/
148-
if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO")
149-
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fuse-ctor-homing")
150-
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xclang -fuse-ctor-homing")
151-
endif()
152-
153140
option(ENABLE_TESTS "Provide unit_test_dbms target with Google.Test unit tests" ON)
154141
option(ENABLE_EXAMPLES "Build all example programs in 'examples' subdirectories" OFF)
155142
option(ENABLE_BENCHMARKS "Build all benchmark programs in 'benchmarks' subdirectories" OFF)
@@ -288,10 +275,6 @@ set (CMAKE_C_STANDARD 11)
288275
set (CMAKE_C_EXTENSIONS ON) # required by most contribs written in C
289276
set (CMAKE_C_STANDARD_REQUIRED ON)
290277

291-
# Enable C++14 sized global deallocation functions. It should be enabled by setting -std=c++14 but I'm not sure.
292-
# See https://reviews.llvm.org/D112921
293-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsized-deallocation")
294-
295278
# falign-functions=64 prevents from random performance regressions with the code change. Thus, providing more stable benchmarks.
296279
set(COMPILER_FLAGS "${COMPILER_FLAGS} -falign-functions=64")
297280

@@ -310,6 +293,18 @@ if (DISABLE_ALL_DEBUG_SYMBOLS)
310293
set (DEBUG_INFO_FLAGS "-g0")
311294
endif()
312295

296+
if (OS_DARWIN)
297+
# On Darwin the optimizatiosns to reduce the debug size are off by default. `-fno-standalone-debug` enables them
298+
set (DEBUG_INFO_FLAGS "${DEBUG_INFO_FLAGS} -fno-standalone-debug")
299+
endif()
300+
301+
# generate ranges for fast "addr2line" search
302+
if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
303+
# NOTE: that clang has a bug because of it does not emit .debug_aranges
304+
# with ThinLTO, so custom ld.lld wrapper is shipped in docker images.
305+
set(DEBUG_INFO_FLAGS "${DEBUG_INFO_FLAGS} -gdwarf-aranges")
306+
endif ()
307+
313308
# Disable omit frame pointer compiler optimization using -fno-omit-frame-pointer
314309
option(DISABLE_OMIT_FRAME_POINTER "Disable omit frame pointer compiler optimization" OFF)
315310

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ Upcoming meetups
5555
* [Seoul Meetup](https://www.meetup.com/clickhouse-seoul-user-group/events/312679894/) - January 29th, 2026
5656
* [Iceberg Meetup Brussels](https://luma.com/yx3lhqu9) - January 30th, 2026
5757
* [ClickHouse Dinner at FOSDEM](https://luma.com/czvs584m) - January 31st, 2026
58-
* [ClickHouse Barcelona Meetup](https://www.meetup.com/clickhouse-barcelona-user-group/events/312714616/) - February 3rd, 2026
59-
* [ClickHouse Madrid Meetup](https://www.meetup.com/clickhouse-spain-user-group/events/312714632/) - February 4th, 2026
58+
* [ClickHouse Barcelona Meetup](https://www.meetup.com/clickhouse-barcelona-user-group/events/312714616/) - February 5th, 2026
6059
* [ClickHouse London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/312314505/) - February 10th, 2026
6160

6261
Recent meetups

‎base/poco/Net/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ add_library (_poco_net ${SRCS})
44
add_library (Poco::Net ALIAS _poco_net)
55

66
if (OS_LINUX)
7-
target_compile_definitions (_poco_net PUBLIC POCO_HAVE_FD_EPOLL)
7+
target_compile_definitions (_poco_net PRIVATE POCO_HAVE_FD_EPOLL)
88
elseif (OS_DARWIN OR OS_FREEBSD)
9-
target_compile_definitions (_poco_net PUBLIC POCO_HAVE_FD_POLL)
9+
target_compile_definitions (_poco_net PRIVATE POCO_HAVE_FD_POLL)
1010
endif ()
1111

1212
if (OS_SUNOS)

‎ci/defs/job_configs.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,7 @@ class JobConfigs:
709709
"./ci/jobs/scripts/log_parser.py",
710710
]
711711
),
712+
timeout=3600 * 2,
712713
).parametrize(
713714
Job.ParamSet(
714715
parameter="amd_asan",

‎ci/infra/cloud.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from praktika import CloudInfrastructure
2+
3+
CLOUD = CloudInfrastructure.Config(
4+
name="cloud_infra", lambda_functions=[*CloudInfrastructure.SLACK_APP_LAMBDAS]
5+
)

‎ci/jobs/ast_fuzzer_job.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def run_fuzz_job(check_name: str):
7878
f.write("\n".join(changed_files))
7979

8080
Shell.check(command=run_command, verbose=True)
81-
81+
8282
# Fix file ownership after running docker as root
8383
logging.info("Fixing file ownership after running docker as root")
8484
uid = os.getuid()

‎ci/jobs/fast_test.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ def clone_submodules():
5252
"contrib/simdjson",
5353
"contrib/liburing",
5454
"contrib/libfiu",
55-
"contrib/incbin",
5655
"contrib/yaml-cpp",
5756
"contrib/corrosion",
5857
"contrib/StringZilla",

‎ci/jobs/performance_tests.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ def main():
410410
f"cp ./tests/performance/scripts/config/config.d/*xml {perf_right_config}/config.d/",
411411
f"cp -r ./tests/performance/scripts/config/users.d {perf_right_config}/users.d",
412412
f"cp -r ./tests/config/top_level_domains {perf_wd}",
413-
# f"cp -r ./tests/performance {perf_right}",
413+
f"rm {perf_right_config}/config.d/storage_conf_local.xml", # Avoid conflicts on the filesystem cache dirs
414414
f"chmod +x {ch_path}/clickhouse",
415415
f"ln -sf {ch_path}/clickhouse {perf_right}/clickhouse-server",
416416
f"ln -sf {ch_path}/clickhouse {perf_right}/clickhouse-local",

‎ci/jobs/scripts/fuzzer/run-fuzzer.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ EOL
5959
</clickhouse>
6060
EOL
6161

62-
(cd $repo_dir && python3 $repo_dir/ci/jobs/scripts/clickhouse_proc.py logs_export_config) || { echo "Failed to create log export config"; exit 1; }
62+
(cd $repo_dir && python3 $repo_dir/ci/jobs/scripts/clickhouse_proc.py logs_export_config) || echo "Failed to create log export config"
6363
}
6464

6565
function filter_exists_and_template
@@ -183,7 +183,7 @@ function fuzz
183183

184184
echo 'Server started and responded.'
185185

186-
(cd $repo_dir && python3 $repo_dir/ci/jobs/scripts/clickhouse_proc.py logs_export_start) || { echo "Failed to start log exports"; exit 1; }
186+
(cd $repo_dir && python3 $repo_dir/ci/jobs/scripts/clickhouse_proc.py logs_export_start) || echo "Failed to start log exports"
187187

188188
# Setup arguments for the fuzzer
189189
FUZZER_OUTPUT_SQL_FILE=''

0 commit comments

Comments
 (0)