optimize interface

Author: 1261385937

clickhouse/base/socket.cpp

@@ -114,22 +114,20 @@ void SetNonBlock(SOCKET fd, bool value) {
 
 void SetTimeout(SOCKET fd, const SocketTimeoutParams& timeout_params) {
 #if defined(_unix_)
-    timeval recv_timeout { timeout_params.recv_timeout_s.count(), static_cast<int>(timeout_params.recv_timeout_us.count()) };
+    timeval recv_timeout{ timeout_params.recv_timeout.count() / 1000, static_cast<int>(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_s.count(), static_cast<int>(timeout_params.send_timeout_us.count()) };
+    timeval send_timeout{ timeout_params.send_timeout.count() / 1000, static_cast<int>(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) {
         throw std::system_error(getSocketErrorCode(), getErrorCategory(), "fail to set socket timeout");
     }
 #else
-    const struct timeval recv_tv { timeout_params.recv_timeout_s.count(), timeout_params.recv_timeout_us.count()};
-    DWORD recv_timeout = recv_tv.tv_sec * 1000 + recv_tv.tv_usec / 1000;
+    DWORD recv_timeout = static_cast<DWORD>(timeout_params.recv_timeout.count());
     auto recv_ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&recv_timeout, sizeof(DWORD));
-
-    const struct timeval send_tv { timeout_params.send_timeout_s.count(), timeout_params.send_timeout_us.count()};
-    DWORD send_timeout = send_tv.tv_sec * 1000 + send_tv.tv_usec / 1000;
+   
+    DWORD send_timeout = static_cast<DWORD>(timeout_params.send_timeout.count());
     auto send_ret = setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (const char*)&send_timeout, sizeof(DWORD));
 
     if (recv_ret == SOCKET_ERROR || send_ret == SOCKET_ERROR) {

clickhouse/base/socket.h

@@ -83,10 +83,8 @@ class SocketFactory {
 
 
 struct SocketTimeoutParams {
-    const std::chrono::seconds recv_timeout_s {0};
-    const std::chrono::seconds send_timeout_s {0};
-    const std::chrono::microseconds recv_timeout_us{ 0 };
-    const std::chrono::microseconds send_timeout_us{ 0 };
+    std::chrono::milliseconds recv_timeout{ 0 };
+    std::chrono::milliseconds send_timeout{ 0 };
 };
 
 class Socket : public SocketBase {