thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 18:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
michael1589 2021-11-25 23:03:01 +08:00
parent 8b99138701
commit fe501d4dd4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Storages/StorageURL.cpp
View File

@ -21,13 +21,11 @@
#include <Storages/PartitionedSink.h>
#include <Poco/Net/HTTPRequest.h>
#include <Poco/Base64Encoder.h>
#include <Processors/Sources/SourceWithProgress.h>
#include <QueryPipeline/QueryPipelineBuilder.h>
#include <Processors/Executors/PullingPipelineExecutor.h>
#include <base/logger_useful.h>
#include <algorithm>
#include <sstream>
namespace DB
@ -132,12 +130,15 @@ namespace
{
std::ostringstream ostr;
std::string userInfo = request_uri.getUserInfo();
if ("" != userInfo)
if (!userInfo.empty())
{
Poco::Base64Encoder encoder(ostr);
encoder.rdbuf()->setLineLength(0);
encoder << userInfo;
encoder.close();
std::string::size_type n;
n = userInfo.find(":");
if(n != std::string::npos)
{
credentials.setUsername(userInfo.substr(0, n));
credentials.setPassword(userInfo.substr(n+1));
}
}
read_buf = wrapReadBufferWithCompressionMethod(
@ -148,7 +149,6 @@ namespace
timeouts,
credentials,
context->getSettingsRef().max_http_get_redirects,
userInfo.length() == 0 ? Poco::Net::HTTPBasicCredentials{} : Poco::Net::HTTPBasicCredentials(ostr.str()),
DBMS_DEFAULT_BUFFER_SIZE,
context->getReadSettings(),
headers,