thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-04 21:42:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

more style fix.

Browse Source 
Signed-off-by: Jianfei Hu <hujianfei258@gmail.com>

space before catch.

Signed-off-by: Jianfei Hu <hujianfei258@gmail.com>
This commit is contained in:
Jianfei Hu 2023-10-31 20:32:19 +00:00
parent 3fff813659
commit 045d67ffc1
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/IO/S3/Client.cpp
View File

@ -1,5 +1,4 @@
#include <IO/S3/Client.h> #include <IO/S3/Client.h>
#include <aws/core/http/HttpClientFactory.h>
#if USE_AWS_S3 #if USE_AWS_S3

23
src/IO/S3/Credentials.cpp
View File

@ -246,10 +246,8 @@ String AWSEC2MetadataClient::getAvailabilityZoneOrException()
session.sendRequest(request); session.sendRequest(request);
std::istream& rs = session.receiveResponse(response); std::istream& rs = session.receiveResponse(response);
if (response.getStatus() != Poco::Net::HTTPResponse::HTTP_OK) { if (response.getStatus() != Poco::Net::HTTPResponse::HTTP_OK)
throw DB::Exception(ErrorCodes::AWS_ERROR, throw DB::Exception(ErrorCodes::AWS_ERROR, "Failed to get AWS availability zone. HTTP response code: {}", response.getStatus());
"Failed to get AWS availability zone. HTTP response code: {}", response.getStatus());
}
String response_data; String response_data;
Poco::StreamCopier::copyToString(rs, response_data); Poco::StreamCopier::copyToString(rs, response_data);
return response_data; return response_data;
@ -264,17 +262,14 @@ String getGCPAvailabilityZoneOrException()
request.set("Metadata-Flavor", "Google"); request.set("Metadata-Flavor", "Google");
session.sendRequest(request); session.sendRequest(request);
std::istream& rs = session.receiveResponse(response); std::istream& rs = session.receiveResponse(response);
if (response.getStatus() != Poco::Net::HTTPResponse::HTTP_OK) { if (response.getStatus() != Poco::Net::HTTPResponse::HTTP_OK)
throw DB::Exception(ErrorCodes::GCP_ERROR, throw DB::Exception(ErrorCodes::GCP_ERROR, "Failed to get GCP availability zone. HTTP response code: {}", response.getStatus());
"Failed to get GCP availability zone. HTTP response code: {}", response.getStatus());
}
String response_data; String response_data;
Poco::StreamCopier::copyToString(rs, response_data); Poco::StreamCopier::copyToString(rs, response_data);
Strings zone_info; Strings zone_info;
boost::split(zone_info, response_data, boost::is_any_of("/")); boost::split(zone_info, response_data, boost::is_any_of("/"));
if (zone_info.size() != 4) { if (zone_info.size() != 4)
throw DB::Exception(ErrorCodes::GCP_ERROR, "Invalid format of GCP zone information, expect projects/<project-number>/zones/<zone-value>, got {}", response_data); throw DB::Exception(ErrorCodes::GCP_ERROR, "Invalid format of GCP zone information, expect projects/<project-number>/zones/<zone-value>, got {}", response_data);
}
return zone_info[3]; return zone_info[3];
} }
@ -287,11 +282,12 @@ std::variant<String, std::exception_ptr> getRunningAvailabilityZoneImpl()
} }
catch (const DB::Exception & aws_ex) catch (const DB::Exception & aws_ex)
{ {
try{ try
{
auto gcp_zone = getGCPAvailabilityZoneOrException(); auto gcp_zone = getGCPAvailabilityZoneOrException();
return gcp_zone; return gcp_zone;
} }
catch(const DB::Exception & gcp_ex) catch (const DB::Exception & gcp_ex)
{ {
throw DB::Exception(ErrorCodes::UNSUPPORTED_METHOD, "Failed to find the availability zone, tried AWS, GCP. AWS Error {}\n GCP Error {}", aws_ex.displayText(), gcp_ex.displayText()); throw DB::Exception(ErrorCodes::UNSUPPORTED_METHOD, "Failed to find the availability zone, tried AWS, GCP. AWS Error {}\n GCP Error {}", aws_ex.displayText(), gcp_ex.displayText());
} }
@ -786,8 +782,7 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
AddProvider(std::make_shared<Aws::Auth::ProfileConfigFileAWSCredentialsProvider>()); AddProvider(std::make_shared<Aws::Auth::ProfileConfigFileAWSCredentialsProvider>());
} }
} }
} }
#endif #endif