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

Sending progress in HTTP headers (continued) [#CLICKHOUSE-32].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-01-22 18:20:37 +03:00
parent e56ccc9754
commit f1eb84bd48
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dbms/include/DB/IO/WriteBufferFromHTTPServerResponse.h
View File

@ -57,7 +57,7 @@ private:
/// Must be called under locked mutex.
void sendHeaders()
void startSendHeaders()
{
if (!out)
{
@ -93,6 +93,18 @@ private:
}
}
void sendAllHeaders()
{
startSendHeaders();
if (!body_started_sending)
{
body_started_sending = true;
/// Send end of headers delimiter.
*response_ostr << "\r\n" << std::flush;
}
}
void nextImpl() override
{
if (!offset())
@ -100,14 +112,7 @@ private:
std::lock_guard<std::mutex> lock(mutex);
sendHeaders();
if (!body_started_sending)
{
body_started_sending = true;
/// Send end of headers delimiter.
*response_ostr << "\r\n";
}
sendAllHeaders();
out->position() = position();
out->next();
@ -131,7 +136,7 @@ public:
if (body_started_sending)
return;
sendHeaders();
startSendHeaders();
std::string progress_string;
{
@ -148,7 +153,7 @@ public:
void finalize()
{
std::lock_guard<std::mutex> lock(mutex);
sendHeaders();
sendAllHeaders();
}
/// Turn compression on or off.