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 GET redirects.

Browse Source
This commit is contained in:
Vladimir Chebotarev 2019-05-31 15:50:21 +00:00
parent 78f57c5f2a
commit caeacafb76
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ namespace ErrorCodes
namespace
{
void setTimeouts(Poco::Net::HTTPClientSession & session, const ConnectionTimeouts & timeouts)
void setTimeouts(Poco::Net::HTTPClientSession & session, const ConnectionTimeouts & timeouts)
{
#if defined(POCO_CLICKHOUSE_PATCH) || POCO_VERSION >= 0x02000000
session.setTimeout(timeouts.connection_timeout, timeouts.send_timeout, timeouts.receive_timeout);

11
dbms/src/IO/ReadWriteBufferFromS3.h
View File

@ -31,7 +31,7 @@ namespace DB
namespace detail
{
template <typename SessionPtr>
template <typename SessionPtr>//FIXME Можно избавиться от template, или переделать на нормальное.
class ReadWriteBufferFromS3Base : public ReadBuffer
{
protected:
@ -45,8 +45,8 @@ namespace detail
public:
using OutStreamCallback = std::function<void(std::ostream &)>;
explicit ReadWriteBufferFromS3Base(SessionPtr session_,
Poco::URI uri,
explicit ReadWriteBufferFromS3Base(Poco::URI uri,
const ConnectionTimeouts & timeouts = {},
const std::string & method = {},
OutStreamCallback out_stream_callback = {},
const Poco::Net::HTTPBasicCredentials & credentials = {},
@ -54,7 +54,7 @@ namespace detail
: ReadBuffer(nullptr, 0)
, uri {uri}
, method {!method.empty() ? method : out_stream_callback ? Poco::Net::HTTPRequest::HTTP_POST : Poco::Net::HTTPRequest::HTTP_GET}
, session {session_}
, session(makeHTTPSession(uri, timeouts))
{
Poco::Net::HTTPResponse response;
std::unique_ptr<Poco::Net::HTTPRequest> request;
@ -91,6 +91,7 @@ namespace detail
break;
uri = location_iterator->second;
session = makeHTTPSession(uri, timeouts);
}
assertResponseIsOk(*request, response, istr);
@ -120,7 +121,7 @@ public:
const ConnectionTimeouts & timeouts = {},
const Poco::Net::HTTPBasicCredentials & credentials = {},
size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE)
: Parent(makeHTTPSession(uri_, timeouts), uri_, method_, out_stream_callback, credentials, buffer_size_)
: Parent(uri_, timeouts, method_, out_stream_callback, credentials, buffer_size_)
{
}
};