Fix previous value of EmptyCache map representation #14702
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
findepi
approved these changes
Oct 20, 2022
kokosing
force-pushed
the
origin/master/153_empty_cache
branch
from
2a79241 to
cf23167
Compare
|
Added tests. PTAL |
findepi
reviewed
Oct 24, 2022
| @@ -116,7 +116,7 @@ public ConcurrentMap<K, V> asMap() | |||
| public V putIfAbsent(K key, V value) | |||
| { | |||
| // Cache, even if configured to evict everything immediately, should allow writes. | |||
| return value; | |||
| return null; | |||
There was a problem hiding this comment.
the above comment looks weird now
There was a problem hiding this comment.
But you forced pushed.
Would you consider
// putIfAbsent returns the previous value
There was a problem hiding this comment.
Sorry about that 🤦
Notice that the put method has the old comment still, I find old comment still useful. It is more about empty cache, not the put method. I will leave both ones.
findepi
force-pushed
the
origin/master/153_empty_cache
branch
from
cf23167 to
8ad23f4
Compare
ssheikin
approved these changes
Oct 24, 2022
ssheikin
reviewed
Oct 24, 2022
lib/trino-collect/src/main/java/io/trino/collect/cache/EvictableCacheBuilder.java
Show resolved
Hide resolved
findepi
reviewed
Oct 24, 2022
lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
Outdated
Show resolved
Hide resolved
lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
Outdated
Show resolved
Hide resolved
| } | ||
|
|
||
| @Test(dataProvider = "disabledCacheImplementations") | ||
| public void testPutOnNonEmptyCache(DisabledCacheImplementation disabledCacheImplementation) |
There was a problem hiding this comment.
The cache constructed in this test looks to be empty.
There was a problem hiding this comment.
I wanted to stress that it is not EmptyCache implementation
lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
Outdated
Show resolved
Hide resolved
lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
Outdated
Show resolved
Hide resolved
findepi
reviewed
Oct 24, 2022
lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
Outdated
Show resolved
Hide resolved
lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
Outdated
Show resolved
Hide resolved
kokosing
force-pushed
the
origin/master/153_empty_cache
branch
from
8ad23f4 to
b7ac8d0
Compare
ssheikin
reviewed
Oct 24, 2022
lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
Outdated
Show resolved
Hide resolved
kokosing
force-pushed
the
origin/master/153_empty_cache
branch
from
b7ac8d0 to
d8a631c
Compare
findepi
reviewed
Oct 24, 2022
Comment on lines
+57
to
+59
| <exclusion> | ||
| <!-- conflicts with test-scoped dependency declared below --> | ||
| <groupId>org.openjdk.jmh</groupId> | ||
| <artifactId>jmh-core</artifactId> | ||
| </exclusion> |
There was a problem hiding this comment.
Let me do it as follow up.
findepi
approved these changes
Oct 24, 2022
| @@ -116,7 +116,7 @@ public ConcurrentMap<K, V> asMap() | |||
| public V putIfAbsent(K key, V value) | |||
| { | |||
| // Cache, even if configured to evict everything immediately, should allow writes. | |||
| return value; | |||
| return null; | |||
There was a problem hiding this comment.
But you forced pushed.
Would you consider
// putIfAbsent returns the previous value
lib/trino-collect/src/test/java/io/trino/collect/cache/TestEvictableCache.java
Outdated
Show resolved
Hide resolved
| } | ||
|
|
||
| @Test | ||
| public void testPutOnNonEmptyCache() |
There was a problem hiding this comment.
The cache under test is empty.
Add a comment capturing #14702 (comment)
There was a problem hiding this comment.
I prefer to rename the test
putIfAbsent returns previous value and since EmptyCache is not storing anything there is no previous value, so null should be returned.
kokosing
force-pushed
the
origin/master/153_empty_cache
branch
from
d8a631c to
5d3202f
Compare
|
Do we need a release note for this? |
|
No. It is not changing anything from point of the view of user. |
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.
Fix previous value of EmptyCache map representation
putIfAbsent returns previous value and since EmptyCache is not storing
anything there is no previous value, so null should be returned.