Skip to content

Commit fa7e0e0

Browse files
Merge pull request ClickHouse#11542 from ClickHouse/revert-11522-s3-http-client-memory-optimization
Revert "S3 HTTP client - Avoid copying response stream into memory"
2 parents 822c19d + 44b20ee commit fa7e0e0

File tree

4 files changed

+3
-37
lines changed

4 files changed

+3
-37
lines changed

contrib/aws

Submodule aws updated from 17e10c0 to f7d9ce3

src/IO/S3/PocoHTTPClient.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
#include <utility>
44
#include <IO/HTTPCommon.h>
5-
#include <IO/S3/PocoHTTPResponseStream.h>
6-
#include <IO/S3/PocoHTTPResponseStream.cpp>
75
#include <aws/core/http/HttpRequest.h>
86
#include <aws/core/http/HttpResponse.h>
97
#include <aws/core/http/standard/StandardHttpResponse.h>
@@ -151,7 +149,8 @@ void PocoHTTPClient::MakeRequestInternal(
151149
response->SetClientErrorMessage(error_message);
152150
}
153151
else
154-
response->GetResponseStream().SetUnderlyingStream(std::make_shared<PocoHTTPResponseStream>(session, response_body_stream));
152+
/// TODO: Do not copy whole stream.
153+
Poco::StreamCopier::copyStream(response_body_stream, response->GetResponseBody());
155154

156155
break;
157156
}

src/IO/S3/PocoHTTPResponseStream.cpp

-12
This file was deleted.

src/IO/S3/PocoHTTPResponseStream.h

-21
This file was deleted.

0 commit comments

Comments
 (0)