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

deal with conflict

Browse Source
This commit is contained in:
xuelei 2023-08-27 23:41:23 -03:00
parent 88128db26f
commit bb12f7decc
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Disks/ObjectStorages/S3/registerDiskS3.cpp
View File

@ -104,12 +104,8 @@ void registerDiskS3(DiskFactory & factory, bool global_skip_access_check)
{ {
String endpoint = context->getMacros()->expand(config.getString(config_prefix + ".endpoint")); String endpoint = context->getMacros()->expand(config.getString(config_prefix + ".endpoint"));
S3::URI uri(endpoint); S3::URI uri(endpoint);
if(!uri.key.ends_with('/'))
if (uri.key.empty()) uri.key.push_back('/');
throw Exception(ErrorCodes::BAD_ARGUMENTS, "No key in S3 uri: {}", uri.uri.toString());
if (uri.key.back() != '/')
throw Exception(ErrorCodes::BAD_ARGUMENTS, "S3 path must ends with '/', but '{}' doesn't.", uri.key);
S3Capabilities s3_capabilities = getCapabilitiesFromConfig(config, config_prefix); S3Capabilities s3_capabilities = getCapabilitiesFromConfig(config, config_prefix);
std::shared_ptr<S3ObjectStorage> s3_storage; std::shared_ptr<S3ObjectStorage> s3_storage;