Skip to content

Commit 966461b

Browse files
Fix clickhouse-cpp build on i686/aarch64
Fixes: #4550
1 parent 4f419e6 commit 966461b

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

deps/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a:
163163
cd clickhouse-cpp && ln -fsT clickhouse-cpp-2.3.0 clickhouse-cpp
164164
cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz && sync
165165
cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch
166+
patch -d clickhouse-cpp/clickhouse-cpp -p1 -i ../0001-fix-recv_timeout-and-send_timeout-initialization.patch
166167
cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
167168
cd clickhouse-cpp/clickhouse-cpp && CC=${CC} CXX=${CXX} ${MAKE}
168169

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From cfb12800e698a0e7273a9cb007d0d1658c1689f2 Mon Sep 17 00:00:00 2001
2+
From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com>
3+
Date: Tue, 3 Oct 2023 15:24:35 +0800
4+
Subject: [PATCH] fix recv_timeout and send_timeout initialization
5+
6+
---
7+
clickhouse/base/socket.cpp | 4 ++--
8+
1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+
diff --git a/clickhouse/base/socket.cpp b/clickhouse/base/socket.cpp
11+
index 28be7b6..3c86629 100644
12+
--- a/clickhouse/base/socket.cpp
13+
+++ b/clickhouse/base/socket.cpp
14+
@@ -129,10 +129,10 @@ void SetNonBlock(SOCKET fd, bool value) {
15+
16+
void SetTimeout(SOCKET fd, const SocketTimeoutParams& timeout_params) {
17+
#if defined(_unix_)
18+
- timeval recv_timeout{ timeout_params.recv_timeout.count() / 1000, static_cast<int>(timeout_params.recv_timeout.count() % 1000 * 1000) };
19+
+ timeval recv_timeout{ static_cast<time_t>(timeout_params.recv_timeout.count() / 1000), static_cast<suseconds_t>(timeout_params.recv_timeout.count() % 1000 * 1000) };
20+
auto recv_ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &recv_timeout, sizeof(recv_timeout));
21+
22+
- timeval send_timeout{ timeout_params.send_timeout.count() / 1000, static_cast<int>(timeout_params.send_timeout.count() % 1000 * 1000) };
23+
+ timeval send_timeout{ static_cast<time_t>(timeout_params.send_timeout.count() / 1000), static_cast<suseconds_t>(timeout_params.send_timeout.count() % 1000 * 1000) };
24+
auto send_ret = setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &send_timeout, sizeof(send_timeout));
25+
26+
if (recv_ret == -1 || send_ret == -1) {
27+
--
28+
2.45.0
29+

0 commit comments

Comments
 (0)