Revert "Refactor cache package names in TSC module to match with server"

This reverts commit 3b15a7a. Signed-off-by: Peter Alfonsi <[email protected]>
opensearch-project · Nov 5, 2024 · dc515d9 · dc515d9
1 parent c2a05d4
commit dc515d9
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 29 deletions.
diff --git a/...ache/tier/TieredSpilloverCacheBaseIT.java → ...mmon/tier/TieredSpilloverCacheBaseIT.java b/...ache/tier/TieredSpilloverCacheBaseIT.java → ...mmon/tier/TieredSpilloverCacheBaseIT.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.common.cache.tier;
+package org.opensearch.cache.common.tier;
 
 import org.opensearch.common.cache.CacheType;
 import org.opensearch.common.cache.settings.CacheSettings;

diff --git a/...on/cache/tier/TieredSpilloverCacheIT.java → ...e/common/tier/TieredSpilloverCacheIT.java b/...on/cache/tier/TieredSpilloverCacheIT.java → ...e/common/tier/TieredSpilloverCacheIT.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.common.cache.tier;
+package org.opensearch.cache.common.tier;
 
 import org.opensearch.action.admin.cluster.node.info.NodeInfo;
 import org.opensearch.action.admin.cluster.node.info.NodesInfoRequest;
@@ -76,7 +76,7 @@ public void testPluginsAreInstalled() {
             .collect(Collectors.toList());
         Assert.assertTrue(
             pluginInfos.stream()
-                .anyMatch(pluginInfo -> pluginInfo.getName().equals("org.opensearch.common.cache.tier.TieredSpilloverCachePlugin"))
+                .anyMatch(pluginInfo -> pluginInfo.getName().equals("org.opensearch.cache.common.tier.TieredSpilloverCachePlugin"))
         );
     }
 

diff --git a/...che/tier/TieredSpilloverCacheStatsIT.java → ...mon/tier/TieredSpilloverCacheStatsIT.java b/...che/tier/TieredSpilloverCacheStatsIT.java → ...mon/tier/TieredSpilloverCacheStatsIT.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.common.cache.tier;
+package org.opensearch.cache.common.tier;
 
 import org.opensearch.action.admin.cluster.node.stats.NodesStatsRequest;
 import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse;

diff --git a/...h/common/cache/policy/TookTimePolicy.java → ...h/cache/common/policy/TookTimePolicy.java b/...h/common/cache/policy/TookTimePolicy.java → ...h/cache/common/policy/TookTimePolicy.java
@@ -11,16 +11,17 @@
  * GitHub history for details.
  */
 
-package org.opensearch.common.cache.policy;
+package org.opensearch.cache.common.policy;
 
 import org.opensearch.common.cache.CacheType;
+import org.opensearch.common.cache.policy.CachedQueryResult;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.unit.TimeValue;
 
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP;
+import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP;
 
 /**
  * A cache tier policy which accepts queries whose took time is greater than some threshold.

diff --git a/...rch/common/cache/policy/package-info.java → ...rch/cache/common/policy/package-info.java b/...rch/common/cache/policy/package-info.java → ...rch/cache/common/policy/package-info.java
@@ -7,4 +7,4 @@
  */
 
 /** A package for policies controlling what can enter caches. */
-package org.opensearch.common.cache.policy;
+package org.opensearch.cache.common.policy;
diff --git a/...mmon/cache/tier/TieredSpilloverCache.java → ...che/common/tier/TieredSpilloverCache.java b/...mmon/cache/tier/TieredSpilloverCache.java → ...che/common/tier/TieredSpilloverCache.java
@@ -6,10 +6,11 @@
  * compatible open source license.
  */
 
-package org.opensearch.common.cache.tier;
+package org.opensearch.cache.common.tier;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.cache.common.policy.TookTimePolicy;
 import org.opensearch.common.annotation.ExperimentalApi;
 import org.opensearch.common.cache.CacheType;
 import org.opensearch.common.cache.ICache;
@@ -19,7 +20,6 @@
 import org.opensearch.common.cache.RemovalNotification;
 import org.opensearch.common.cache.RemovalReason;
 import org.opensearch.common.cache.policy.CachedQueryResult;
-import org.opensearch.common.cache.policy.TookTimePolicy;
 import org.opensearch.common.cache.stats.ImmutableCacheStatsHolder;
 import org.opensearch.common.cache.stats.TieredSpilloverCacheStatsHolder;
 import org.opensearch.common.cache.store.config.CacheConfig;
@@ -50,14 +50,14 @@
 import java.util.function.Predicate;
 import java.util.function.ToLongBiFunction;
 
+import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.DISK_CACHE_ENABLED_SETTING_MAP;
+import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_DISK_STORE_SIZE;
+import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_ONHEAP_STORE_SIZE;
+import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_SEGMENTS;
 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.cache.stats.TieredSpilloverCacheStatsHolder.TIER_DIMENSION_VALUE_DISK;
 import static org.opensearch.common.cache.stats.TieredSpilloverCacheStatsHolder.TIER_DIMENSION_VALUE_ON_HEAP;
