diff --git a/src/Interpreters/Cluster.cpp b/src/Interpreters/Cluster.cpp index 7ccb28ae0f5..bac688fe81e 100644 --- a/src/Interpreters/Cluster.cpp +++ b/src/Interpreters/Cluster.cpp @@ -138,13 +138,11 @@ String Cluster::Address::toString() const return toString(host_name, port); } - String Cluster::Address::toString(const String & host_name, UInt16 port) { return escapeForFileName(host_name) + ':' + DB::toString(port); } - String Cluster::Address::readableString() const { String res; diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp index 88c8aae4c60..d0d150c98cd 100644 --- a/src/Server/TCPHandler.cpp +++ b/src/Server/TCPHandler.cpp @@ -663,7 +663,6 @@ void TCPHandler::processOrdinaryQueryWithProcessors() break; } - if (after_send_progress.elapsed() / 1000 >= query_context->getSettingsRef().interactive_delay) { /// Some time passed and there is a progress. @@ -1026,7 +1025,6 @@ bool TCPHandler::receivePacket() } } - void TCPHandler::receiveIgnoredPartUUIDs() { state.part_uuids = true; @@ -1126,7 +1124,6 @@ void TCPHandler::receiveQuery() Settings passed_settings; passed_settings.read(*in, settings_format); - /// Interserver secret. std::string received_hash; if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET) diff --git a/src/Server/TCPHandler.h b/src/Server/TCPHandler.h index d1c6432799d..67dc2ade1bc 100644 --- a/src/Server/TCPHandler.h +++ b/src/Server/TCPHandler.h @@ -174,7 +174,7 @@ private: bool receiveData(bool scalar); bool readDataNext(const size_t & poll_interval, const int & receive_timeout); void readData(const Settings & connection_settings); - void receiveClusterNameAndSalt(); // ASSUMELocked + void receiveClusterNameAndSalt(); std::tuple getReadTimeouts(const Settings & connection_settings); [[noreturn]] void receiveUnexpectedData();