diff --git a/deps/Makefile b/deps/Makefile index 25bcc603a7..22d3d62333 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -164,6 +164,7 @@ clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a: cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz && sync cd clickhouse-cpp && ln -fs clickhouse-cpp-*/ clickhouse-cpp cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch + patch -d clickhouse-cpp/clickhouse-cpp -p1 -i ../0001-fix-recv_timeout-and-send_timeout-initialization.patch cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo . cd clickhouse-cpp/clickhouse-cpp && CC=${CC} CXX=${CXX} ${MAKE} diff --git a/deps/clickhouse-cpp/0001-fix-recv_timeout-and-send_timeout-initialization.patch b/deps/clickhouse-cpp/0001-fix-recv_timeout-and-send_timeout-initialization.patch new file mode 100644 index 0000000000..f1dc83597c --- /dev/null +++ b/deps/clickhouse-cpp/0001-fix-recv_timeout-and-send_timeout-initialization.patch @@ -0,0 +1,29 @@ +From cfb12800e698a0e7273a9cb007d0d1658c1689f2 Mon Sep 17 00:00:00 2001 +From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> +Date: Tue, 3 Oct 2023 15:24:35 +0800 +Subject: [PATCH] fix recv_timeout and send_timeout initialization + +--- + clickhouse/base/socket.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/clickhouse/base/socket.cpp b/clickhouse/base/socket.cpp +index 28be7b6..3c86629 100644 +--- a/clickhouse/base/socket.cpp ++++ b/clickhouse/base/socket.cpp +@@ -129,10 +129,10 @@ void SetNonBlock(SOCKET fd, bool value) { + + void SetTimeout(SOCKET fd, const SocketTimeoutParams& timeout_params) { + #if defined(_unix_) +- timeval recv_timeout{ timeout_params.recv_timeout.count() / 1000, static_cast(timeout_params.recv_timeout.count() % 1000 * 1000) }; ++ timeval recv_timeout{ static_cast(timeout_params.recv_timeout.count() / 1000), static_cast(timeout_params.recv_timeout.count() % 1000 * 1000) }; + auto recv_ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &recv_timeout, sizeof(recv_timeout)); + +- timeval send_timeout{ timeout_params.send_timeout.count() / 1000, static_cast(timeout_params.send_timeout.count() % 1000 * 1000) }; ++ timeval send_timeout{ static_cast(timeout_params.send_timeout.count() / 1000), static_cast(timeout_params.send_timeout.count() % 1000 * 1000) }; + auto send_ret = setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &send_timeout, sizeof(send_timeout)); + + if (recv_ret == -1 || send_ret == -1) { +-- +2.45.0 + diff --git a/deps/coredumper/0001-Include-unistd.h-for-getpid.patch b/deps/coredumper/0001-Include-unistd.h-for-getpid.patch new file mode 100644 index 0000000000..386bf4be3a --- /dev/null +++ b/deps/coredumper/0001-Include-unistd.h-for-getpid.patch @@ -0,0 +1,24 @@ +From cb0b6bcde64b3d108f5f9adb429af57890e0bcee Mon Sep 17 00:00:00 2001 +From: Igor Raits +Date: Sat, 18 May 2024 19:57:19 +0200 +Subject: [PATCH] Include unistd.h for getpid() + +--- + src/thread_lister.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/thread_lister.c b/src/thread_lister.c +index 15fedac..48cb4e4 100644 +--- a/src/thread_lister.c ++++ b/src/thread_lister.c +@@ -34,6 +34,7 @@ + #include "thread_lister.h" + + #include /* needed for NULL on some powerpc platforms (?!) */ ++#include /* getpid() */ + #include + + #include "linuxthreads.h" +-- +2.45.0 +