Update EvaluatorBuilder cache to be thread safe #62
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
Update EvaluatorBuilder to add locking around cache misses to avoid concurrent modification to a HashMap. Migrate all of the code to build a new cache to an inner class to better separate code concerns.
pkwarren
commented
Nov 10, 2023
| } | ||
| msgEval.append(new CelPrograms(compiledPrograms)); | ||
| } | ||
| private static class DescriptorCacheBuilder { |
There was a problem hiding this comment.
I'd recommend viewing the rest of this ignoring whitespace - it is really just moving functions inside this inner static class.
| resolver.resolveMessageConstraints(descriptor, EXTENSION_REGISTRY); | ||
| if (msgConstraints.getDisabled()) { | ||
| return; | ||
| synchronized (this) { |
There was a problem hiding this comment.
This is the key change - if we have a cache miss we'll check again (in case another thread beat us in the meantime) and if that fails, we'll rebuild a brand new cache map from the current one and the descriptor.
| @@ -54,8 +55,7 @@ public class EvaluatorBuilder { | |||
| EXTENSION_REGISTRY.add(ValidateProto.oneof); | |||
| } | |||
|
|
|||
| private final Map<Descriptor, Evaluator> evaluatorMap = new HashMap<>(); | |||
| private final ConstraintResolver resolver = new ConstraintResolver(); | |||
| private volatile ImmutableMap<Descriptor, Evaluator> evaluatorCache = ImmutableMap.of(); | |||
There was a problem hiding this comment.
I don't have to use immutablemap here, but I thought it was a good indication to make it clear that this cache won't be modified - if we have a cache miss we'll create a new map.
Alfus
approved these changes
Nov 10, 2023
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.
Update EvaluatorBuilder to add locking around cache misses to avoid concurrent modification to a HashMap. Migrate all of the code to build a new cache to an inner class to better separate code concerns.
Fixes #50.