thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-19 06:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'url_engine_problem' of https://github.com/millb/ClickHouse into url_engine_problem

Browse Source
This commit is contained in:
Mikhail Korotov 2019-11-05 18:58:17 +03:00
commit b0875c75c8
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,8 @@ ReadBufferFromS3::ReadBufferFromS3(Poco::URI uri_,
Poco::Net::HTTPResponse response; Poco::Net::HTTPResponse response;
std::unique_ptr<Poco::Net::HTTPRequest> request; std::unique_ptr<Poco::Net::HTTPRequest> request;
LOG_DEBUG(&Poco::Logger::get("DebugLogger"), "???? " + uri.toString() + " ????");
for (int i = 0; i < DEFAULT_S3_MAX_FOLLOW_GET_REDIRECT; ++i) for (int i = 0; i < DEFAULT_S3_MAX_FOLLOW_GET_REDIRECT; ++i)
{ {
// With empty path poco will send "POST HTTP/1.1" its bug. // With empty path poco will send "POST HTTP/1.1" its bug.
@ -52,6 +54,7 @@ ReadBufferFromS3::ReadBufferFromS3(Poco::URI uri_,
break; break;
uri = location_iterator->second; uri = location_iterator->second;
LOG_DEBUG(&Poco::Logger::get("DebugLogger"), "!!!! " + uri.toString() + "!!!!");
remote_host_filter.checkURL(uri); remote_host_filter.checkURL(uri);
session = makeHTTPSession(uri, timeouts); session = makeHTTPSession(uri, timeouts);
} }

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

@ -108,6 +108,7 @@ void WriteBufferFromS3::initiate()
{ {
initiate_uri.addQueryParameter(param.first, param.second); initiate_uri.addQueryParameter(param.first, param.second);
} }
LOG_DEBUG(&Poco::Logger::get("DebugLogger"), "???Write "+ uri.toString() + " ???");
for (int i = 0; i < DEFAULT_S3_MAX_FOLLOW_PUT_REDIRECT; ++i) for (int i = 0; i < DEFAULT_S3_MAX_FOLLOW_PUT_REDIRECT; ++i)
{ {
@ -139,6 +140,7 @@ void WriteBufferFromS3::initiate()
break; break;
initiate_uri = location_iterator->second; initiate_uri = location_iterator->second;
LOG_DEBUG(&Poco::Logger::get("DebugLogger"), "!!!Write " + initiate_uri.toString() + " !!!");
remote_host_filter.checkURL(initiate_uri); remote_host_filter.checkURL(initiate_uri);
} }
assertResponseIsOk(*request_ptr, response, *istr); assertResponseIsOk(*request_ptr, response, *istr);