Commit Graph

4 Commits

Author SHA1 Message Date
fredwang ae683e7ed5 Merge 'fix_core_for_bthread_exception' into 'cnch-dev'
fix(clickhousech@m-5284646552): fix bthread_exception infinite recursion

See merge request: !24695
2024-10-09 02:18:30 +00:00
fredwang 1664fd4a65 Merge 'fky@cnch-dev@feat@support-llvm16' into 'cnch-dev'
feat(clickhousech@m-4724041502): support llvm-16 in cnch

See merge request: !23227
# Conflicts:
#	CMakeLists.txt
#	build_bin.sh
#	cmake/warnings.cmake
#	contrib/udns-cmake/CMakeLists.txt
#	programs/udf/pysrv/pycolumn.cpp
#	src/Common/StringUtils/StringUtils.cpp
#	src/Common/Trace/BRPCCarrierV2.h
#	src/Common/Trace/ExporterFactory.cpp
#	src/Common/Trace/Telemetry.cpp
#	src/Common/Trace/Telemetry.h
#	src/Common/Trace/TracerOptions.h
#	src/Functions/UserDefined/UserDefinedExternalFunctionFactory.cpp
#	src/MergeTreeCommon/MergeTreeMetaBase.cpp
#	src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
#	src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
#	src/Storages/MergeTree/VectorIndex/VectorIndexConfig.h
2024-09-27 03:16:47 +00:00
Dao 5915c39b01 Merge 'youzhiyuan_fix_alloc-dealloc-mismatch' into 'cnch-dev'
fix(clickhousech@m-3057469102): fix alloc-dealloc-mismatch

See merge request: https://code.byted.org/dp/ClickHouse/merge_requests/20276
2024-03-22 14:37:03 +08:00
Dao 3cde4d9c60 Merge branch 'youzhiyuan_fix_brpc_exception_handler' into 'cnch-dev'
fix(clickhousech@m-14726232): use per bthread exception handler to fix ASAN build

See merge request dp/ClickHouse!19502
# Conflicts:
#	.gitignore
2024-03-07 11:06:13 +08:00