From c34c218902c7aa819b5cf0d53395a4338f16d93c Mon Sep 17 00:00:00 2001 From: Peter Alfonsi Date: Tue, 27 Feb 2024 13:54:09 -0800 Subject: [PATCH] Addressed Sagar's other comment Signed-off-by: Peter Alfonsi --- .../org/opensearch/cache/store/disk/EhcacheDiskCache.java | 4 +++- .../opensearch/cache/store/disk/EhCacheDiskCacheTests.java | 4 ++-- .../opensearch/common/cache/stats/CacheStatsDimension.java | 2 -- .../opensearch/common/cache/store/OpenSearchOnHeapCache.java | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/cache-ehcache/src/main/java/org/opensearch/cache/store/disk/EhcacheDiskCache.java b/plugins/cache-ehcache/src/main/java/org/opensearch/cache/store/disk/EhcacheDiskCache.java index 4a610aae324e8..e769f0e0d7ca1 100644 --- a/plugins/cache-ehcache/src/main/java/org/opensearch/cache/store/disk/EhcacheDiskCache.java +++ b/plugins/cache-ehcache/src/main/java/org/opensearch/cache/store/disk/EhcacheDiskCache.java @@ -115,6 +115,8 @@ public class EhcacheDiskCache implements ICache { private final Serializer keySerializer; private final Serializer valueSerializer; + public final static String TIER_DIMENSION_VALUE = "disk"; + /** * Used in computeIfAbsent to synchronize loading of a given key. This is needed as ehcache doesn't provide a * computeIfAbsent method. @@ -154,7 +156,7 @@ private EhcacheDiskCache(Builder builder) { this.valueSerializer); this.cache = buildCache(Duration.ofMillis(expireAfterAccess.getMillis()), builder); List dimensionNames = Objects.requireNonNull(builder.dimensionNames, "Dimension names can't be null"); - this.stats = new MultiDimensionCacheStats(dimensionNames, CacheStatsDimension.TIER_DIMENSION_VALUE_DISK); + this.stats = new MultiDimensionCacheStats(dimensionNames, TIER_DIMENSION_VALUE); } private Cache buildCache(Duration expireAfterAccess, Builder builder) { diff --git a/plugins/cache-ehcache/src/test/java/org/opensearch/cache/store/disk/EhCacheDiskCacheTests.java b/plugins/cache-ehcache/src/test/java/org/opensearch/cache/store/disk/EhCacheDiskCacheTests.java index 337fe75c67131..a25cde40396a6 100644 --- a/plugins/cache-ehcache/src/test/java/org/opensearch/cache/store/disk/EhCacheDiskCacheTests.java +++ b/plugins/cache-ehcache/src/test/java/org/opensearch/cache/store/disk/EhCacheDiskCacheTests.java @@ -632,8 +632,8 @@ public void testGetStatsByTierName() throws Exception { for (int i = 0; i < randomKeys; i++) { ehcacheTest.put(getICacheKey(UUID.randomUUID().toString()), UUID.randomUUID().toString()); } - assertEquals(randomKeys, ehcacheTest.stats().getEntriesByDimensions(List.of(new CacheStatsDimension(CacheStatsDimension.TIER_DIMENSION_NAME, CacheStatsDimension.TIER_DIMENSION_VALUE_DISK)))); - assertEquals(0, ehcacheTest.stats().getEntriesByDimensions(List.of(new CacheStatsDimension(CacheStatsDimension.TIER_DIMENSION_NAME, CacheStatsDimension.TIER_DIMENSION_VALUE_ON_HEAP)))); + assertEquals(randomKeys, ehcacheTest.stats().getEntriesByDimensions(List.of(new CacheStatsDimension(CacheStatsDimension.TIER_DIMENSION_NAME, EhcacheDiskCache.TIER_DIMENSION_VALUE)))); + assertEquals(0, ehcacheTest.stats().getEntriesByDimensions(List.of(new CacheStatsDimension(CacheStatsDimension.TIER_DIMENSION_NAME, "other_tier_value")))); ehcacheTest.close(); } diff --git a/server/src/main/java/org/opensearch/common/cache/stats/CacheStatsDimension.java b/server/src/main/java/org/opensearch/common/cache/stats/CacheStatsDimension.java index 4abdbff5d5a4a..5ba83122f7fd2 100644 --- a/server/src/main/java/org/opensearch/common/cache/stats/CacheStatsDimension.java +++ b/server/src/main/java/org/opensearch/common/cache/stats/CacheStatsDimension.java @@ -18,8 +18,6 @@ public class CacheStatsDimension implements Writeable { // Values for tier dimensions, that are reused across CacheStats implementations public static final String TIER_DIMENSION_NAME = "tier"; - public static final String TIER_DIMENSION_VALUE_ON_HEAP = "on_heap"; - public static final String TIER_DIMENSION_VALUE_DISK = "disk"; public final String dimensionName; public final String dimensionValue; public CacheStatsDimension(String dimensionName, String dimensionValue) { diff --git a/server/src/main/java/org/opensearch/common/cache/store/OpenSearchOnHeapCache.java b/server/src/main/java/org/opensearch/common/cache/store/OpenSearchOnHeapCache.java index 172c3f2110b67..fe003be3de5d4 100644 --- a/server/src/main/java/org/opensearch/common/cache/store/OpenSearchOnHeapCache.java +++ b/server/src/main/java/org/opensearch/common/cache/store/OpenSearchOnHeapCache.java @@ -45,6 +45,7 @@ public class OpenSearchOnHeapCache implements ICache, RemovalListene private final Cache, V> cache; private final CacheStats stats; private final RemovalListener, V> removalListener; + public static final String TIER_DIMENSION_VALUE = "on_heap"; public OpenSearchOnHeapCache(Builder builder) { CacheBuilder, V> cacheBuilder = CacheBuilder., V>builder() @@ -56,7 +57,7 @@ public OpenSearchOnHeapCache(Builder builder) { } cache = cacheBuilder.build(); List dimensionNames = Objects.requireNonNull(builder.dimensionNames, "Dimension names can't be null"); - this.stats = new MultiDimensionCacheStats(dimensionNames, CacheStatsDimension.TIER_DIMENSION_VALUE_ON_HEAP); + this.stats = new MultiDimensionCacheStats(dimensionNames, TIER_DIMENSION_VALUE); this.removalListener = builder.getRemovalListener(); }