optimize enumerate upload list

YangSen-qn · YangSen-qn · commit 24a8c9335c8f · 2021-07-07T16:28:50.000+08:00
diff --git a/QiniuSDK/Storage/QNUploadInfoV1.m b/QiniuSDK/Storage/QNUploadInfoV1.m
@@ -99,26 +99,26 @@ - (void)clearUploadState {
         return;
     }
     
-    for (QNUploadBlock *block in self.blockList) {
+    [self.blockList enumerateObjectsUsingBlock:^(QNUploadBlock *block, NSUInteger idx, BOOL * _Nonnull stop) {
         [block clearUploadState];
-    }
+    }];
 }
 
 - (void)checkInfoStateAndUpdate {
-    for (QNUploadBlock *block in self.blockList) {
+    [self.blockList enumerateObjectsUsingBlock:^(QNUploadBlock *block, NSUInteger idx, BOOL * _Nonnull stop) {
         [block checkInfoStateAndUpdate];
-    }
+    }];
 }
 
 - (long long)uploadSize {
     if (self.blockList == nil || self.blockList.count == 0) {
         return 0;
     }
     
-    long long uploadSize = 0;
-    for (QNUploadBlock *block in self.blockList) {
+    __block long long uploadSize = 0;
+    [self.blockList enumerateObjectsUsingBlock:^(QNUploadBlock *block, NSUInteger idx, BOOL * _Nonnull stop) {
         uploadSize += [block uploadSize];
-    }
+    }];
     return uploadSize;
 }
 
@@ -131,13 +131,13 @@ - (BOOL)isAllUploaded {
         return true;
     }
     
-    BOOL isAllUploaded = true;
-    for (QNUploadBlock *block in self.blockList) {
+    __block BOOL isAllUploaded = true;
+    [self.blockList enumerateObjectsUsingBlock:^(QNUploadBlock *block, NSUInteger idx, BOOL * _Nonnull stop) {
         if (!block.isCompleted) {
             isAllUploaded = false;
-            break;
+            *stop = true;
         }
-    }
+    }];
     return isAllUploaded;
 }
 
@@ -151,9 +151,9 @@ - (NSDictionary *)toDictionary {
     
     if (self.blockList != nil && self.blockList.count != 0) {
         NSMutableArray *blockInfoList = [NSMutableArray array];
-        for (QNUploadBlock *block in self.blockList) {
+        [self.blockList enumerateObjectsUsingBlock:^(QNUploadBlock *block, NSUInteger idx, BOOL * _Nonnull stop) {
             [blockInfoList addObject:[block toDictionary]];
-        }
+        }];
         [dictionary setObject:[blockInfoList copy] forKey:@"blockList"];
     }
     
@@ -224,14 +224,14 @@ - (QNUploadBlock *)nextUploadBlockFormBlockList {
         return nil;
     }
     
-    QNUploadBlock *block = nil;
-    for (QNUploadBlock *blockP in self.blockList) {
+    __block QNUploadBlock *block = nil;
+    [self.blockList enumerateObjectsUsingBlock:^(QNUploadBlock *blockP, NSUInteger idx, BOOL * _Nonnull stop) {
         QNUploadData *data = [blockP nextUploadDataWithoutCheckData];
         if (data != nil) {
             block = blockP;
-            break;
+            *stop = true;
         }
-    }
+    }];
     return block;
 }
 
@@ -301,11 +301,11 @@ - (QNUploadData *)nextUploadData:(QNUploadBlock *)block {
     }
     
     NSMutableArray *contexts = [NSMutableArray array];
-    for (QNUploadBlock *block in self.blockList) {
+    [self.blockList enumerateObjectsUsingBlock:^(QNUploadBlock *block, NSUInteger idx, BOOL * _Nonnull stop) {
         if (block.context && block.context.length > 0) {
             [contexts addObject:block.context];
         }
-    }
+    }];
     return [contexts copy];
 }
 
diff --git a/QiniuSDK/Storage/QNUploadInfoV2.m b/QiniuSDK/Storage/QNUploadInfoV2.m
@@ -112,26 +112,26 @@ - (void)clearUploadState {
         return;
     }
     
