thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

better

Browse Source
This commit is contained in:
Nikita Mikhaylov 2021-04-10 05:35:07 +03:00
parent c333c3dedb
commit 704fb04941
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Interpreters/Cluster.cpp
View File

@ -138,13 +138,11 @@ String Cluster::Address::toString() const
return toString(host_name, port); return toString(host_name, port);
} }
String Cluster::Address::toString(const String & host_name, UInt16 port) String Cluster::Address::toString(const String & host_name, UInt16 port)
{ {
return escapeForFileName(host_name) + ':' + DB::toString(port); return escapeForFileName(host_name) + ':' + DB::toString(port);
} }
String Cluster::Address::readableString() const String Cluster::Address::readableString() const
{ {
String res; String res;

3
src/Server/TCPHandler.cpp
View File

@ -663,7 +663,6 @@ void TCPHandler::processOrdinaryQueryWithProcessors()
break; break;
} }
if (after_send_progress.elapsed() / 1000 >= query_context->getSettingsRef().interactive_delay) if (after_send_progress.elapsed() / 1000 >= query_context->getSettingsRef().interactive_delay)
{ {
/// Some time passed and there is a progress. /// Some time passed and there is a progress.
@ -1026,7 +1025,6 @@ bool TCPHandler::receivePacket()
} }
} }
void TCPHandler::receiveIgnoredPartUUIDs() void TCPHandler::receiveIgnoredPartUUIDs()
{ {
state.part_uuids = true; state.part_uuids = true;
@ -1126,7 +1124,6 @@ void TCPHandler::receiveQuery()
Settings passed_settings; Settings passed_settings;
passed_settings.read(*in, settings_format); passed_settings.read(*in, settings_format);
/// Interserver secret. /// Interserver secret.
std::string received_hash; std::string received_hash;
if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET) if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET)

2
src/Server/TCPHandler.h
View File

@ -174,7 +174,7 @@ private:
bool receiveData(bool scalar); bool receiveData(bool scalar);
bool readDataNext(const size_t & poll_interval, const int & receive_timeout); bool readDataNext(const size_t & poll_interval, const int & receive_timeout);
void readData(const Settings & connection_settings); void readData(const Settings & connection_settings);
void receiveClusterNameAndSalt(); // ASSUMELocked void receiveClusterNameAndSalt();
std::tuple<size_t, int> getReadTimeouts(const Settings & connection_settings); std::tuple<size_t, int> getReadTimeouts(const Settings & connection_settings);
[[noreturn]] void receiveUnexpectedData(); [[noreturn]] void receiveUnexpectedData();