Merge pull request #54 from oraoto/nodelay

Add TCP_NODELAY option
ClickHouse · Jan 9, 2021 · 3255b18 · 3255b18
2 parents 9d8b99d + eb5971f
commit 3255b18
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/clickhouse/base/socket.cpp b/clickhouse/base/socket.cpp
@@ -169,6 +169,11 @@ void SocketHolder::SetTcpKeepAlive(int idle, int intvl, int cnt) noexcept {
 #endif
 }
 
+void SocketHolder::SetTcpNoDelay(bool nodelay) noexcept {
+    int val = nodelay;
+    setsockopt(handle_, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
+}
+
 SocketHolder& SocketHolder::operator = (SocketHolder&& other) noexcept {
     if (this != &other) {
         Close();

diff --git a/clickhouse/base/socket.h b/clickhouse/base/socket.h
@@ -62,6 +62,9 @@ class SocketHolder {
     ///         before dropping the connection.
     void SetTcpKeepAlive(int idle, int intvl, int cnt) noexcept;
 
+    /// @params nodelay whether to enable TCP_NODELAY
+    void SetTcpNoDelay(bool nodelay) noexcept;
+
     SocketHolder& operator = (SocketHolder&& other) noexcept;
 
     operator SOCKET () const noexcept;

diff --git a/clickhouse/client.cpp b/clickhouse/client.cpp
@@ -304,6 +304,9 @@ void Client::Impl::ResetConnection() {
                           options_.tcp_keepalive_intvl.count(),
                           options_.tcp_keepalive_cnt);
     }
+    if (options_.tcp_nodelay) {
+        s.SetTcpNoDelay(options_.tcp_nodelay);
+    }
 
     socket_ = std::move(s);
     socket_input_ = SocketInput(socket_);

diff --git a/clickhouse/client.h b/clickhouse/client.h
@@ -80,6 +80,9 @@ struct ClientOptions {
     DECLARE_FIELD(tcp_keepalive_intvl, std::chrono::seconds, SetTcpKeepAliveInterval, std::chrono::seconds(5));
     DECLARE_FIELD(tcp_keepalive_cnt, unsigned int, SetTcpKeepAliveCount, 3);
 
+    // TCP options
+    DECLARE_FIELD(tcp_nodelay, bool, TcpNoDelay, true);
+
 #undef DECLARE_FIELD
 };