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

Suppress output of cancelled queries in clickhouse-client #9473

Browse Source
This commit is contained in:
Alexey Milovidov 2020-06-01 21:58:38 +03:00
parent 4df6d41457
commit 7989e945e6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
programs/client/Client.cpp
View File

@ -1178,7 +1178,7 @@ private:
break;
}
if (!receiveAndProcessPacket())
if (!receiveAndProcessPacket(cancelled))
break;
}
@ -1189,14 +1189,16 @@ private:
/// Receive a part of the result, or progress info or an exception and process it.
/// Returns true if one should continue receiving packets.
bool receiveAndProcessPacket()
/// Output of result is suppressed if query was cancelled.
bool receiveAndProcessPacket(bool cancelled)
{
Packet packet = connection->receivePacket();
switch (packet.type)
{
case Protocol::Server::Data:
onData(packet.block);
if (!cancelled)
onData(packet.block);
return true;
case Protocol::Server::Progress:
@ -1208,11 +1210,13 @@ private:
return true;
case Protocol::Server::Totals:
onTotals(packet.block);
if (!cancelled)
onTotals(packet.block);
return true;
case Protocol::Server::Extremes:
onExtremes(packet.block);
if (!cancelled)
onExtremes(packet.block);
return true;
case Protocol::Server::Exception:
@ -1304,7 +1308,7 @@ private:
while (packet_type && *packet_type == Protocol::Server::Log)
{
receiveAndProcessPacket();
receiveAndProcessPacket(false);
packet_type = connection->checkPacket();
}
}