fix(amplify): change reset method #866
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diegocstn
reviewed
Nov 3, 2020
| @@ -22,7 +22,12 @@ extension Amplify { | |||
|
|
|||
| let group = DispatchGroup() | |||
|
|
|||
| for categoryType in CategoryType.allCases { | |||
| let manuallyResetCategories = [CategoryType.logging, .hub] | |||
There was a problem hiding this comment.
nit: let manuallyResetCategories: [CategoryType] = [.logging, .hub]
There was a problem hiding this comment.
Synced offline. You can take a look again.
lawmicha
approved these changes
Nov 3, 2020
Comment on lines
39
to
41
| case .hub, .logging: | ||
| // should be waited until other finish resetting | ||
| break |
There was a problem hiding this comment.
this class has a lot of hard coding logging and hub categories, maybe you can isolate these two categories that you can reuse in the rest of the code, like
let resetLastCategories = [CategoryType.hub, .logging]
then you can filter before line 25 by let resetFirstCategories = CategoryType.allCases.filter { !resetLastCategories.contains($0) }
With this, would you be able to avoid empty switch cases, similar to code like this?
for categoryType in resetFirstCategories {
reset(categoryType.category, in: group) { group.leave() }
}
group.wait()
for categoryType in resetLastCategories {
reset(categoryType.category, in: group) { group.leave() }
}
group.wait()
diegocstn
approved these changes
Nov 4, 2020
palpatim
approved these changes
Nov 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
The existing implementation of
Amplify.reset()is to callreset()on every Categories and put them in globalDispatchGroupwhich might cause a race condition. For example, during theDataStorereset process, it depends onHubto dispatch some event, but at that point,Hubmight already been reset and cause a precondition failure on https://github.com/aws-amplify/amplify-ios/blob/main/Amplify/Categories/Hub/HubCategory.swift#L44The change I made is:
reset()onloggingandhubcategories should be called when other categories finish resetting.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.