Skip to content

Commit 204f2e1

Browse files
CurtizJCurtizJ
committed
Merge remote-tracking branch 'upstream/master' into HEAD
2 parents a55f39b + 5943d60 commit 204f2e1

File tree

421 files changed

+10888
-12888
lines changed

Some content is hidden

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

421 files changed

+10888
-12888
lines changed

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ Every month we get together with the community (users, contributors, customers,
4040

4141
Keep an eye out for upcoming meetups and events around the world. Somewhere else you want us to be? Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com. You can also peruse [ClickHouse Events](https://clickhouse.com/company/news-events) for a list of all upcoming trainings, meetups, speaking engagements, etc.
4242

43-
* [AWS Summit in DC](https://clickhouse.com/company/events/2024-06-aws-summit-dc) - Jun 26
44-
* [ClickHouse Meetup in Amsterdam](https://www.meetup.com/clickhouse-netherlands-user-group/events/300781068/) - Jun 27
4543
* [ClickHouse Meetup in Paris](https://www.meetup.com/clickhouse-france-user-group/events/300783448/) - Jul 9
4644
* [ClickHouse Cloud - Live Update Call](https://clickhouse.com/company/events/202407-cloud-update-live) - Jul 9
4745
* [ClickHouse Meetup @ Ramp - New York City](https://www.meetup.com/clickhouse-new-york-user-group/events/300595845/) - Jul 9

‎base/poco/Foundation/include/Poco/Logger.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#include <atomic>
2222
#include <cstddef>
2323
#include <map>
24+
#include <memory>
25+
#include <unordered_map>
2426
#include <vector>
2527

2628
#include "Poco/Channel.h"

‎base/poco/Foundation/include/Poco/Message.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020

2121
#include <map>
22+
#include <vector>
2223
#include "Poco/Foundation.h"
2324
#include "Poco/Timestamp.h"
2425

‎cmake/target.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ if (CMAKE_CROSSCOMPILING)
8484
message (FATAL_ERROR "Trying to cross-compile to unsupported system: ${CMAKE_SYSTEM_NAME}!")
8585
endif ()
8686

87-
message (STATUS "Cross-compiling for target: ${CMAKE_CXX_COMPILE_TARGET}")
87+
message (STATUS "Cross-compiling for target: ${CMAKE_CXX_COMPILER_TARGET}")
8888
endif ()

‎contrib/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,8 @@ add_contrib (ulid-c-cmake ulid-c)
228228

229229
add_contrib (libssh-cmake libssh)
230230

231+
add_contrib (prometheus-protobufs-cmake prometheus-protobufs prometheus-protobufs-gogo)
232+
231233
# Put all targets defined here and in subdirectories under "contrib/<immediate-subdir>" folders in GUI-based IDEs.
232234
# Some of third-party projects may override CMAKE_FOLDER or FOLDER property of their targets, so they would not appear
233235
# in "contrib/..." as originally planned, so we workaround this by fixing FOLDER properties of all targets manually,

‎contrib/aws-cmake/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ configure_file("${AWS_SDK_CORE_DIR}/include/aws/core/SDKConfig.h.in"
125125
"${CMAKE_CURRENT_BINARY_DIR}/include/aws/core/SDKConfig.h" @ONLY)
126126

127127
aws_get_version(AWS_CRT_CPP_VERSION_MAJOR AWS_CRT_CPP_VERSION_MINOR AWS_CRT_CPP_VERSION_PATCH FULL_VERSION GIT_HASH)
128-
configure_file("${AWS_CRT_DIR}/include/aws/crt/Config.h.in" "${AWS_CRT_DIR}/include/aws/crt/Config.h" @ONLY)
128+
configure_file("${AWS_CRT_DIR}/include/aws/crt/Config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/include/aws/crt/Config.h" @ONLY)
129129

130130
list(APPEND AWS_SOURCES ${AWS_SDK_CORE_SRC} ${AWS_SDK_CORE_NET_SRC} ${AWS_SDK_CORE_PLATFORM_SRC})
131131

‎contrib/azure‎

Submodule azure updated 210 files

‎contrib/google-protobuf-cmake/protobuf_generate.cmake‎

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -157,23 +157,21 @@ function(protobuf_generate)
157157

158158
set(_generated_srcs_all)
159159
foreach(_proto ${protobuf_generate_PROTOS})
160-
get_filename_component(_abs_file ${_proto} ABSOLUTE)
161-
get_filename_component(_abs_dir ${_abs_file} DIRECTORY)
162-
get_filename_component(_basename ${_proto} NAME_WE)
163-
file(RELATIVE_PATH _rel_dir ${CMAKE_CURRENT_SOURCE_DIR} ${_abs_dir})
164-
165-
set(_possible_rel_dir)
166-
if (NOT protobuf_generate_APPEND_PATH)
167-
set(_possible_rel_dir ${_rel_dir}/)
168-
endif()
160+
# The protobuf compiler doesn't return paths to the files it generates so we have to calculate those paths here:
161+
# _abs_file - absolute path to a .proto file,
162+
# _possible_rel_dir - relative path to the .proto file from some import directory specified in Protobuf_IMPORT_DIRS,
163+
# _basename - filename of the .proto file (without path and without extenstion).
164+
get_proto_absolute_path(_abs_file "${_proto}" ${_protobuf_include_path})
165+
get_proto_relative_path(_possible_rel_dir "${_abs_file}" ${_protobuf_include_path})
166+
get_filename_component(_basename "${_abs_file}" NAME_WE)
169167

170168
set(_generated_srcs)
171169
foreach(_ext ${protobuf_generate_GENERATE_EXTENSIONS})
172170
list(APPEND _generated_srcs "${protobuf_generate_PROTOC_OUT_DIR}/${_possible_rel_dir}${_basename}${_ext}")
173171
endforeach()
174172

175173
if(protobuf_generate_DESCRIPTORS AND protobuf_generate_LANGUAGE STREQUAL cpp)
176-
set(_descriptor_file "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.desc")
174+
set(_descriptor_file "${protobuf_generate_PROTOC_OUT_DIR}/${_possible_rel_dir}${_basename}.desc")
177175
set(_dll_desc_out "--descriptor_set_out=${_descriptor_file}")
178176
list(APPEND _generated_srcs ${_descriptor_file})
179177
endif()
@@ -196,3 +194,36 @@ function(protobuf_generate)
196194
target_sources(${protobuf_generate_TARGET} PRIVATE ${_generated_srcs_all})
197195
endif()
198196
endfunction()
197+
198+
# Calculates the absolute path to a .proto file.
199+
function(get_proto_absolute_path result proto)
200+
cmake_path(IS_ABSOLUTE proto _is_abs_path)
201+
if(_is_abs_path)
202+
set(${result} "${proto}" PARENT_SCOPE)
203+
return()
204+
endif()
205+
foreach(_include_dir ${ARGN})
206+
if(EXISTS "${_include_dir}/${proto}")
207+
set(${result} "${_include_dir}/${proto}" PARENT_SCOPE)
208+
return()
209+
endif()
210+
endforeach()
211+
message(SEND_ERROR "Not found protobuf ${proto} in Protobuf_IMPORT_DIRS: ${ARGN}")
212+
endfunction()
213+
214+
# Calculates a relative path to a .proto file. The returned path is relative to one of include directories.
215+
function(get_proto_relative_path result abs_path)
216+
set(${result} "" PARENT_SCOPE)
217+
get_filename_component(_abs_dir "${abs_path}" DIRECTORY)
218+
foreach(_include_dir ${ARGN})
219+
cmake_path(IS_PREFIX _include_dir "${_abs_dir}" _is_prefix)
220+
if(_is_prefix)
221+
file(RELATIVE_PATH _rel_dir "${_include_dir}" "${_abs_dir}")
222+
if(NOT _rel_dir STREQUAL "")
223+
set(${result} "${_rel_dir}/" PARENT_SCOPE)
224+
endif()
225+
return()
226+
endif()
227+
endforeach()
228+
message(WARNING "Not found protobuf ${abs_path} in Protobuf_IMPORT_DIRS: ${ARGN}")
229+
endfunction()

‎contrib/icu-cmake/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ else ()
55
endif ()
66

77
if (NOT ENABLE_ICU)
8-
message(STATUS "Not using icu")
8+
message(STATUS "Not using ICU")
99
return()
1010
endif()
1111

‎contrib/jemalloc-cmake/CMakeLists.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ if (OS_LINUX)
3434
# avoid spurious latencies and additional work associated with
3535
# MADV_DONTNEED. See
3636
# https://github.com/ClickHouse/ClickHouse/issues/11121 for motivation.
37-
set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:0,dirty_decay_ms:5000,prof:true,prof_active:false,background_thread:true")
37+
if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
38+
set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:0,dirty_decay_ms:5000")
39+
else()
40+
set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:0,dirty_decay_ms:5000,prof:true,prof_active:false,background_thread:true")
41+
endif()
3842
else()
3943
set (JEMALLOC_CONFIG_MALLOC_CONF "oversize_threshold:0,muzzy_decay_ms:0,dirty_decay_ms:5000")
4044
endif()

0 commit comments

Comments
 (0)