thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-17 21:24:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review fixes.

Browse Source
This commit is contained in:
Vladimir Chebotarev 2021-06-07 09:41:49 +03:00 committed by GitHub
parent 89664a3452
commit 8c33e53e80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/IO/S3Common.cpp
View File

@ -619,7 +619,7 @@ namespace S3
storage_name = S3; storage_name = S3;
if (uri.getHost().empty()) if (uri.getHost().empty())
throw Exception("Host is empty in S3 URI: " + uri.toString(), ErrorCodes::BAD_ARGUMENTS); throw Exception(ErrorCodes::BAD_ARGUMENTS, "Host is empty in S3 URI: {}", uri.toString());
String name; String name;
String endpoint_authority_from_uri; String endpoint_authority_from_uri;
@ -632,8 +632,8 @@ namespace S3
/// S3 specification requires at least 3 and at most 63 characters in bucket name. /// S3 specification requires at least 3 and at most 63 characters in bucket name.
/// https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-s3-bucket-naming-requirements.html /// https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-s3-bucket-naming-requirements.html
if (bucket.length() < 3 || bucket.length() > 63) if (bucket.length() < 3 || bucket.length() > 63)
throw Exception( throw Exception(ErrorCodes::BAD_ARGUMENTS,
"Bucket name length is out of bounds in virtual hosted style S3 URI: " + backQuote(bucket) + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS); "Bucket name length is out of bounds in virtual hosted style S3 URI: {} ({})", quoteString(bucket), uri.toString());
if (!uri.getPath().empty()) if (!uri.getPath().empty())
{ {
@ -642,11 +642,11 @@ namespace S3
} }
if (key.empty() || key == "/") if (key.empty() || key == "/")
throw Exception("Key name is empty in virtual hosted style S3 URI: " + key + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS); throw Exception(ErrorCodes::BAD_ARGUMENTS, "Key name is empty in virtual hosted style S3 URI: {} ({})", quoteString(key), uri.toString());
boost::to_upper(name); boost::to_upper(name);
if (name != S3 && name != COS) if (name != S3 && name != COS)
{ {
throw Exception("Object storage system name is unrecognized in virtual hosted style S3 URI: " + backQuote(name) + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS); throw Exception(ErrorCodes::BAD_ARGUMENTS, "Object storage system name is unrecognized in virtual hosted style S3 URI: {} ({})", quoteString(name), uri.toString());
} }
if (name == S3) if (name == S3)
{ {
@ -665,14 +665,14 @@ namespace S3
/// S3 specification requires at least 3 and at most 63 characters in bucket name. /// S3 specification requires at least 3 and at most 63 characters in bucket name.
/// https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-s3-bucket-naming-requirements.html /// https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-s3-bucket-naming-requirements.html
if (bucket.length() < 3 || bucket.length() > 63) if (bucket.length() < 3 || bucket.length() > 63)
throw Exception( throw Exception(ErrorCodes::BAD_ARGUMENTS,
"Bucket name length is out of bounds in path style S3 URI: " + backQuote(bucket) + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS); "Bucket name length is out of bounds in path style S3 URI: {} ({})", quoteString(bucket), uri.toString());
if (key.empty() || key == "/") if (key.empty() || key == "/")
throw Exception("Key name is empty in path style S3 URI: " + backQuote(key) + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS); throw Exception(ErrorCodes::BAD_ARGUMENTS, "Key name is empty in path style S3 URI: {} ({})", quoteString(key), uri.toString());
} }
else else
throw Exception("Bucket or key name are invalid in S3 URI: " + uri.toString(), ErrorCodes::BAD_ARGUMENTS); throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bucket or key name are invalid in S3 URI: {}", uri.toString());
} }
} }