From a9ff805d05879b629cb466a7af78e7410ea11b8f Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 23:29:55 -0700
Subject: [PATCH] [Tiered Caching] Fix test
 testComputeIfAbsentWithFactoryBasedCacheCreation (#12700) (#12749)

---------


(cherry picked from commit 902a10bdf278bb2160858c594432dcd6ab820559)

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../common/tier/TieredSpilloverCache.java     |  4 +--
 .../tier/TieredSpilloverCacheTests.java       | 30 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/modules/cache-common/src/main/java/org/opensearch/cache/common/tier/TieredSpilloverCache.java b/modules/cache-common/src/main/java/org/opensearch/cache/common/tier/TieredSpilloverCache.java
index 99c9c77ff3872..00a8eec93acc9 100644
--- a/modules/cache-common/src/main/java/org/opensearch/cache/common/tier/TieredSpilloverCache.java
+++ b/modules/cache-common/src/main/java/org/opensearch/cache/common/tier/TieredSpilloverCache.java
@@ -79,8 +79,8 @@ public void onRemoval(RemovalNotification<K, V> notification) {
                 .setValueType(builder.cacheConfig.getValueType())
                 .setSettings(builder.cacheConfig.getSettings())
                 .setWeigher(builder.cacheConfig.getWeigher())
-                .setMaxSizeInBytes(builder.cacheConfig.getMaxSizeInBytes()) // TODO: Part of a workaround for an issue in TSC. Overall fix
-                                                                            // coming soon
+                .setMaxSizeInBytes(builder.cacheConfig.getMaxSizeInBytes())
+                .setExpireAfterAccess(builder.cacheConfig.getExpireAfterAccess())
                 .build(),
             builder.cacheType,
             builder.cacheFactories
diff --git a/modules/cache-common/src/test/java/org/opensearch/cache/common/tier/TieredSpilloverCacheTests.java b/modules/cache-common/src/test/java/org/opensearch/cache/common/tier/TieredSpilloverCacheTests.java
index 3e4fb0efd092e..b132952834f06 100644
--- a/modules/cache-common/src/test/java/org/opensearch/cache/common/tier/TieredSpilloverCacheTests.java
+++ b/modules/cache-common/src/test/java/org/opensearch/cache/common/tier/TieredSpilloverCacheTests.java
@@ -119,6 +119,11 @@ public void testComputeIfAbsentWithFactoryBasedCacheCreation() throws Exception
                     .getKey(),
                 onHeapCacheSize * keyValueSize + "b"
             )
+            .put(
+                CacheSettings.getConcreteStoreNameSettingForCacheType(CacheType.INDICES_REQUEST_CACHE).getKey(),
+                TieredSpilloverCache.TieredSpilloverCacheFactory.TIERED_SPILLOVER_CACHE_NAME
+            )
+            .put(FeatureFlags.PLUGGABLE_CACHE, "true")
             .build();
 
         ICache<String, String> tieredSpilloverICache = new TieredSpilloverCache.TieredSpilloverCacheFactory().create(
@@ -127,12 +132,8 @@ public void testComputeIfAbsentWithFactoryBasedCacheCreation() throws Exception
                 .setWeigher((k, v) -> keyValueSize)
                 .setRemovalListener(removalListener)
                 .setSettings(settings)
-                .setCachedResultParser(new Function<String, CachedQueryResult.PolicyValues>() {
-                    @Override
-                    public CachedQueryResult.PolicyValues apply(String s) {
-                        return new CachedQueryResult.PolicyValues(20_000_000L);
-                    }
-                }) // Values will always appear to have taken 20_000_000 ns = 20 ms to compute
+                .setCachedResultParser(s -> new CachedQueryResult.PolicyValues(20_000_000L)) // Values will always appear to have taken
+                                                                                             // 20_000_000 ns = 20 ms to compute
                 .build(),
             CacheType.INDICES_REQUEST_CACHE,
             Map.of(
@@ -145,20 +146,16 @@ public CachedQueryResult.PolicyValues apply(String s) {
 
         TieredSpilloverCache<String, String> tieredSpilloverCache = (TieredSpilloverCache<String, String>) tieredSpilloverICache;
 
-        // Put values in cache more than it's size and cause evictions from onHeap.
         int numOfItems1 = randomIntBetween(onHeapCacheSize + 1, totalSize);
-        List<String> onHeapKeys = new ArrayList<>();
-        List<String> diskTierKeys = new ArrayList<>();
         for (int iter = 0; iter < numOfItems1; iter++) {
             String key = UUID.randomUUID().toString();
             LoadAwareCacheLoader<String, String> tieredCacheLoader = getLoadAwareCacheLoader();
             tieredSpilloverCache.computeIfAbsent(key, tieredCacheLoader);
         }
-        tieredSpilloverCache.getOnHeapCache().keys().forEach(onHeapKeys::add);
-        tieredSpilloverCache.getDiskCache().keys().forEach(diskTierKeys::add);
-
-        assertEquals(tieredSpilloverCache.getOnHeapCache().count(), onHeapKeys.size());
-        assertEquals(tieredSpilloverCache.getDiskCache().count(), diskTierKeys.size());
+        // Verify on heap cache size.
+        assertEquals(onHeapCacheSize, tieredSpilloverCache.getOnHeapCache().count());
+        // Verify disk cache size.
+        assertEquals(numOfItems1 - onHeapCacheSize, tieredSpilloverCache.getDiskCache().count());
     }
 
     public void testWithFactoryCreationWithOnHeapCacheNotPresent() {
@@ -180,6 +177,11 @@ public void testWithFactoryCreationWithOnHeapCacheNotPresent() {
                     .getKey(),
                 onHeapCacheSize * keyValueSize + "b"
             )
+            .put(
+                CacheSettings.getConcreteStoreNameSettingForCacheType(CacheType.INDICES_REQUEST_CACHE).getKey(),
+                TieredSpilloverCache.TieredSpilloverCacheFactory.TIERED_SPILLOVER_CACHE_NAME
+            )
+            .put(FeatureFlags.PLUGGABLE_CACHE, "true")
             .build();
 
         IllegalArgumentException ex = assertThrows(