LocalCache: Fix compute() to report COLLECTED removal cause for GC'd entries #8175
+45
−1
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.
Summary
When
compute()returns null for an entry whose value has been garbage collected, the removal cause should beCOLLECTED, notEXPLICIT.Changes
Fix: In
LocalCache.Segment.compute(), before callingremoveEntry(), check if the original value was null and the reference is still active. If so, useRemovalCause.COLLECTEDinstead ofRemovalCause.EXPLICIT.Test: Added
testComputeRemovalCause_collected()that simulates garbage collection of a cached value and verifies thatcompute()returning null reportsCOLLECTEDcause.Motivation
Reported by @ben-manes in #7985:
The null value in the removal notification should only occur for a
COLLECTEDcause.Testing
The new test:
compute()which returns nullCOLLECTEDcauseFixes #7985