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

Fixed S3 PUT redirects.

Browse Source
This commit is contained in:
Vladimir Chebotarev 2019-06-11 00:07:20 +00:00
parent 634f82d0ad
commit 63164db019
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dbms/src/IO/WriteBufferFromS3.cpp
View File

@ -10,13 +10,15 @@ namespace DB
WriteBufferFromS3::WriteBufferFromS3(
const Poco::URI & uri_, const ConnectionTimeouts & timeouts_,
const Poco::Net::HTTPBasicCredentials & credentials_, size_t buffer_size_)
const Poco::Net::HTTPBasicCredentials & credentials, size_t buffer_size_)
: WriteBufferFromOStream(buffer_size_)
, uri {uri_}
, timeouts {timeouts_}
, credentials {credentials_}
, auth_request {Poco::Net::HTTPRequest::HTTP_PUT, uri.getPathAndQuery(), Poco::Net::HTTPRequest::HTTP_1_1}
{
ostr = &temporary_stream;
if (!credentials.getUsername().empty())
credentials.authenticate(auth_request);
}
void WriteBufferFromS3::finalize()
@ -26,6 +28,7 @@ void WriteBufferFromS3::finalize()
Poco::Net::HTTPResponse response;
std::unique_ptr<Poco::Net::HTTPRequest> request;
HTTPSessionPtr session;
std::istream * istr; /// owned by session
for (int i = 0; i < DEFAULT_S3_MAX_FOLLOW_PUT_REDIRECT; ++i)
{
@ -33,8 +36,10 @@ void WriteBufferFromS3::finalize()
request = std::make_unique<Poco::Net::HTTPRequest>(Poco::Net::HTTPRequest::HTTP_PUT, uri.getPathAndQuery(), Poco::Net::HTTPRequest::HTTP_1_1);
request->setHost(uri.getHost()); // use original, not resolved host name in header
if (!credentials.getUsername().empty())
if (auth_request.hasCredentials()) {
Poco::Net::HTTPBasicCredentials credentials(auth_request);
credentials.authenticate(*request);
}
// request.setChunkedTransferEncoding(true);
// Chunked transfers require additional logic, see:

2
dbms/src/IO/WriteBufferFromS3.h
View File

@ -30,7 +30,7 @@ class WriteBufferFromS3 : public WriteBufferFromOStream
private:
Poco::URI uri;
ConnectionTimeouts timeouts;
const Poco::Net::HTTPBasicCredentials & credentials;
Poco::Net::HTTPRequest auth_request;
std::ostringstream temporary_stream; /// Maybe one shall use some DB:: buffer.
public: