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

Fix merge

Browse Source
This commit is contained in:
Smita Kulkarni 2024-01-29 16:47:02 +01:00
parent ce0ebd9645
commit 6bfa910d9e
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
View File

@ -47,12 +47,10 @@ struct AzureObjectStorageSettings
size_t max_single_read_retries = 3; size_t max_single_read_retries = 3;
size_t max_single_download_retries = 3; size_t max_single_download_retries = 3;
int list_object_keys_size = 1000; int list_object_keys_size = 1000;
<<<<<<< HEAD
size_t min_upload_part_size = 16 * 1024 * 1024; size_t min_upload_part_size = 16 * 1024 * 1024;
size_t max_upload_part_size = 5ULL * 1024 * 1024 * 1024; size_t max_upload_part_size = 5ULL * 1024 * 1024 * 1024;
size_t max_single_part_copy_size = 256 * 1024 * 1024; size_t max_single_part_copy_size = 256 * 1024 * 1024;
bool use_native_copy = false; bool use_native_copy = false;
=======
size_t max_unexpected_write_error_retries = 4; size_t max_unexpected_write_error_retries = 4;
>>>>>>> master >>>>>>> master
}; };