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

Fix tests

Browse Source
This commit is contained in:
kssenii 2021-11-01 09:52:27 +00:00
parent 03d7476864
commit 9080d2ea52
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Storages/ExternalDataSourceConfiguration.cpp
View File

@ -332,7 +332,7 @@ std::optional<URLBasedDataSourceConfig> getURLBasedDataSourceConfiguration(const
if (arg_name == "url")
configuration.url = arg_value.safeGet<String>();
if (arg_name == "method")
else if (arg_name == "method")
configuration.http_method = arg_value.safeGet<String>();
else if (arg_name == "format")
configuration.format = arg_value.safeGet<String>();

7
src/Storages/StorageURL.cpp
View File

@ -325,7 +325,7 @@ Pipe IStorageURLBase::read(
{
auto params = getReadURIParams(column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size);
bool with_globs = (uri.find('{') != std::string::npos && uri.find('}') != std::string::npos)
|| uri.find('|') == std::string::npos;
|| uri.find('|') != std::string::npos;
if (with_globs)
{
@ -390,6 +390,7 @@ Pipe StorageURLWithFailover::read(
unsigned /*num_streams*/)
{
auto params = getReadURIParams(column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size);
auto pipe = Pipe(std::make_shared<StorageURLSource>(
uri_options,
getReadMethod(),
@ -473,8 +474,8 @@ StorageURLWithFailover::StorageURLWithFailover(
{
Poco::URI poco_uri(uri_option);
context_->getRemoteHostFilter().checkURL(poco_uri);
uri_options.emplace_back(std::move(uri_option));
LOG_DEBUG(&Poco::Logger::get("StorageURLDistributed"), "Adding URL option: {}", uri_option);
uri_options.emplace_back(std::move(uri_option));
}
}
@ -539,7 +540,7 @@ URLBasedDataSourceConfiguration StorageURL::getConfiguration(ASTs & args, Contex
illegal_args += ", ";
illegal_args += arg.first;
}
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown arguments {} for table function URL", illegal_args);
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown argument `{}` for storage URL", illegal_args);
}
}
else

6
src/Storages/StorageXDBC.cpp
View File

@ -47,7 +47,7 @@ StorageXDBC::StorageXDBC(
, remote_table_name(remote_table_name_)
, log(&Poco::Logger::get("Storage" + bridge_helper->getName()))
{
poco_uri = bridge_helper->getMainURI();
uri = bridge_helper->getMainURI().toString();
}
std::string StorageXDBC::getReadMethod() const
@ -118,7 +118,7 @@ SinkToStoragePtr StorageXDBC::write(const ASTPtr & /*query*/, const StorageMetad
{
bridge_helper->startBridgeSync();
Poco::URI request_uri = poco_uri;
auto request_uri = Poco::URI(uri);
request_uri.setPath("/write");
auto url_params = bridge_helper->getURLParams(65536);
@ -137,7 +137,7 @@ SinkToStoragePtr StorageXDBC::write(const ASTPtr & /*query*/, const StorageMetad
metadata_snapshot->getSampleBlock(),
local_context,
ConnectionTimeouts::getHTTPTimeouts(local_context),
chooseCompressionMethod(poco_uri.toString(), compression_method));
chooseCompressionMethod(uri, compression_method));
}
Block StorageXDBC::getHeaderBlock(const Names & column_names, const StorageMetadataPtr & metadata_snapshot) const

2
src/Storages/StorageXDBC.h
View File

@ -41,8 +41,6 @@ public:
std::string getName() const override;
private:
Poco::URI poco_uri;
BridgeHelperPtr bridge_helper;
std::string remote_database_name;
std::string remote_table_name;

2
src/TableFunctions/TableFunctionURL.cpp
View File

@ -45,7 +45,7 @@ void TableFunctionURL::parseArguments(const ASTPtr & ast_function, ContextPtr co
illegal_args += ", ";
illegal_args += arg.first;
}
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown arguments {} for table function URL", illegal_args);
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown argument `{}` for table function URL", illegal_args);
}
filename = configuration.url;