honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement Iterator#remove for Cache values iter (#29633)

Browse Source 
This commit implements the ability to remove values from a Cache using
the values iterator. This brings the values iterator in line with the
keys iterator and adds support for removing items in the cache that are
not easily found by the key used for the cache.
This commit is contained in:
Jay Modi 2018-04-20 07:21:08 -06:00 committed by GitHub
parent 42d81a2945
commit dfc7ca7214
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/main/java/org/elasticsearch/common/cache/Cache.java vendored
View File

@ -580,7 +580,8 @@ public class Cache<K, V> {
/**
* An LRU sequencing of the values in the cache. This sequence is not protected from mutations
* to the cache. The result of iteration under mutation is undefined.
* to the cache (except for {@link Iterator#remove()}. The result of iteration under any other mutation is
* undefined.
*
* @return an LRU-ordered {@link Iterable} over the values in the cache
*/
@ -597,6 +598,11 @@ public class Cache<K, V> {
public V next() {
return iterator.next().value;
}
@Override
public void remove() {
iterator.remove();
}
};
}

31
server/src/test/java/org/elasticsearch/common/cache/CacheTests.java vendored
View File

@ -27,6 +27,7 @@ import java.lang.management.ThreadMXBean;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Random;
@ -824,4 +825,34 @@ public class CacheTests extends ESTestCase {
cache.refresh();
assertEquals(500, cache.count());
}
public void testRemoveUsingValuesIterator() {
final List<RemovalNotification<Integer, String>> removalNotifications = new ArrayList<>();
Cache<Integer, String> cache =
CacheBuilder.<Integer, String>builder()
.setMaximumWeight(numberOfEntries)
.removalListener(removalNotifications::add)
.build();
for (int i = 0; i < numberOfEntries; i++) {
cache.put(i, Integer.toString(i));
}
assertThat(removalNotifications.size(), is(0));
final List<String> expectedRemovals = new ArrayList<>();
Iterator<String> valueIterator = cache.values().iterator();
while (valueIterator.hasNext()) {
String value = valueIterator.next();
if (randomBoolean()) {
valueIterator.remove();
expectedRemovals.add(value);
}
}
assertEquals(expectedRemovals.size(), removalNotifications.size());
for (int i = 0; i < expectedRemovals.size(); i++) {
assertEquals(expectedRemovals.get(i), removalNotifications.get(i).getValue());
assertEquals(RemovalNotification.RemovalReason.INVALIDATED, removalNotifications.get(i).getRemovalReason());
}
}
}