thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-30 05:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

move timeouts from members to parameters in Connection

Browse Source 
maybe it is better to provide some `set_timeouts` method?
This commit is contained in:
Konstantin Podshumok 2019-03-02 01:56:40 +03:00
parent 005217c9d9
commit 94b2bf5551
2 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dbms/src/Client/Connection.cpp
View File

@ -48,7 +48,7 @@ namespace ErrorCodes
} }
void Connection::connect() void Connection::connect(const ConnectionTimeouts & timeouts)
{ {
try try
{ {
@ -230,10 +230,15 @@ UInt16 Connection::getPort() const
return port; return port;
} }
void Connection::getServerVersion(String & name, UInt64 & version_major, UInt64 & version_minor, UInt64 & version_patch, UInt64 & revision) void Connection::getServerVersion(const ConnectionTimeouts & timeouts,
String & name,
UInt64 & version_major,
UInt64 & version_minor,
UInt64 & version_patch,
UInt64 & revision)
{ {
if (!connected) if (!connected)
connect(); connect(timeouts);
name = server_name; name = server_name;
version_major = server_version_major; version_major = server_version_major;
@ -242,40 +247,40 @@ void Connection::getServerVersion(String & name, UInt64 & version_major, UInt64
revision = server_revision; revision = server_revision;
} }
UInt64 Connection::getServerRevision() UInt64 Connection::getServerRevision(const ConnectionTimeouts & timeouts)
{ {
if (!connected) if (!connected)
connect(); connect(timeouts);
return server_revision; return server_revision;
} }
const String & Connection::getServerTimezone() const String & Connection::getServerTimezone(const ConnectionTimeouts & timeouts)
{ {
if (!connected) if (!connected)
connect(); connect(timeouts);
return server_timezone; return server_timezone;
} }
const String & Connection::getServerDisplayName() const String & Connection::getServerDisplayName(const ConnectionTimeouts & timeouts)
{ {
if (!connected) if (!connected)
connect(); connect(timeouts);
return server_display_name; return server_display_name;
} }
void Connection::forceConnected() void Connection::forceConnected(const ConnectionTimeouts & timeouts)
{ {
if (!connected) if (!connected)
{ {
connect(); connect(timeouts);
} }
else if (!ping()) else if (!ping())
{ {
LOG_TRACE(log_wrapper.get(), "Connection was closed, will reconnect."); LOG_TRACE(log_wrapper.get(), "Connection was closed, will reconnect.");
connect(); connect(timeouts);
} }
} }
@ -318,10 +323,11 @@ bool Connection::ping()
return true; return true;
} }
TablesStatusResponse Connection::getTablesStatus(const TablesStatusRequest & request) TablesStatusResponse Connection::getTablesStatus(const ConnectionTimeouts & timeouts,
const TablesStatusRequest & request)
{ {
if (!connected) if (!connected)
connect(); connect(timeouts);
TimeoutSetter timeout_setter(*socket, sync_request_timeout, true); TimeoutSetter timeout_setter(*socket, sync_request_timeout, true);
@ -344,6 +350,7 @@ TablesStatusResponse Connection::getTablesStatus(const TablesStatusRequest & req
void Connection::sendQuery( void Connection::sendQuery(
const ConnectionTimeouts & timeouts,
const String & query, const String & query,
const String & query_id_, const String & query_id_,
UInt64 stage, UInt64 stage,
@ -352,7 +359,7 @@ void Connection::sendQuery(
bool with_pending_data) bool with_pending_data)
{ {
if (!connected) if (!connected)
connect(); connect(timeouts);
if (settings) if (settings)
{ {

33
dbms/src/Client/Connection.h
View File

@ -57,7 +57,6 @@ public:
Connection(const String & host_, UInt16 port_, Connection(const String & host_, UInt16 port_,
const String & default_database_, const String & default_database_,
const String & user_, const String & password_, const String & user_, const String & password_,
const ConnectionTimeouts & timeouts_,
const String & client_name_ = "client", const String & client_name_ = "client",
Protocol::Compression compression_ = Protocol::Compression::Enable, Protocol::Compression compression_ = Protocol::Compression::Enable,
Protocol::Secure secure_ = Protocol::Secure::Disable, Protocol::Secure secure_ = Protocol::Secure::Disable,
@ -68,7 +67,6 @@ public:
client_name(client_name_), client_name(client_name_),
compression(compression_), compression(compression_),
secure(secure_), secure(secure_),
timeouts(timeouts_),
sync_request_timeout(sync_request_timeout_), sync_request_timeout(sync_request_timeout_),
log_wrapper(*this) log_wrapper(*this)
{ {
@ -106,11 +104,16 @@ public:
/// Change default database. Changes will take effect on next reconnect. /// Change default database. Changes will take effect on next reconnect.
void setDefaultDatabase(const String & database); void setDefaultDatabase(const String & database);
void getServerVersion(String & name, UInt64 & version_major, UInt64 & version_minor, UInt64 & version_patch, UInt64 & revision); void getServerVersion(const ConnectionTimeouts & timeouts,
UInt64 getServerRevision(); String & name,
UInt64 & version_major,
UInt64 & version_minor,
UInt64 & version_patch,
UInt64 & revision);
UInt64 getServerRevision(const ConnectionTimeouts & timeouts);
const String & getServerTimezone(); const String & getServerTimezone(const ConnectionTimeouts & timeouts);
const String & getServerDisplayName(); const String & getServerDisplayName(const ConnectionTimeouts & timeouts);
/// For log and exception messages. /// For log and exception messages.
const String & getDescription() const; const String & getDescription() const;
@ -119,13 +122,14 @@ public:
const String & getDefaultDatabase() const; const String & getDefaultDatabase() const;
/// For proper polling. /// For proper polling.
inline const auto & getTimeouts() const //inline const auto & getTimeouts() const
{ //{
return timeouts; // return timeouts;
} //}
/// If last flag is true, you need to call sendExternalTablesData after. /// If last flag is true, you need to call sendExternalTablesData after.
void sendQuery( void sendQuery(
const ConnectionTimeouts & timeouts,
const String & query, const String & query,
const String & query_id_ = "", const String & query_id_ = "",
UInt64 stage = QueryProcessingStage::Complete, UInt64 stage = QueryProcessingStage::Complete,
@ -156,9 +160,10 @@ public:
Packet receivePacket(); Packet receivePacket();
/// If not connected yet, or if connection is broken - then connect. If cannot connect - throw an exception. /// If not connected yet, or if connection is broken - then connect. If cannot connect - throw an exception.
void forceConnected(); void forceConnected(const ConnectionTimeouts & timeouts);
TablesStatusResponse getTablesStatus(const TablesStatusRequest & request); TablesStatusResponse getTablesStatus(const ConnectionTimeouts & timeouts,
const TablesStatusRequest & request);
/** Disconnect. /** Disconnect.
* This may be used, if connection is left in unsynchronised state * This may be used, if connection is left in unsynchronised state
@ -216,7 +221,7 @@ private:
*/ */
ThrottlerPtr throttler; ThrottlerPtr throttler;
ConnectionTimeouts timeouts; //ConnectionTimeouts timeouts;
Poco::Timespan sync_request_timeout; Poco::Timespan sync_request_timeout;
/// From where to read query execution result. /// From where to read query execution result.
@ -252,7 +257,7 @@ private:
LoggerWrapper log_wrapper; LoggerWrapper log_wrapper;
void connect(); void connect(const ConnectionTimeouts & timeouts);
void sendHello(); void sendHello();
void receiveHello(); void receiveHello();
bool ping(); bool ping();