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

Fixed problems with double spaces in logs for S3Common.

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

10
src/IO/S3Common.cpp
View File

@ -2,6 +2,8 @@
#if USE_AWS_S3 #if USE_AWS_S3
# include <Common/quoteString.h>
# include <IO/S3Common.h> # include <IO/S3Common.h>
# include <IO/WriteBufferFromString.h> # include <IO/WriteBufferFromString.h>
# include <Storages/StorageS3Settings.h> # include <Storages/StorageS3Settings.h>
@ -631,7 +633,7 @@ namespace S3
/// 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(
"Bucket name length is out of bounds in virtual hosted style S3 URI: " + bucket + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS); "Bucket name length is out of bounds in virtual hosted style S3 URI: " + backQuote(bucket) + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS);
if (!uri.getPath().empty()) if (!uri.getPath().empty())
{ {
@ -644,7 +646,7 @@ namespace S3
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: " + name + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS); throw Exception("Object storage system name is unrecognized in virtual hosted style S3 URI: " + backQuote(name) + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS);
} }
if (name == S3) if (name == S3)
{ {
@ -664,10 +666,10 @@ namespace S3
/// 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(
"Bucket name length is out of bounds in path style S3 URI: " + bucket + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS); "Bucket name length is out of bounds in path style S3 URI: " + backQuote(bucket) + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS);
if (key.empty() || key == "/") if (key.empty() || key == "/")
throw Exception("Key name is empty in path style S3 URI: " + key + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS); throw Exception("Key name is empty in path style S3 URI: " + backQuote(key) + " (" + uri.toString() + ")", ErrorCodes::BAD_ARGUMENTS);
} }
else else
throw Exception("Bucket or key name are invalid in S3 URI: " + uri.toString(), ErrorCodes::BAD_ARGUMENTS); throw Exception("Bucket or key name are invalid in S3 URI: " + uri.toString(), ErrorCodes::BAD_ARGUMENTS);