From 6836bf6733487bdc8de5f950eba97ce5564acda1 Mon Sep 17 00:00:00 2001
From: Konstantin Podshumok <kpp.live@gmail.com>
Date: Sun, 3 Mar 2019 00:39:52 +0300
Subject: [PATCH] connection: make sure connection timeouts are applied during
 sendQuery

---
 dbms/src/Client/Connection.cpp | 2 ++
 dbms/src/Client/Connection.h   | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dbms/src/Client/Connection.cpp b/dbms/src/Client/Connection.cpp
index bc4fdad9825..9651ef54e1b 100644
--- a/dbms/src/Client/Connection.cpp
+++ b/dbms/src/Client/Connection.cpp
@@ -361,6 +361,8 @@ void Connection::sendQuery(
     if (!connected)
         connect(timeouts);
 
+    TimeoutSetter timeout_setter(*socket, timeouts.send_timeout, timeouts.receive_timeout, true);
+
     if (settings)
     {
         std::optional<int> level;
diff --git a/dbms/src/Client/Connection.h b/dbms/src/Client/Connection.h
index 2a85592b195..2338e4c8965 100644
--- a/dbms/src/Client/Connection.h
+++ b/dbms/src/Client/Connection.h
@@ -121,12 +121,6 @@ public:
     UInt16 getPort() const;
     const String & getDefaultDatabase() const;
 
-    /// For proper polling.
-    //inline const auto & getTimeouts() const
-    //{
-    //    return timeouts;
-    //}
-
     /// If last flag is true, you need to call sendExternalTablesData after.
     void sendQuery(
         const ConnectionTimeouts & timeouts,
@@ -221,7 +215,6 @@ private:
       */
     ThrottlerPtr throttler;
 
-    //ConnectionTimeouts timeouts;
     Poco::Timespan sync_request_timeout;
 
     /// From where to read query execution result.