Removing TieredCache interface

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
opensearch-project · Jan 8, 2024 · 9956abc · 9956abc
1 parent fdda280
commit 9956abc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 73 deletions.
diff --git a/server/src/main/java/org/opensearch/common/cache/tier/TieredCache.java b/server/src/main/java/org/opensearch/common/cache/tier/TieredCache.java
diff --git a/server/src/main/java/org/opensearch/common/cache/tier/TieredSpilloverCache.java b/server/src/main/java/org/opensearch/common/cache/tier/TieredSpilloverCache.java
@@ -39,7 +39,7 @@
  *
  * @opensearch.experimental
  */
-public class TieredSpilloverCache<K, V> implements TieredCache<K, V>, StoreAwareCacheEventListener<K, V> {
+public class TieredSpilloverCache<K, V> implements ICache<K, V>, StoreAwareCacheEventListener<K, V> {
 
     // TODO: Remove optional when diskCache implementation is integrated.
     private final Optional<StoreAwareCache<K, V>> onDiskCache;
@@ -178,46 +178,6 @@ public void refresh() {
         }
     }
 
-    /**
-     * Provides an iteration over keys based on desired on cacheStoreType. This is not protected from any mutations
-     * to the cache.
-     * @param type Type of cacheStoreType
-     * @return An iterable over desired CacheStoreType keys
-     */
-    @Override
-    public Iterable<K> cacheKeys(CacheStoreType type) {
-        switch (type) {
-            case ON_HEAP:
-                return onHeapCache.keys();
-            case DISK:
-                if (onDiskCache.isPresent()) {
-                    return onDiskCache.get().keys();
-                } else {
-                    return Collections::emptyIterator;
-                }
-            default:
-                throw new IllegalArgumentException("Unsupported Cache store type: " + type);
-        }
-    }
-
-    @Override
-    public void refresh(CacheStoreType type) {
-        switch (type) {
-            case ON_HEAP:
-                try (ReleasableLock ignore = writeLock.acquire()) {
-                    onHeapCache.refresh();
-                }
-                break;
-            case DISK:
-                try (ReleasableLock ignore = writeLock.acquire()) {
-                    onDiskCache.ifPresent(ICache::refresh);
-                }
-                break;
-            default:
-                throw new IllegalArgumentException("Unsupported Cache store type: " + type);
-        }
-    }
-
     @Override
     public void onMiss(K key, CacheStoreType cacheStoreType) {
         // Misses for tiered cache are tracked here itself.

diff --git a/server/src/test/java/org/opensearch/common/cache/tier/TieredSpilloverCacheTests.java b/server/src/test/java/org/opensearch/common/cache/tier/TieredSpilloverCacheTests.java
@@ -114,8 +114,8 @@ public void testComputeIfAbsentWithEvictionsFromOnHeapCache() throws Exception {
         );
         assertEquals(actualDiskCacheSize, eventListener.enumMap.get(CacheStoreType.DISK).cachedCount.count());
 
-        tieredSpilloverCache.cacheKeys(CacheStoreType.ON_HEAP).forEach(onHeapKeys::add);
-        tieredSpilloverCache.cacheKeys(CacheStoreType.DISK).forEach(diskTierKeys::add);
+        tieredSpilloverCache.getOnHeapCache().keys().forEach(onHeapKeys::add);
+        tieredSpilloverCache.getOnDiskCache().get().keys().forEach(diskTierKeys::add);
 
         assertEquals(tieredSpilloverCache.getOnHeapCache().count(), onHeapKeys.size());
         assertEquals(tieredSpilloverCache.getOnDiskCache().get().count(), diskTierKeys.size());
@@ -312,7 +312,7 @@ public String load(String key) {
 
         // Verify that new items are part of onHeap cache.
         List<String> actualOnHeapCacheKeys = new ArrayList<>();
-        tieredSpilloverCache.cacheKeys(CacheStoreType.ON_HEAP).forEach(actualOnHeapCacheKeys::add);
+        tieredSpilloverCache.getOnHeapCache().keys().forEach(actualOnHeapCacheKeys::add);
 
         assertEquals(newKeyList.size(), actualOnHeapCacheKeys.size());
         for (int i = 0; i < actualOnHeapCacheKeys.size(); i++) {
@@ -387,8 +387,8 @@ public void testCacheKeys() throws Exception {
 
         List<String> actualOnHeapKeys = new ArrayList<>();
         List<String> actualOnDiskKeys = new ArrayList<>();
-        Iterable<String> onHeapiterable = tieredSpilloverCache.cacheKeys(CacheStoreType.ON_HEAP);
-        Iterable<String> onDiskiterable = tieredSpilloverCache.cacheKeys(CacheStoreType.DISK);
+        Iterable<String> onHeapiterable = tieredSpilloverCache.getOnHeapCache().keys();
+        Iterable<String> onDiskiterable = tieredSpilloverCache.getOnDiskCache().get().keys();
         onHeapiterable.iterator().forEachRemaining(actualOnHeapKeys::add);
         onDiskiterable.iterator().forEachRemaining(actualOnDiskKeys::add);
         for (String onHeapKey : onHeapKeys) {
@@ -424,8 +424,6 @@ public void testRefresh() {
             eventListener,
             0
         );
-        tieredSpilloverCache.refresh(CacheStoreType.ON_HEAP);
-        tieredSpilloverCache.refresh(CacheStoreType.DISK);
         tieredSpilloverCache.refresh();
     }