-import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.DISK_CACHE_ENABLED_SETTING_MAP;
-import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_DISK_STORE_SIZE;
-import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_ONHEAP_STORE_SIZE;
-import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_SEGMENTS;
 
 /**
  * This cache spillover the evicted items from heap tier to disk tier. All the new items are first cached on heap

diff --git a/...ache/tier/TieredSpilloverCachePlugin.java → ...mmon/tier/TieredSpilloverCachePlugin.java b/...ache/tier/TieredSpilloverCachePlugin.java → ...mmon/tier/TieredSpilloverCachePlugin.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.common.cache.tier;
+package org.opensearch.cache.common.tier;
 
 import org.opensearch.common.cache.CacheType;
 import org.opensearch.common.cache.ICache;
@@ -20,8 +20,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.DISK_CACHE_ENABLED_SETTING_MAP;
-import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP;
+import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.DISK_CACHE_ENABLED_SETTING_MAP;
+import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP;
 
 /**
  * Plugin for TieredSpilloverCache.

diff --git a/...he/tier/TieredSpilloverCacheSettings.java → ...on/tier/TieredSpilloverCacheSettings.java b/...he/tier/TieredSpilloverCacheSettings.java → ...on/tier/TieredSpilloverCacheSettings.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.common.cache.tier;
+package org.opensearch.cache.common.tier;
 
 import org.opensearch.common.cache.CacheType;
 import org.opensearch.common.settings.Setting;

diff --git a/...earch/common/cache/tier/package-info.java → ...earch/cache/common/tier/package-info.java b/...earch/common/cache/tier/package-info.java → ...earch/cache/common/tier/package-info.java
@@ -7,4 +7,4 @@
  */
 
 /** Package related to cache tiers **/
-package org.opensearch.common.cache.tier;
+package org.opensearch.cache.common.tier;
diff --git a/...mmon/src/main/java/org/opensearch/common/cache/stats/TieredSpilloverCacheStatsHolder.java b/...mmon/src/main/java/org/opensearch/common/cache/stats/TieredSpilloverCacheStatsHolder.java
@@ -8,7 +8,7 @@
 
 package org.opensearch.common.cache.stats;
 
-import org.opensearch.common.cache.tier.TieredSpilloverCache;
+import org.opensearch.cache.common.tier.TieredSpilloverCache;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...mon/cache/policy/TookTimePolicyTests.java → ...he/common/policy/TookTimePolicyTests.java b/...mon/cache/policy/TookTimePolicyTests.java → ...he/common/policy/TookTimePolicyTests.java
@@ -6,13 +6,14 @@
  * compatible open source license.
  */
 
-package org.opensearch.common.cache.policy;
+package org.opensearch.cache.common.policy;
 
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.search.TotalHits;
 import org.opensearch.common.Randomness;
 import org.opensearch.common.cache.CacheType;
+import org.opensearch.common.cache.policy.CachedQueryResult;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.lucene.search.TopDocsAndMaxScore;
 import org.opensearch.common.settings.ClusterSettings;
@@ -30,7 +31,7 @@
 import java.util.Random;
 import java.util.function.Function;
 
-import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP;
+import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP;
 
 public class TookTimePolicyTests extends OpenSearchTestCase {
     private final Function<BytesReference, CachedQueryResult.PolicyValues> transformationFunction = (data) -> {

diff --git a/...arch/common/cache/tier/MockDiskCache.java → ...arch/cache/common/tier/MockDiskCache.java b/...arch/common/cache/tier/MockDiskCache.java → ...arch/cache/common/tier/MockDiskCache.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.common.cache.tier;
+package org.opensearch.cache.common.tier;
 
 import org.opensearch.common.cache.CacheType;
 import org.opensearch.common.cache.ICache;

diff --git a/...tier/TieredSpilloverCachePluginTests.java → ...tier/TieredSpilloverCachePluginTests.java b/...tier/TieredSpilloverCachePluginTests.java → ...tier/TieredSpilloverCachePluginTests.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.common.cache.tier;
+package org.opensearch.cache.common.tier;
 
 import org.opensearch.common.cache.ICache;
 import org.opensearch.common.settings.Settings;

diff --git a/...cache/tier/TieredSpilloverCacheTests.java → ...ommon/tier/TieredSpilloverCacheTests.java b/...cache/tier/TieredSpilloverCacheTests.java → ...ommon/tier/TieredSpilloverCacheTests.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.common.cache.tier;
+package org.opensearch.cache.common.tier;
 
 import org.opensearch.OpenSearchException;
 import org.opensearch.common.Randomness;
@@ -56,17 +56,17 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import static org.opensearch.cache.common.tier.TieredSpilloverCache.ZERO_SEGMENT_COUNT_EXCEPTION_MESSAGE;
+import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.DISK_CACHE_ENABLED_SETTING_MAP;
+import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_ONHEAP_STORE_SIZE;
+import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_SEGMENTS;
+import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP;
 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.cache.stats.TieredSpilloverCacheStatsHolder.TIER_DIMENSION_NAME;
 import static org.opensearch.common.cache.stats.TieredSpilloverCacheStatsHolder.TIER_DIMENSION_VALUE_DISK;
 import static org.opensearch.common.cache.stats.TieredSpilloverCacheStatsHolder.TIER_DIMENSION_VALUE_ON_HEAP;
 import static org.opensearch.common.cache.store.settings.OpenSearchOnHeapCacheSettings.MAXIMUM_SIZE_IN_BYTES_KEY;
-import static org.opensearch.common.cache.tier.TieredSpilloverCache.ZERO_SEGMENT_COUNT_EXCEPTION_MESSAGE;
-import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.DISK_CACHE_ENABLED_SETTING_MAP;
-import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_ONHEAP_STORE_SIZE;
-import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_SEGMENTS;
-import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;