fix the bug of uploading big files larger than 100G which caused the blockIndex overflow its type

Author: jemygraw

src/Qiniu/Storage/ResumableUploader.cs

@@ -108,7 +108,7 @@ public HttpResult UploadStream(Stream stream, string key, string upToken, PutExt
                 {
                     long uploadedBytes = 0;
                     long fileSize = stream.Length;
-                    int blockCount = (int)((fileSize + BLOCK_SIZE - 1) / BLOCK_SIZE);
+                    long blockCount = (fileSize + BLOCK_SIZE - 1) / BLOCK_SIZE;
 
                     //check resume record file
                     ResumeInfo resumeInfo = null;
@@ -136,7 +136,7 @@ public HttpResult UploadStream(Stream stream, string key, string upToken, PutExt
                     }
 
                     //calc upload progress
-                    for (int blockIndex = 0; blockIndex < blockCount; blockIndex++)
+                    for (long blockIndex = 0; blockIndex < blockCount; blockIndex++)
                     {
                         string context = resumeInfo.Contexts[blockIndex];
                         if (!string.IsNullOrEmpty(context))
@@ -152,16 +152,16 @@ public HttpResult UploadStream(Stream stream, string key, string upToken, PutExt
                     //check not finished blocks to upload
                     UploadControllerAction upCtrl = putExtra.UploadController();
                     ManualResetEvent manualResetEvent = new ManualResetEvent(false);
-                    Dictionary<int, byte[]> blockDataDict = new Dictionary<int, byte[]>();
-                    Dictionary<int, HttpResult> blockMakeResults = new Dictionary<int, HttpResult>();
+                    Dictionary<long, byte[]> blockDataDict = new Dictionary<long, byte[]>();
+                    Dictionary<long, HttpResult> blockMakeResults = new Dictionary<long, HttpResult>();
                     Dictionary<string, long> uploadedBytesDict = new Dictionary<string, long>();
                     uploadedBytesDict.Add("UploadProgress", uploadedBytes);
                     byte[] blockBuffer = new byte[BLOCK_SIZE];
-                    for (int blockIndex = 0; blockIndex < blockCount; blockIndex++)
+                    for (long blockIndex = 0; blockIndex < blockCount; blockIndex++)
                     {
                         string context = resumeInfo.Contexts[blockIndex];
                         if (string.IsNullOrEmpty(context))
-                        { 
+                        {
                             //check upload controller action before each chunk
                             while (true)
                             {
@@ -200,7 +200,7 @@ public HttpResult UploadStream(Stream stream, string key, string upToken, PutExt
                             {
                                 processMakeBlocks(blockDataDict, upToken, putExtra, resumeInfo, blockMakeResults, uploadedBytesDict, fileSize);
                                 //check mkblk results
-                                foreach(int blkIndex in blockMakeResults.Keys)
+                                foreach (int blkIndex in blockMakeResults.Keys)
                                 {
                                     HttpResult mkblkRet = blockMakeResults[blkIndex];
                                     if (mkblkRet.Code != 200)
@@ -292,15 +292,15 @@ public HttpResult UploadStream(Stream stream, string key, string upToken, PutExt
             return result;
         }
 
-        private void processMakeBlocks(Dictionary<int, byte[]> blockDataDict, string upToken,
-            PutExtra putExtra, ResumeInfo resumeInfo, Dictionary<int, HttpResult> blockMakeResults,
-            Dictionary<string,long> uploadedBytesDict, long fileSize)
+        private void processMakeBlocks(Dictionary<long, byte[]> blockDataDict, string upToken,
+            PutExtra putExtra, ResumeInfo resumeInfo, Dictionary<long, HttpResult> blockMakeResults,
+            Dictionary<string, long> uploadedBytesDict, long fileSize)
         {
             int taskMax = blockDataDict.Count;
             ManualResetEvent[] doneEvents = new ManualResetEvent[taskMax];
             int eventIndex = 0;
             object progressLock = new object();
-            foreach (int blockIndex in blockDataDict.Keys)
+            foreach (long blockIndex in blockDataDict.Keys)
             {
                 //signal task
                 ManualResetEvent doneEvent = new ManualResetEvent(false);
@@ -333,9 +333,9 @@ private void MakeBlock(object resumeBlockerObj)
         {
             ResumeBlocker resumeBlocker = (ResumeBlocker)resumeBlockerObj;
             ManualResetEvent doneEvent = resumeBlocker.DoneEvent;
-            Dictionary<int, HttpResult> blockMakeResults = resumeBlocker.BlockMakeResults;
+            Dictionary<long, HttpResult> blockMakeResults = resumeBlocker.BlockMakeResults;
             PutExtra putExtra = resumeBlocker.PutExtra;
-            int blockIndex = resumeBlocker.BlockIndex;
+            long blockIndex = resumeBlocker.BlockIndex;
             HttpResult result = new HttpResult();
             //check whether to cancel
             while (true)
@@ -353,8 +353,8 @@ private void MakeBlock(object resumeBlockerObj)
                     result.Code = (int)HttpCode.USER_CANCELED;
                     result.RefCode = (int)HttpCode.USER_CANCELED;
                     result.RefText += string.Format("[{0}] [ResumableUpload] Info: upload task is aborted, mkblk {1}\n",
-                        DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"),blockIndex);
-                    blockMakeResults.Add(blockIndex,result);
+                        DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"), blockIndex);
+                    blockMakeResults.Add(blockIndex, result);
                     return;
                 }
                 else
@@ -365,7 +365,7 @@ private void MakeBlock(object resumeBlockerObj)
 
             byte[] blockBuffer = resumeBlocker.BlockBuffer;
             int blockSize = blockBuffer.Length;
-           
+
             string upToken = resumeBlocker.UploadToken;
             Dictionary<string, long> uploadedBytesDict = resumeBlocker.UploadedBytesDict;
             long fileSize = resumeBlocker.FileSize;

src/Qiniu/Storage/ResumeBlocker.cs

@@ -8,17 +8,17 @@ class ResumeBlocker
     {
         public ManualResetEvent DoneEvent { set; get; }
         public byte[] BlockBuffer { set; get; }
-        public int BlockIndex { set; get; }
+        public long BlockIndex { set; get; }
         public string UploadToken { set; get; }
         public PutExtra PutExtra { set; get; }
         public ResumeInfo ResumeInfo { set; get; }
-        public Dictionary<int, HttpResult> BlockMakeResults;
+        public Dictionary<long, HttpResult> BlockMakeResults;
         public object ProgressLock { set; get; }
         public Dictionary<string, long> UploadedBytesDict { set; get; }
         public long FileSize { set; get; }
 
-        public ResumeBlocker(ManualResetEvent doneEvent, byte[] blockBuffer, int blockIndex, string uploadToken,
-            PutExtra putExtra, ResumeInfo resumeInfo, Dictionary<int, HttpResult> blockMakeResults,
+        public ResumeBlocker(ManualResetEvent doneEvent, byte[] blockBuffer, long blockIndex, string uploadToken,
+            PutExtra putExtra, ResumeInfo resumeInfo, Dictionary<long, HttpResult> blockMakeResults,
             object progressLock, Dictionary<string, long> uploadedBytesDict, long fileSize)
         {
             this.DoneEvent = doneEvent;

src/Qiniu/Storage/ResumeInfo.cs

@@ -16,7 +16,7 @@ public class ResumeInfo
         /// 文件块总数
         /// </summary>
         [JsonProperty("blockCount")]
-        public int BlockCount { get; set; }
+        public long BlockCount { get; set; }
 
         /// <summary>
         /// 上下文信息列表

src/Qiniu/Util/Signature.cs

@@ -31,7 +31,7 @@ public Signature(Mac mac)
         private string encodedSign(byte[] data)
         {
             HMACSHA1 hmac = new HMACSHA1(Encoding.UTF8.GetBytes(mac.SecretKey));
-            byte[] digest = hmac.ComputeHash(data);         
+            byte[] digest = hmac.ComputeHash(data);
             return Base64.UrlSafeBase64Encode(digest);
         }
 
@@ -48,7 +48,7 @@ private string encodedSign(string str)
         /// <returns></returns>
         public string Sign(byte[] data)
         {
-            return string.Format("{0}:{1}", mac.AccessKey,encodedSign(data));
+            return string.Format("{0}:{1}", mac.AccessKey, encodedSign(data));
         }
 
         /// <summary>