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

Send profile info to client.

Browse Source
This commit is contained in:
Vitaly Baranov 2020-11-07 21:00:55 +03:00
parent 98e2cc4117
commit 9285f7edc1
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Server/GRPCServer.cpp
View File

@ -208,6 +208,7 @@ namespace
void addProgressToResult();
void addTotalsToResult(const Block & totals);
void addExtremesToResult(const Block & extremes);
void addProfileInfoToResult(const BlockStreamProfileInfo & info);
void addLogsToResult();
void sendResult();
void throwIfFailedToSendResult();
@ -579,6 +580,7 @@ namespace
addTotalsToResult(io.in->getTotals());
addExtremesToResult(io.in->getExtremes());
addProfileInfoToResult(io.in->getProfileInfo());
}
void Call::generateOutputWithProcessors()
@ -619,6 +621,7 @@ namespace
addTotalsToResult(executor->getTotalsBlock());
addExtremesToResult(executor->getExtremesBlock());
addProfileInfoToResult(executor->getProfileInfo());
}
void Call::finishQuery()
@ -766,6 +769,16 @@ namespace
stream->writeSuffix();
}
void Call::addProfileInfoToResult(const BlockStreamProfileInfo & info)
{
auto & stats = *result.mutable_stats();
stats.set_rows(info.rows);
stats.set_blocks(info.blocks);
stats.set_allocated_bytes(info.bytes);
stats.set_applied_limit(info.hasAppliedLimit());
stats.set_rows_before_limit(info.getRowsBeforeLimit());
}
void Call::addLogsToResult()
{
if (!logs_queue)

11
src/Server/grpc_protos/clickhouse_grpc.proto
View File

@ -46,6 +46,14 @@ message Progress {
uint64 written_bytes = 5;
}
message Stats {
uint64 rows = 1;
uint64 blocks = 2;
uint64 allocated_bytes = 3;
bool applied_limit = 4;
uint64 rows_before_limit = 5;
}
message Exception {
int32 code = 1;
string name = 2;
@ -59,7 +67,8 @@ message Result {
string extremes = 3;
repeated LogEntry logs = 4;
Progress progress = 5;
Exception exception = 6;
Stats stats = 6;
Exception exception = 7;
}
service ClickHouse {

9
tests/integration/test_grpc_protocol/test.py
View File

@ -204,4 +204,11 @@ def test_progress():
read_bytes: 16
}
, output: "6\\t0\\n7\\t0\\n"
, ]"""
, stats {
rows: 8
blocks: 4
allocated_bytes: 324
applied_limit: true
rows_before_limit: 8
}
]"""