thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 10:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: cancelling of remote/distributed queries [#CONV-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2012-10-16 17:32:59 +00:00
parent 41c04b36d8
commit 7f4d9e188c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dbms/include/DB/DataStreams/RemoteBlockInputStream.h
View File

@ -14,7 +14,7 @@ class RemoteBlockInputStream : public IProfilingBlockInputStream
{ {
public: public:
RemoteBlockInputStream(Connection & connection_, const String & query_, QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete) RemoteBlockInputStream(Connection & connection_, const String & query_, QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete)
: connection(connection_), query(query_), stage(stage_), sent_query(false), finished(false) : connection(connection_), query(query_), stage(stage_), sent_query(false), finished(false), cancelled(false)
{ {
} }
@ -28,6 +28,17 @@ public:
while (true) while (true)
{ {
/// Периодически (каждую секунду) проверяем, не запрошено ли прервать запрос.
while (!cancelled && !connection.poll(1000000))
{
if (is_cancelled_callback && is_cancelled_callback())
{
/// Если да - запросим удалённый сервер тоже прервать запрос.
cancelled = true;
connection.sendCancel();
}
}
Connection::Packet packet = connection.receivePacket(); Connection::Packet packet = connection.receivePacket();
switch (packet.type) switch (packet.type)
@ -106,6 +117,7 @@ private:
bool sent_query; bool sent_query;
bool finished; bool finished;
bool cancelled;
}; };
} }