Skip to content

Commit 89cd7bc

Browse files
authored
Merge pull request #337 from jiayuehua/patch-1
fix recv_timeout and send_timeout initialization
2 parents 5cec31a + cfb1280 commit 89cd7bc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

clickhouse/base/socket.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ void SetNonBlock(SOCKET fd, bool value) {
129129

130130
void SetTimeout(SOCKET fd, const SocketTimeoutParams& timeout_params) {
131131
#if defined(_unix_)
132-
timeval recv_timeout{ timeout_params.recv_timeout.count() / 1000, static_cast<int>(timeout_params.recv_timeout.count() % 1000 * 1000) };
132+
timeval recv_timeout{ static_cast<time_t>(timeout_params.recv_timeout.count() / 1000), static_cast<suseconds_t>(timeout_params.recv_timeout.count() % 1000 * 1000) };
133133
auto recv_ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &recv_timeout, sizeof(recv_timeout));
134134

135-
timeval send_timeout{ timeout_params.send_timeout.count() / 1000, static_cast<int>(timeout_params.send_timeout.count() % 1000 * 1000) };
135+
timeval send_timeout{ static_cast<time_t>(timeout_params.send_timeout.count() / 1000), static_cast<suseconds_t>(timeout_params.send_timeout.count() % 1000 * 1000) };
136136
auto send_ret = setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &send_timeout, sizeof(send_timeout));
137137

138138
if (recv_ret == -1 || send_ret == -1) {

0 commit comments

Comments
 (0)