Fixing invalid segment count variable name

Signed-off-by: Sagar Upadhyaya <[email protected]>
opensearch-project · Oct 3, 2024 · 016c049 · 016c049
1 parent bd1fce1
commit 016c049
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/...src/internalClusterTest/java/org/opensearch/cache/common/tier/TieredSpilloverCacheIT.java b/...src/internalClusterTest/java/org/opensearch/cache/common/tier/TieredSpilloverCacheIT.java
@@ -47,7 +47,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.opensearch.common.cache.settings.CacheSettings.INVALID_SEGMENT_NUMBER_EXCEPTION_MESSAGE;
+import static org.opensearch.common.cache.settings.CacheSettings.INVALID_SEGMENT_COUNT_EXCEPTION_MESSAGE;
 import static org.opensearch.indices.IndicesService.INDICES_CACHE_CLEAN_INTERVAL_SETTING;
 import static org.opensearch.search.aggregations.AggregationBuilders.dateHistogram;
 import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
@@ -612,7 +612,7 @@ public void testWithInvalidSegmentNumberSetting() throws Exception {
         assertThrows(
             String.format(
                 Locale.ROOT,
-                INVALID_SEGMENT_NUMBER_EXCEPTION_MESSAGE,
+                INVALID_SEGMENT_COUNT_EXCEPTION_MESSAGE,
                 TieredSpilloverCache.TieredSpilloverCacheFactory.TIERED_SPILLOVER_CACHE_NAME
             ),
             IllegalArgumentException.class,

diff --git a/...les/cache-common/src/main/java/org/opensearch/cache/common/tier/TieredSpilloverCache.java b/...les/cache-common/src/main/java/org/opensearch/cache/common/tier/TieredSpilloverCache.java
@@ -53,7 +53,7 @@
 import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_SEGMENTS;
 import static org.opensearch.cache.common.tier.TieredSpilloverCacheStatsHolder.TIER_DIMENSION_VALUE_DISK;
 import static org.opensearch.cache.common.tier.TieredSpilloverCacheStatsHolder.TIER_DIMENSION_VALUE_ON_HEAP;
-import static org.opensearch.common.cache.settings.CacheSettings.INVALID_SEGMENT_NUMBER_EXCEPTION_MESSAGE;
+import static org.opensearch.common.cache.settings.CacheSettings.INVALID_SEGMENT_COUNT_EXCEPTION_MESSAGE;
 import static org.opensearch.common.cache.settings.CacheSettings.VALID_SEGMENT_COUNT_VALUES;
 
 /**
@@ -801,7 +801,7 @@ public <K, V> ICache<K, V> create(CacheConfig<K, V> config, CacheType cacheType,
 
             if (!VALID_SEGMENT_COUNT_VALUES.contains(numberOfSegments)) {
                 throw new IllegalArgumentException(
-                    String.format(Locale.ROOT, INVALID_SEGMENT_NUMBER_EXCEPTION_MESSAGE, TIERED_SPILLOVER_CACHE_NAME)
+                    String.format(Locale.ROOT, INVALID_SEGMENT_COUNT_EXCEPTION_MESSAGE, TIERED_SPILLOVER_CACHE_NAME)
                 );
             }
 

diff --git a/...e-common/src/main/java/org/opensearch/cache/common/tier/TieredSpilloverCacheSettings.java b/...e-common/src/main/java/org/opensearch/cache/common/tier/TieredSpilloverCacheSettings.java
@@ -17,7 +17,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import static org.opensearch.common.cache.settings.CacheSettings.INVALID_SEGMENT_NUMBER_EXCEPTION_MESSAGE;
+import static org.opensearch.common.cache.settings.CacheSettings.INVALID_SEGMENT_COUNT_EXCEPTION_MESSAGE;
 import static org.opensearch.common.cache.settings.CacheSettings.VALID_SEGMENT_COUNT_VALUES;
 import static org.opensearch.common.settings.Setting.Property.NodeScope;
 
@@ -63,7 +63,7 @@ public class TieredSpilloverCacheSettings {
                 throw new IllegalArgumentException(
                     String.format(
                         Locale.ROOT,
-                        INVALID_SEGMENT_NUMBER_EXCEPTION_MESSAGE,
+                        INVALID_SEGMENT_COUNT_EXCEPTION_MESSAGE,
                         TieredSpilloverCache.TieredSpilloverCacheFactory.TIERED_SPILLOVER_CACHE_NAME
                     )
                 );

diff --git a/...ache-common/src/test/java/org/opensearch/cache/common/tier/TieredSpilloverCacheTests.java b/...ache-common/src/test/java/org/opensearch/cache/common/tier/TieredSpilloverCacheTests.java
@@ -63,7 +63,7 @@
 import static org.opensearch.cache.common.tier.TieredSpilloverCacheStatsHolder.TIER_DIMENSION_NAME;
 import static org.opensearch.cache.common.tier.TieredSpilloverCacheStatsHolder.TIER_DIMENSION_VALUE_DISK;
 import static org.opensearch.cache.common.tier.TieredSpilloverCacheStatsHolder.TIER_DIMENSION_VALUE_ON_HEAP;
-import static org.opensearch.common.cache.settings.CacheSettings.INVALID_SEGMENT_NUMBER_EXCEPTION_MESSAGE;
+import static org.opensearch.common.cache.settings.CacheSettings.INVALID_SEGMENT_COUNT_EXCEPTION_MESSAGE;
 import static org.opensearch.common.cache.store.settings.OpenSearchOnHeapCacheSettings.MAXIMUM_SIZE_IN_BYTES_KEY;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doThrow;
@@ -1952,7 +1952,7 @@ public void testWithInvalidSegmentNumber() throws Exception {
             .build();
         String storagePath = getStoragePath(settings);
         assertThrows(
-            INVALID_SEGMENT_NUMBER_EXCEPTION_MESSAGE,
+            INVALID_SEGMENT_COUNT_EXCEPTION_MESSAGE,
             IllegalArgumentException.class,
             () -> new TieredSpilloverCache.TieredSpilloverCacheFactory().create(
                 new CacheConfig.Builder<String, String>().setKeyType(String.class)

diff --git a/server/src/main/java/org/opensearch/common/cache/CacheBuilder.java b/server/src/main/java/org/opensearch/common/cache/CacheBuilder.java
@@ -38,7 +38,7 @@
 import java.util.Objects;
 import java.util.function.ToLongBiFunction;
 
-import static org.opensearch.common.cache.settings.CacheSettings.INVALID_SEGMENT_NUMBER_EXCEPTION_MESSAGE;
+import static org.opensearch.common.cache.settings.CacheSettings.INVALID_SEGMENT_COUNT_EXCEPTION_MESSAGE;
 import static org.opensearch.common.cache.settings.CacheSettings.VALID_SEGMENT_COUNT_VALUES;
 
 /**
@@ -62,7 +62,7 @@ private CacheBuilder() {}
 
     public CacheBuilder<K, V> setNumberOfSegments(int numberOfSegments) {
         if (!VALID_SEGMENT_COUNT_VALUES.contains(numberOfSegments)) {
-            throw new IllegalArgumentException(String.format(Locale.ROOT, INVALID_SEGMENT_NUMBER_EXCEPTION_MESSAGE, "Cache"));
+            throw new IllegalArgumentException(String.format(Locale.ROOT, INVALID_SEGMENT_COUNT_EXCEPTION_MESSAGE, "Cache"));
         }
         this.numberOfSegments = numberOfSegments;
         return this;

diff --git a/server/src/main/java/org/opensearch/common/cache/settings/CacheSettings.java b/server/src/main/java/org/opensearch/common/cache/settings/CacheSettings.java
@@ -29,7 +29,7 @@ public class CacheSettings {
     /**
      * Exception message for invalid segment number.
      */
-    public static final String INVALID_SEGMENT_NUMBER_EXCEPTION_MESSAGE = "Cache: %s segment count should be " + "power of two up-to 256";
+    public static final String INVALID_SEGMENT_COUNT_EXCEPTION_MESSAGE = "Cache: %s segment count should be power of two up-to 256";
 
     /**
      * Used to store cache store name for desired cache types within OpenSearch.