thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-30 03:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed trash logging and fixed query parameters in multipart uploads.

Browse Source
This commit is contained in:
Vladimir Chebotarev 2019-09-19 10:02:45 +00:00
parent bd1ce56797
commit 283e09d2a5
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/IO/ReadBufferFromS3.cpp
View File

@ -32,7 +32,7 @@ ReadBufferFromS3::ReadBufferFromS3(Poco::URI uri_,
if (!credentials.getUsername().empty()) if (!credentials.getUsername().empty())
credentials.authenticate(*request); credentials.authenticate(*request);
LOG_TRACE((&Logger::get("ReadWriteBufferFromS3")), "Sending request to " << uri.toString()); LOG_TRACE((&Logger::get("ReadBufferFromS3")), "Sending request to " << uri.toString());
session->sendRequest(*request); session->sendRequest(*request);

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

@ -49,9 +49,6 @@ void WriteBufferFromS3::nextImpl()
if (!offset()) if (!offset())
return; return;
LOG_TRACE((&Logger::get("WriteBufferFromS3")), "nextImpl(), offset() == " << offset());
temporary_buffer->write(working_buffer.begin(), offset()); temporary_buffer->write(working_buffer.begin(), offset());
last_part_size += offset(); last_part_size += offset();
@ -68,11 +65,9 @@ void WriteBufferFromS3::nextImpl()
void WriteBufferFromS3::finalize() void WriteBufferFromS3::finalize()
{ {
LOG_TRACE((&Logger::get("WriteBufferFromS3")), "finalize()");
temporary_buffer->finish(); temporary_buffer->finish();
if (!buffer_string.empty()) if (!buffer_string.empty())
{ {
LOG_TRACE((&Logger::get("WriteBufferFromS3")), "finalize(), writing last part");
writePart(buffer_string); writePart(buffer_string);
} }
@ -101,7 +96,8 @@ void WriteBufferFromS3::initiate()
HTTPSessionPtr session; HTTPSessionPtr session;
std::istream * istr = nullptr; /// owned by session std::istream * istr = nullptr; /// owned by session
Poco::URI initiate_uri = uri; Poco::URI initiate_uri = uri;
initiate_uri.setRawQuery("uploads"); // FIXME find how to leave user params as is initiate_uri.setRawQuery("uploads");
initiate_uri.setQueryParameters(uri.getQueryParameters());
for (int i = 0; i < DEFAULT_S3_MAX_FOLLOW_PUT_REDIRECT; ++i) for (int i = 0; i < DEFAULT_S3_MAX_FOLLOW_PUT_REDIRECT; ++i)
{ {
@ -225,7 +221,7 @@ void WriteBufferFromS3::complete()
String data; String data;
WriteBufferFromString buffer(data); WriteBufferFromString buffer(data);
writeString("<CompleteMultipartUpload>", buffer); // FIXME move to Poco::XML maybe?? writeString("<CompleteMultipartUpload>", buffer);
for (size_t i = 0; i < part_tags.size(); ++i) for (size_t i = 0; i < part_tags.size(); ++i)
{ {
writeString("<Part><PartNumber>", buffer); writeString("<Part><PartNumber>", buffer);