Always adjust part size to keep low number of parts in downloaded files.

This commit is contained in:
levlam 2020-11-17 02:59:58 +03:00
parent 52a47b5f70
commit 3f33d15879

View File

@ -90,8 +90,8 @@ Status PartsManager::init_no_size(size_t part_size, const std::vector<int> &read
if (part_size != 0) { if (part_size != 0) {
part_size_ = part_size; part_size_ = part_size;
} else { } else {
part_size_ = 32 * (1 << 10); part_size_ = 32 << 10;
while (use_part_count_limit_ && calc_part_count(expected_size_, part_size_) > MAX_PART_COUNT) { while (calc_part_count(expected_size_, part_size_) > MAX_PART_COUNT) {
part_size_ *= 2; part_size_ *= 2;
CHECK(part_size_ <= MAX_PART_SIZE); CHECK(part_size_ <= MAX_PART_SIZE);
} }
@ -128,11 +128,12 @@ Status PartsManager::init(int64 size, int64 expected_size, bool is_size_final, s
if (part_size != 0) { if (part_size != 0) {
part_size_ = part_size; part_size_ = part_size;
if (use_part_count_limit_ && calc_part_count(expected_size_, part_size_) > MAX_PART_COUNT) { if (use_part_count_limit_ && calc_part_count(expected_size_, part_size_) > MAX_PART_COUNT) {
CHECK(is_upload_);
return Status::Error("FILE_UPLOAD_RESTART"); return Status::Error("FILE_UPLOAD_RESTART");
} }
} else { } else {
part_size_ = 64 * (1 << 10); part_size_ = 64 << 10;
while (use_part_count_limit && calc_part_count(expected_size_, part_size_) > MAX_PART_COUNT) { while (calc_part_count(expected_size_, part_size_) > MAX_PART_COUNT) {
part_size_ *= 2; part_size_ *= 2;
CHECK(part_size_ <= MAX_PART_SIZE); CHECK(part_size_ <= MAX_PART_SIZE);
} }