Skip to content

Commit 01f9b61

Browse files
bachuebachue
authored
Merge pull request #420 from YangSen-qn/multi-region
revert multi region
2 parents c253960 + aa5a48e commit 01f9b61

File tree

10 files changed

+11
-175
lines changed

10 files changed

+11
-175
lines changed

‎QiniuSDK.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,6 @@
356356
4551E56724D0065100447285 /* NSData+QNMD5.h in Headers */ = {isa = PBXBuildFile; fileRef = 4551E56524D0065100447285 /* NSData+QNMD5.h */; };
357357
4551E56824D0065100447285 /* NSData+QNMD5.m in Sources */ = {isa = PBXBuildFile; fileRef = 4551E56624D0065100447285 /* NSData+QNMD5.m */; };
358358
4551E56924D0065100447285 /* NSData+QNMD5.m in Sources */ = {isa = PBXBuildFile; fileRef = 4551E56624D0065100447285 /* NSData+QNMD5.m */; };
359-
45CFDAFB292370720077890F /* QNApiType.h in Headers */ = {isa = PBXBuildFile; fileRef = 45CFDAF9292370720077890F /* QNApiType.h */; };
360-
45CFDAFC292370720077890F /* QNApiType.h in Headers */ = {isa = PBXBuildFile; fileRef = 45CFDAF9292370720077890F /* QNApiType.h */; };
361-
45CFDAFD292370720077890F /* QNApiType.m in Sources */ = {isa = PBXBuildFile; fileRef = 45CFDAFA292370720077890F /* QNApiType.m */; };
362-
45CFDAFE292370720077890F /* QNApiType.m in Sources */ = {isa = PBXBuildFile; fileRef = 45CFDAFA292370720077890F /* QNApiType.m */; };
363359
CC25135C244C7EB3003F4C65 /* QNBaseUpload.h in Headers */ = {isa = PBXBuildFile; fileRef = CC25135A244C7EB3003F4C65 /* QNBaseUpload.h */; };
364360
CC25135D244C7EB3003F4C65 /* QNBaseUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = CC25135B244C7EB3003F4C65 /* QNBaseUpload.m */; };
365361
CC25135E244C7EB3003F4C65 /* QNBaseUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = CC25135B244C7EB3003F4C65 /* QNBaseUpload.m */; };
@@ -593,8 +589,6 @@
593589
4551E55E24CE81DA00447285 /* QNInetAddress.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNInetAddress.m; sourceTree = "<group>"; };
594590
4551E56524D0065100447285 /* NSData+QNMD5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+QNMD5.h"; sourceTree = "<group>"; };
595591
4551E56624D0065100447285 /* NSData+QNMD5.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+QNMD5.m"; sourceTree = "<group>"; };
596-
45CFDAF9292370720077890F /* QNApiType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QNApiType.h; sourceTree = "<group>"; };
597-
45CFDAFA292370720077890F /* QNApiType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNApiType.m; sourceTree = "<group>"; };
598592
466E7AACB5F77BA0D4DE4070 /* Pods-QiniuSDK_MacTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK_MacTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK_MacTests/Pods-QiniuSDK_MacTests.debug.xcconfig"; sourceTree = "<group>"; };
599593
6663602DA8CC701EA3B11F04 /* Pods-QiniuSDK_iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK_iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK_iOS/Pods-QiniuSDK_iOS.debug.xcconfig"; sourceTree = "<group>"; };
600594
69B20FB4731F84969BC5AEBE /* Pods-QiniuSDK_Mac.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK_Mac.debug.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK_Mac/Pods-QiniuSDK_Mac.debug.xcconfig"; sourceTree = "<group>"; };
@@ -983,8 +977,6 @@
983977
31494475244852BA00386F16 /* QNFixedZone.m */,
984978
31D84468254017BD005C0222 /* QNErrorCode.h */,
985979
31D84469254017BD005C0222 /* QNErrorCode.m */,
986-
45CFDAF9292370720077890F /* QNApiType.h */,
987-
45CFDAFA292370720077890F /* QNApiType.m */,
988980
);
989981
path = Common;
990982
sourceTree = "<group>";
@@ -1152,7 +1144,6 @@
11521144
318E2F212552AE2F004EDE8C /* QNResponseInfo.h in Headers */,
11531145
31C9D2552717E106006B9433 /* QNCFHttpThreadPool.h in Headers */,
11541146
318E2F1F2552AE2F004EDE8C /* QNInetAddress.h in Headers */,
1155-
45CFDAFC292370720077890F /* QNApiType.h in Headers */,
11561147
3188D4D326490A0C00183CAE /* QNUploadInfo.h in Headers */,
11571148
318E2F122552AE2B004EDE8C /* QNUploadSystemClient.h in Headers */,
11581149
318E2F042552AE05004EDE8C /* QNUrlSafeBase64.h in Headers */,
@@ -1200,7 +1191,6 @@
12001191
31F553972456F2F3000B66AD /* QNUrlSafeBase64.h in Headers */,
12011192
31F553A62456F2F3000B66AD /* QNFile.h in Headers */,
12021193
31FE6A0B25A8320200C02B27 /* QNConnectChecker.h in Headers */,
1203-
45CFDAFB292370720077890F /* QNApiType.h in Headers */,
12041194
31F553CB24596C3D000B66AD /* QNHttpRegionRequest.h in Headers */,
12051195
31F5539A2456F2F3000B66AD /* QNVersion.h in Headers */,
12061196
31BAA27A243DB83700B7E883 /* NSURLRequest+QNRequest.h in Headers */,
@@ -1575,7 +1565,6 @@
15751565
3149A1E02462A57400A2A15B /* QNUploadServer.m in Sources */,
15761566
31F553C12457FFB0000B66AD /* QNPipeline.m in Sources */,
15771567
4551E56024CE81DA00447285 /* QNInetAddress.m in Sources */,
1578-
45CFDAFD292370720077890F /* QNApiType.m in Sources */,
15791568
CC25135D244C7EB3003F4C65 /* QNBaseUpload.m in Sources */,
15801569
DF437CDA1B2429E10099587B /* QNUpToken.m in Sources */,
15811570
3177B70625A30C4500C56293 /* QNSingleFlight.m in Sources */,
@@ -1700,7 +1689,6 @@
17001689
3149A1E12462A57400A2A15B /* QNUploadServer.m in Sources */,
17011690
4551E56124CE81DA00447285 /* QNInetAddress.m in Sources */,
17021691
31F553AF2457D2E5000B66AD /* QNALAssetFile.m in Sources */,
1703-
45CFDAFE292370720077890F /* QNApiType.m in Sources */,
17041692
313B380F2575E49400FBB57B /* QNPartsUploadPerformer.m in Sources */,
17051693
DF437CDC1B2429E10099587B /* QNUpToken.m in Sources */,
17061694
3177B70725A30C4500C56293 /* QNSingleFlight.m in Sources */,