-    for (QNUploadData *data in self.dataList) {
+    [self.dataList enumerateObjectsUsingBlock:^(QNUploadData *data, NSUInteger idx, BOOL * _Nonnull stop) {
         [data clearUploadState];
-    }
+    }];
 }
 
 - (void)checkInfoStateAndUpdate {
-    for (QNUploadData *data in self.dataList) {
+    [self.dataList enumerateObjectsUsingBlock:^(QNUploadData *data, NSUInteger idx, BOOL * _Nonnull stop) {
         [data checkStateAndUpdate];
-    }
+    }];
 }
 
 - (long long)uploadSize {
     if (self.dataList == nil || self.dataList.count == 0) {
         return 0;
     }
     
-    long long uploadSize = 0;
-    for (QNUploadData *data in self.dataList) {
+    __block long long uploadSize = 0;
+    [self.dataList enumerateObjectsUsingBlock:^(QNUploadData *data, NSUInteger idx, BOOL * _Nonnull stop) {
         uploadSize += [data uploadSize];
-    }
+    }];
     return uploadSize;
 }
 
@@ -145,12 +145,11 @@ - (BOOL)isAllUploaded {
     }
     
     BOOL isAllUploaded = true;
-    for (QNUploadData *data in self.dataList) {
+    [self.dataList enumerateObjectsUsingBlock:^(QNUploadData *data, NSUInteger idx, BOOL * _Nonnull stop) {
         if (!data.isUploaded) {
-            isAllUploaded = false;
-            break;
+            *stop = true;
         }
-    }
+    }];
     return isAllUploaded;
 }
 
@@ -166,9 +165,9 @@ - (NSDictionary *)toDictionary {
     
     if (self.dataList != nil && self.dataList.count != 0) {
         NSMutableArray *blockInfoList = [NSMutableArray array];
-        for (QNUploadData *data in self.dataList) {
+        [self.dataList enumerateObjectsUsingBlock:^(QNUploadData *data, NSUInteger idx, BOOL * _Nonnull stop) {
             [blockInfoList addObject:[data toDictionary]];
-        }
+        }];
         [dictionary setObject:[blockInfoList copy] forKey:@"dataList"];
     }
     
@@ -244,13 +243,13 @@ - (QNUploadData *)nextUploadDataFormDataList {
         return nil;
     }
     
-    QNUploadData *data = nil;
-    for (QNUploadData *dataP in self.dataList) {
+    __block QNUploadData *data = nil;
+    [self.dataList enumerateObjectsUsingBlock:^(QNUploadData *dataP, NSUInteger idx, BOOL * _Nonnull stop) {
         if ([dataP needToUpload]) {
             data = dataP;
-            break;
+            *stop = true;
         }
-    }
+    }];
     
     return data;
 }
@@ -307,12 +306,12 @@ - (QNUploadData *)loadData:(QNUploadData *)data error:(NSError **)error {
     }
     
     NSMutableArray *infoArray = [NSMutableArray array];
-    for (QNUploadData *data in self.dataList) {
+    [self.dataList enumerateObjectsUsingBlock:^(QNUploadData *data, NSUInteger idx, BOOL * _Nonnull stop) {
         if (data.state == QNUploadStateComplete && data.etag != nil) {
             [infoArray addObject:@{@"etag" : data.etag,
                                    @"partNumber" : @([self getPartIndexOfData:data])}];
         }
-    }
+    }];
     
     return [infoArray copy];
 }

Original file line number	Diff line number	Diff line change
`@@ -112,26 +112,26 @@ - (void)clearUploadState {`
`112`	`112`	`return;`
`113`	`113`	`}`
`114`	`114`
`115`		`- for (QNUploadData *data in self.dataList) {`
	`115`	`+ [self.dataList enumerateObjectsUsingBlock:^(QNUploadData data, NSUInteger idx, BOOL _Nonnull stop) {`
`116`	`116`	`[data clearUploadState];`
`117`		`- }`
	`117`	`+ }];`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`- (void)checkInfoStateAndUpdate {`
`121`		`- for (QNUploadData *data in self.dataList) {`
	`121`	`+ [self.dataList enumerateObjectsUsingBlock:^(QNUploadData data, NSUInteger idx, BOOL _Nonnull stop) {`
