fix: _getPartSize (#846)

ali-sdk · Aug 10, 2020 · 70f6329 · 70f6329
1 parent 009c0b2
commit 70f6329
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/lib/browser/managed-upload.js b/lib/browser/managed-upload.js
@@ -301,16 +301,16 @@ proto._createStream = function _createStream(file, start, end) {
 
 proto._getPartSize = function _getPartSize(fileSize, partSize) {
  const maxNumParts = 10 * 1000;
- const defaultPartSize = 1024 * 1024;
+ const defaultPartSize = 1 * 1024 * 1024;
 
- if (!partSize) {
- return defaultPartSize;
- }
+ if (!partSize) partSize = defaultPartSize;
+ const safeSize = Math.ceil(fileSize / maxNumParts);
 
- return Math.max(
- Math.ceil(fileSize / maxNumParts),
- partSize
- );
+ if (partSize < safeSize) {
+ partSize = safeSize;
+ console.warn(`partSize has been set to ${partSize}, because the partSize you provided causes partNumber to be greater than 10,000`);
+ }
+ return partSize;
 };
 
 proto._divideParts = function _divideParts(fileSize, partSize) {

diff --git a/lib/managed-upload.js b/lib/managed-upload.js
@@ -295,14 +295,14 @@ proto._getPartSize = function _getPartSize(fileSize, partSize) {
  const maxNumParts = 10 * 1000;
  const defaultPartSize = 1 * 1024 * 1024;
 
- if (!partSize) {
- return defaultPartSize;
- }
+ if (!partSize) partSize = defaultPartSize;
+ const safeSize = Math.ceil(fileSize / maxNumParts);
 
- return Math.max(
- Math.ceil(fileSize / maxNumParts),
- partSize
- );
+ if (partSize < safeSize) {
+ partSize = safeSize;
+ console.warn(`partSize has been set to ${partSize}, because the partSize you provided causes partNumber to be greater than 10,000`);
+ }
+ return partSize;
 };
 
 proto._divideParts = function _divideParts(fileSize, partSize) {