提交 55842dce 编写于 作者: G Guillaume Tassery

code style

上级 e0bd16c1
......@@ -15,19 +15,19 @@ void AllProgressValueImpl::read(ProgressValues & value, ReadBuffer & in, UInt64
size_t new_total_rows = 0;
size_t new_write_rows = 0;
size_t new_write_bytes = 0;
readVarUInt(new_rows, in);
readVarUInt(new_bytes, in);
readVarUInt(new_total_rows, in);
readVarUInt(new_write_rows, in);
readVarUInt(new_write_bytes, in);
value.rows = new_rows;
value.bytes = new_bytes;
value.total_rows = new_total_rows;
value.write_rows = new_write_rows;
value.write_bytes = new_write_bytes;
}
}
void AllProgressValueImpl::write(const ProgressValues & value, WriteBuffer & out, UInt64 /*client_revision*/)
......@@ -62,15 +62,15 @@ void ReadProgressValueImpl::read(ProgressValues & value, ReadBuffer & in, UInt64
size_t new_rows = 0;
size_t new_bytes = 0;
size_t new_total_rows = 0;
readVarUInt(new_rows, in);
readVarUInt(new_bytes, in);
readVarUInt(new_total_rows, in);
value.rows = new_rows;
value.bytes = new_bytes;
value.total_rows = new_total_rows;
}
}
void ReadProgressValueImpl::write(const ProgressValues & value, WriteBuffer & out, UInt64 /*client_revision*/)
......
......@@ -21,7 +21,7 @@ struct ProgressValues
size_t bytes;
size_t total_rows;
size_t write_rows;
size_t write_bytes;
size_t write_bytes;
template <typename ReadImpl = AllProgressValueImpl>
......@@ -152,7 +152,7 @@ struct Progress
res.total_rows = total_rows.fetch_and(0);
res.write_rows = write_rows.fetch_and(0);
res.write_bytes = write_bytes.fetch_and(0);
return res;
}
......@@ -163,7 +163,7 @@ struct Progress
total_rows = other.total_rows.load(std::memory_order_relaxed);
write_rows = other.write_rows.load(std::memory_order_relaxed);
write_bytes = other.write_bytes.load(std::memory_order_relaxed);
return *this;
}
......
......@@ -40,7 +40,7 @@ void WriteBufferFromHTTPServerResponse::writeHeaderSummary()
{
if (headers_finished_sending)
return;
WriteBufferFromOwnString progress_string_writer;
accumulated_progress.writeJSON(progress_string_writer);
......@@ -53,7 +53,7 @@ void WriteBufferFromHTTPServerResponse::writeHeaderProgress()
{
if (headers_finished_sending)
return;
WriteBufferFromOwnString progress_string_writer;
accumulated_progress.writeJSON<ReadProgressValueImpl>(progress_string_writer);
......
......@@ -317,7 +317,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
elem.written_bytes = info.written_bytes;
auto progress_callback = context.getProgressCallback();
if (progress_callback)
progress_callback(Progress(WriteProgress(info.written_rows, info.written_bytes)));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册