‎QiniuSDK/Common/QNApiType.h‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎QiniuSDK/Common/QNApiType.m‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎QiniuSDK/Common/QNAutoZone.m‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,17 +133,16 @@ - (void)setDefaultZones:(NSArray <QNFixedZone *> *)zones {
133133
self.defaultZone = [QNFixedZone combineZones:zones];
134134
}
135135

136-
- (QNZonesInfo *)getZonesInfoWithToken:(QNUpToken * _Nullable)token
137-
actionType:(QNActionType)actionType {
136+
- (QNZonesInfo *)getZonesInfoWithToken:(QNUpToken * _Nullable)token {
138137

139138
if (token == nil) return nil;
140-
NSString *cacheKey = [NSString stringWithFormat:@"%@%@", token.index, [QNApiType actionTypeString:actionType]] ;
139+
NSString *cacheKey = [NSString stringWithFormat:@"%@", token.index] ;
141140
QNZonesInfo *zonesInfo = [[QNAutoZoneCache share] cacheForKey:cacheKey];
142141
zonesInfo = [zonesInfo copy];
143142
return zonesInfo;
144143
}
145144

146-
- (void)preQuery:(QNUpToken *)token actionType:(QNActionType)actionType on:(QNPrequeryReturn)ret {
145+
- (void)preQuery:(QNUpToken *)token on:(QNPrequeryReturn)ret {
147146

148147
if (token == nil || ![token isValid]) {
149148
ret(-1, [QNResponseInfo responseInfoWithInvalidToken:@"invalid token"], nil);
@@ -153,7 +152,7 @@ - (void)preQuery:(QNUpToken *)token actionType:(QNActionType)actionType on:(QNPr
153152
QNUploadRegionRequestMetrics *cacheMetrics = [QNUploadRegionRequestMetrics emptyMetrics];
154153
[cacheMetrics start];
155154

156-
NSString *cacheKey = [NSString stringWithFormat:@"%@%@", token.index, [QNApiType actionTypeString:actionType]] ;
155+
NSString *cacheKey = [NSString stringWithFormat:@"%@", token.index] ;
157156
QNZonesInfo *zonesInfo = [[QNAutoZoneCache share] zonesInfoForKey:cacheKey];
158157

159158
// 临时的 zonesInfo 仅能使用一次
@@ -190,7 +189,7 @@ - (void)preQuery:(QNUpToken *)token actionType:(QNActionType)actionType on:(QNPr
190189
QNUploadRegionRequestMetrics *metrics = [(QNUCQuerySingleFlightValue *)value metrics];
191190

192191
if (responseInfo && responseInfo.isOK) {
193-
QNZonesInfo *zonesInfo = [QNZonesInfo infoWithDictionary:response actionType:actionType];
192+
QNZonesInfo *zonesInfo = [QNZonesInfo infoWithDictionary:response];
194193
if ([zonesInfo isValid]) {
195194
[[QNAutoZoneCache share] cache:zonesInfo forKey:cacheKey];
196195
ret(0, responseInfo, metrics);
@@ -203,7 +202,7 @@ - (void)preQuery:(QNUpToken *)token actionType:(QNActionType)actionType on:(QNPr
203202
} else {
204203
QNZonesInfo *info = nil;
205204
if (self.defaultZone) {
206-
QNZonesInfo * infoP = [self.defaultZone getZonesInfoWithToken:token actionType:actionType];
205+
QNZonesInfo * infoP = [self.defaultZone getZonesInfoWithToken:token];
207206
if (infoP && [infoP isValid]) {
208207
[infoP toTemporary];
209208
info = infoP;

‎QiniuSDK/Common/QNFixedZone.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ - (instancetype)initWithUpDomainList:(NSArray<NSString *> *)upList
171171
return self;
172172
}
173173

174-
- (QNZonesInfo *)getZonesInfoWithToken:(QNUpToken *)token actionType:(QNActionType)actionType {
174+
- (QNZonesInfo *)getZonesInfoWithToken:(QNUpToken *)token {
175175
return self.zonesInfo;
176176
}
177177

‎QiniuSDK/Common/QNZone.h‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Qiniu. All rights reserved.
77
//
88

9-
#import "QNApiType.h"
9+
#import <Foundation/Foundation.h>
1010

1111
NS_ASSUME_NONNULL_BEGIN
1212

@@ -22,23 +22,10 @@ typedef void (^QNPrequeryReturn)(int code, QNResponseInfo * _Nullable httpRespon
2222
- (void)preQuery:(QNUpToken * _Nullable)token
2323
on:(QNPrequeryReturn _Nullable)ret;
2424

25-
/// 根据token查询相关 Zone 信息【内部使用】
26-
/// @param token token 信息
27-
/// @param actionType action 类型
28-
/// @param ret 查询回调
29-
- (void)preQuery:(QNUpToken * _Nullable)token
30-
actionType:(QNActionType)actionType
31-
on:(QNPrequeryReturn _Nullable)ret;
32-
3325
/// 根据token获取ZonesInfo 【内部使用】
3426
/// @param token token信息
3527
- (QNZonesInfo *)getZonesInfoWithToken:(QNUpToken * _Nullable)token;
3628

37-
/// 获取ZonesInfo 【内部使用】
38-
/// @param token token 信息
39-
/// @param actionType action 类型
40-
- (QNZonesInfo *)getZonesInfoWithToken:(QNUpToken * _Nullable)token actionType:(QNActionType)actionType;
41-
4229
@end
4330

4431
NS_ASSUME_NONNULL_END

‎QiniuSDK/Common/QNZone.m‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,11 @@
1313
@implementation QNZone
1414

1515
- (QNZonesInfo *)getZonesInfoWithToken:(QNUpToken *)token {
16-
return [self getZonesInfoWithToken:token actionType:QNActionTypeNone];
17-
}
18-
19-
- (QNZonesInfo *)getZonesInfoWithToken:(QNUpToken * _Nullable)token
20-
actionType:(QNActionType)actionType {
2116
return nil;
2217
}
2318

2419
- (void)preQuery:(QNUpToken *)token
2520
on:(QNPrequeryReturn)ret {
26-
[self preQuery:token actionType:QNActionTypeNone on:ret];
27-
}
28-
29-
- (void)preQuery:(QNUpToken *)token
30-
actionType:(QNActionType)actionType
31-
on:(QNPrequeryReturn)ret {
3221
ret(0, nil, nil);
3322
}
3423

‎QiniuSDK/Common/QNZoneInfo.h‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Qiniu. All rights reserved.
77
//
88

9-
#import "QNApiType.h"
9+
#import <Foundation/Foundation.h>
1010

1111
NS_ASSUME_NONNULL_BEGIN
1212

@@ -49,11 +49,6 @@ extern NSString *const QNZoneInfoEmptyRegionId;
4949
/// @param dictionary 键值对信息
5050
+ (instancetype)infoWithDictionary:(NSDictionary *)dictionary;
5151

52-
/// 根据键值对构造对象 【内部使用】
53-
/// @param dictionary 键值对信息
54-
/// @param actionType action 类型
55-
+ (instancetype)infoWithDictionary:(NSDictionary *)dictionary actionType:(QNActionType)actionType;
56-
5752
- (instancetype)initWithZonesInfo:(NSArray<QNZoneInfo *> *)zonesInfo;
5853

5954
// 转成临时 zones, 临时 Zones，不建议长期使用

‎QiniuSDK/Common/QNZoneInfo.m‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -139,40 +139,7 @@ - (instancetype)initWithZonesInfo:(NSArray<QNZoneInfo *> *)zonesInfo{
139139
}
140140

141141
+ (instancetype)infoWithDictionary:(NSDictionary *)dictionary {
142-
return [self infoWithDictionary:dictionary actionType:QNActionTypeNone];
143-
}
144-
145-
+ (instancetype)infoWithDictionary:(NSDictionary *)dictionary actionType:(QNActionType)actionType {
146142
NSMutableArray *zonesInfo = [NSMutableArray array];
147-
148-
NSArray *supportApis = [QNApiType apisWithActionType:actionType];
149-
if (supportApis != nil && supportApis.count > 0) {
150-
NSMutableDictionary *universal = [dictionary[@"universal"] mutableCopy];
151-
if ([universal isKindOfClass:[NSDictionary class]]) {
152-
153-
BOOL support = false;
154-
NSArray *apis = universal[@"support_apis"];
155-
if ([apis isKindOfClass:[NSArray class]]) {
156-
support = true;
157-
for (NSString *supportApi in supportApis) {
158-
if (![apis containsObject:supportApi]) {
159-
support = false;
160-
break;
161-
}
162-
}
163-
}
164-
165-
// 同时满足所有 api
166-
if (support) {
167-
[universal setObject:@"universal" forKey:@"region"];
168-
QNZoneInfo *zoneInfo = [QNZoneInfo zoneInfoFromDictionary:universal];
169-
if (zoneInfo && [zoneInfo isValid]) {
170-
[zonesInfo addObject:zoneInfo];
171-
}
172-
}
173-
}
174-
}
175-
176143
NSArray *hosts = dictionary[@"hosts"];
177144
if ([hosts isKindOfClass:[NSArray class]]) {
178145
for (NSInteger i = 0; i < hosts.count; i++) {

‎QiniuSDK/Storage/QNBaseUpload.m‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ - (void)run {
105105
[self.metrics start];
106106

107107
kQNWeakSelf;
108-
[_config.zone preQuery:self.token actionType:[self actionType] on:^(int code, QNResponseInfo *responseInfo, QNUploadRegionRequestMetrics *metrics) {
108+
[_config.zone preQuery:self.token on:^(int code, QNResponseInfo *responseInfo, QNUploadRegionRequestMetrics *metrics) {
109109
kQNStrongSelf;
110110
self.metrics.ucQueryMetrics = metrics;
111111

@@ -199,22 +199,10 @@ - (void)complete:(QNResponseInfo *)info
199199
self.strongSelf = nil;
200200
}
201201

202-
- (QNActionType)actionType {
203-
if ([self.upType containsString:QNUploadUpTypeForm]) {
204-
return QNActionTypeUploadByForm;
205-
} else if ([self.upType containsString:QNUploadUpTypeResumableV1]) {
206-
return QNActionTypeUploadByResumeV1;
207-
} else if ([self.upType containsString:QNUploadUpTypeResumableV2]) {
208-
return QNActionTypeUploadByResumeV2;
209-
} else {
210-
return QNActionTypeNone;
211-
}
212-
}
213-
214202
//MARK:-- region
215203
- (BOOL)setupRegions{
216204
NSMutableArray *defaultRegions = [NSMutableArray array];
217-
NSArray *zoneInfos = [self.config.zone getZonesInfoWithToken:self.token actionType:[self actionType]].zonesInfo;
205+
NSArray *zoneInfos = [self.config.zone getZonesInfoWithToken:self.token].zonesInfo;
218206
for (QNZoneInfo *zoneInfo in zoneInfos) {
219207
QNUploadDomainRegion *region = [[QNUploadDomainRegion alloc] init];
220208
[region setupRegionData:zoneInfo];

0 commit comments

Comments
 (0)