`122`	`122`	`[data checkStateAndUpdate];`
`123`		`- }`
	`123`	`+ }];`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`- (long long)uploadSize {`
`127`	`127`	`if (self.dataList == nil \|\| self.dataList.count == 0) {`
`128`	`128`	`return 0;`
`129`	`129`	`}`
`130`	`130`
`131`		`- long long uploadSize = 0;`
`132`		`- for (QNUploadData *data in self.dataList) {`
	`131`	`+ __block long long uploadSize = 0;`
	`132`	`+ [self.dataList enumerateObjectsUsingBlock:^(QNUploadData data, NSUInteger idx, BOOL _Nonnull stop) {`
`133`	`133`	`uploadSize += [data uploadSize];`
`134`		`- }`
	`134`	`+ }];`
`135`	`135`	`return uploadSize;`
`136`	`136`	`}`
`137`	`137`
`@@ -145,12 +145,11 @@ - (BOOL)isAllUploaded {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`BOOL isAllUploaded = true;`
`148`		`- for (QNUploadData *data in self.dataList) {`
	`148`	`+ [self.dataList enumerateObjectsUsingBlock:^(QNUploadData data, NSUInteger idx, BOOL _Nonnull stop) {`
`149`	`149`	`if (!data.isUploaded) {`
`150`		`- isAllUploaded = false;`
`151`		`- break;`
	`150`	`+ *stop = true;`
`152`	`151`	`}`
`153`		`- }`
	`152`	`+ }];`
`154`	`153`	`return isAllUploaded;`
`155`	`154`	`}`
`156`	`155`
`@@ -166,9 +165,9 @@ - (NSDictionary *)toDictionary {`
`166`	`165`
`167`	`166`	`if (self.dataList != nil && self.dataList.count != 0) {`
`168`	`167`	`NSMutableArray *blockInfoList = [NSMutableArray array];`
`169`		`- for (QNUploadData *data in self.dataList) {`
	`168`	`+ [self.dataList enumerateObjectsUsingBlock:^(QNUploadData data, NSUInteger idx, BOOL _Nonnull stop) {`
`170`	`169`	`[blockInfoList addObject:[data toDictionary]];`
`171`		`- }`
	`170`	`+ }];`
`172`	`171`	`[dictionary setObject:[blockInfoList copy] forKey:@"dataList"];`
`173`	`172`	`}`
`174`	`173`
`@@ -244,13 +243,13 @@ - (QNUploadData *)nextUploadDataFormDataList {`
`244`	`243`	`return nil;`
`245`	`244`	`}`
`246`	`245`
`247`		`- QNUploadData *data = nil;`
`248`		`- for (QNUploadData *dataP in self.dataList) {`
	`246`	`+ __block QNUploadData *data = nil;`
	`247`	`+ [self.dataList enumerateObjectsUsingBlock:^(QNUploadData dataP, NSUInteger idx, BOOL _Nonnull stop) {`
`249`	`248`	`if ([dataP needToUpload]) {`
`250`	`249`	`data = dataP;`
`251`		`- break;`
	`250`	`+ *stop = true;`
`252`	`251`	`}`
`253`		`- }`
	`252`	`+ }];`
`254`	`253`
`255`	`254`	`return data;`
`256`	`255`	`}`
`@@ -307,12 +306,12 @@ - (QNUploadData )loadData:(QNUploadData )data error:(NSError **)error {`
`307`	`306`	`}`
`308`	`307`
`309`	`308`	`NSMutableArray *infoArray = [NSMutableArray array];`
`310`		`- for (QNUploadData *data in self.dataList) {`
	`309`	`+ [self.dataList enumerateObjectsUsingBlock:^(QNUploadData data, NSUInteger idx, BOOL _Nonnull stop) {`
`311`	`310`	`if (data.state == QNUploadStateComplete && data.etag != nil) {`
`312`	`311`	`[infoArray addObject:@{@"etag" : data.etag,`
`313`	`312`	`@"partNumber" : @([self getPartIndexOfData:data])}];`
`314`	`313`	`}`
`315`		`- }`
	`314`	`+ }];`
`316`	`315`
`317`	`316`	`return [infoArray copy];`
`318`	`317`	`}`