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

After rebase

Browse Source
This commit is contained in:
Nikita Mikhaylov 2021-08-25 15:37:17 +00:00
parent d7a627e5a9
commit e5593f594d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/IO/S3Common.h
View File

@ -9,12 +9,14 @@
#include <common/types.h> #include <common/types.h>
#include <aws/core/Aws.h> // Y_IGNORE #include <aws/core/Aws.h> // Y_IGNORE
#include <aws/core/client/ClientConfiguration.h> // Y_IGNORE #include <aws/core/client/ClientConfiguration.h> // Y_IGNORE
#include <aws/core/client/DefaultRetryStrategy.h>
#include <IO/S3/PocoHTTPClient.h> #include <IO/S3/PocoHTTPClient.h>
#include <Poco/URI.h> #include <Poco/URI.h>
namespace Aws::S3 namespace Aws::S3
{ {
class S3Client; class S3Client;
class RetryStrategy;
} }
namespace DB namespace DB

8
src/Storages/StorageS3.cpp
View File

@ -356,6 +356,7 @@ public:
const String & format_, const String & format_,
const Block & sample_block_, const Block & sample_block_,
ContextPtr context_, ContextPtr context_,
std::optional<FormatSettings> format_settings_,
const CompressionMethod compression_method_, const CompressionMethod compression_method_,
const std::shared_ptr<Aws::S3::S3Client> & client_, const std::shared_ptr<Aws::S3::S3Client> & client_,
const String & bucket_, const String & bucket_,
@ -372,7 +373,7 @@ public:
, key(key_) , key(key_)
, min_upload_part_size(min_upload_part_size_) , min_upload_part_size(min_upload_part_size_)
, max_single_part_upload_size(max_single_part_upload_size_) , max_single_part_upload_size(max_single_part_upload_size_)
, format_settings(format_settings_)
{ {
std::vector<ASTPtr> arguments(1, partition_by); std::vector<ASTPtr> arguments(1, partition_by);
ASTPtr partition_by_string = makeASTFunction(FunctionToString::name, std::move(arguments)); ASTPtr partition_by_string = makeASTFunction(FunctionToString::name, std::move(arguments));
@ -447,6 +448,7 @@ private:
const String key; const String key;
size_t min_upload_part_size; size_t min_upload_part_size;
size_t max_single_part_upload_size; size_t max_single_part_upload_size;
std::optional<FormatSettings> format_settings;
ExpressionActionsPtr partition_by_expr; ExpressionActionsPtr partition_by_expr;
String partition_by_column_name; String partition_by_column_name;
@ -473,6 +475,7 @@ private:
format, format,
sample_block, sample_block,
context, context,
format_settings,
compression_method, compression_method,
client, client,
partition_bucket, partition_bucket,
@ -647,6 +650,7 @@ SinkToStoragePtr StorageS3::write(const ASTPtr & query, const StorageMetadataPtr
format_name, format_name,
sample_block, sample_block,
local_context, local_context,
format_settings,
chosen_compression_method, chosen_compression_method,
client_auth.client, client_auth.client,
client_auth.uri.bucket, client_auth.uri.bucket,
@ -660,6 +664,7 @@ SinkToStoragePtr StorageS3::write(const ASTPtr & query, const StorageMetadataPtr
format_name, format_name,
sample_block, sample_block,
local_context, local_context,
format_settings,
chosen_compression_method, chosen_compression_method,
client_auth.client, client_auth.client,
client_auth.uri.bucket, client_auth.uri.bucket,
@ -713,6 +718,7 @@ void StorageS3::updateClientAndAuthSettings(ContextPtr ctx, StorageS3::ClientAut
client_configuration.endpointOverride = upd.uri.endpoint; client_configuration.endpointOverride = upd.uri.endpoint;
client_configuration.maxConnections = upd.max_connections; client_configuration.maxConnections = upd.max_connections;
client_configuration.retryStrategy = std::make_shared<Aws::Client::DefaultRetryStrategy>(/*maxRetry*/1, /*scope*/ 1);
upd.client = S3::ClientFactory::instance().create( upd.client = S3::ClientFactory::instance().create(
client_configuration, client_configuration,