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

Fix sending progress.

Browse Source
This commit is contained in:
Vitaly Baranov 2020-10-24 09:49:45 +03:00
parent 4f0405af93
commit 98e2cc4117
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Server/GRPCServer.cpp
View File

@ -625,6 +625,7 @@ namespace
{ {
finalize = true; finalize = true;
io.onFinish(); io.onFinish();
addProgressToResult();
query_scope->logPeakMemoryUsage(); query_scope->logPeakMemoryUsage();
addLogsToResult(); addLogsToResult();
sendResult(); sendResult();
@ -730,8 +731,10 @@ namespace
void Call::addProgressToResult() void Call::addProgressToResult()
{ {
auto & grpc_progress = *result.mutable_progress();
auto values = progress.fetchAndResetPiecewiseAtomically(); auto values = progress.fetchAndResetPiecewiseAtomically();
if (!values.read_rows && !values.read_bytes && !values.total_rows_to_read && !values.written_rows && !values.written_bytes)
return;
auto & grpc_progress = *result.mutable_progress();
grpc_progress.set_read_rows(values.read_rows); grpc_progress.set_read_rows(values.read_rows);
grpc_progress.set_read_bytes(values.read_bytes); grpc_progress.set_read_bytes(values.read_bytes);
grpc_progress.set_total_rows_to_read(values.total_rows_to_read); grpc_progress.set_total_rows_to_read(values.total_rows_to_read);

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

@ -178,3 +178,30 @@ def test_logs():
assert "SELECT 1" in logs assert "SELECT 1" in logs
assert "Read 1 rows" in logs assert "Read 1 rows" in logs
assert "Peak memory usage" in logs assert "Peak memory usage" in logs
def test_progress():
results = query_no_errors("SELECT number, sleep(0.31) FROM numbers(8) SETTINGS max_block_size=2, interactive_delay=100000")
#print(results)
assert str(results) ==\
"""[progress {
read_rows: 2
read_bytes: 16
total_rows_to_read: 8
}
, output: "0\\t0\\n1\\t0\\n"
, progress {
read_rows: 2
read_bytes: 16
}
, output: "2\\t0\\n3\\t0\\n"
, progress {
read_rows: 2
read_bytes: 16
}
, output: "4\\t0\\n5\\t0\\n"
, progress {
read_rows: 2
read_bytes: 16
}
, output: "6\\t0\\n7\\t0\\n"
, ]"""