smengcl commented on code in PR #4567:
URL: https://github.com/apache/ozone/pull/4567#discussion_r1244568291
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotCache.java:
##########
@@ -224,29 +225,33 @@ public ReferenceCounted<IOmMetadataReader, SnapshotCache>
get(String key,
* @param key snapshot table key
*/
public void release(String key) {
- ReferenceCounted<IOmMetadataReader, SnapshotCache> rcOmSnapshot =
- dbMap.get(key);
- Preconditions.checkNotNull(rcOmSnapshot,
- "Key '" + key + "' does not exist in cache");
-
- if (rcOmSnapshot.decrementRefCount() == 0L) {
- synchronized (pendingEvictionList) {
- // Eligible to be closed, add it to the list.
- pendingEvictionList.add(rcOmSnapshot);
- // The cache size might have already exceed the soft limit
- // Thus triggering cleanup() to check and evict if applicable
- cleanup();
+ dbMap.compute(key, (k, v) -> {
+ if (v == null) {
+ throw new IllegalArgumentException(
+ "Key '" + key + "' does not exist in cache");
}
- }
+
+ if (v.decrementRefCount() == 0L) {
+ synchronized (pendingEvictionList) {
+ // Eligible to be closed, add it to the list.
+ pendingEvictionList.add(v);
+ // The cache size might have already exceed the soft limit
+ // Thus triggering cleanup() to check and evict if applicable
+ cleanup();
+ }
+ }
+
+ return v;
Review Comment:
Good point. Replaced this line with `return dbMap.get(k);`
Might look hacky, but it works. Tested with a snippet:
```java
import java.util.concurrent.ConcurrentHashMap;
class Untitled {
public static void main(String[] args) {
ConcurrentHashMap map = new ConcurrentHashMap<String, String>();
String k1 = "k1";
map.put(k1, "val1");
map.compute(k1, (k, v) -> {
System.out.format("k=%s, v=%s\n", k, v);
map.remove(k);
return map.get(k);
});
System.out.format("k=%s, v=%s\n", k1, map.get(k1));
}
}
```
Output:
```
k=k1, v=val1
k=k1, v=null
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
