Skip to content

Commit 3b15a7a

Browse files
author
Peter Alfonsi
committed
Refactor cache package names in TSC module to match with server
Signed-off-by: Peter Alfonsi <petealft@amazon.com>
1 parent 902041a commit 3b15a7a

File tree

14 files changed

+29
-31
lines changed

14 files changed

+29
-31
lines changed

‎modules/cache-common/src/internalClusterTest/java/org/opensearch/cache/common/tier/TieredSpilloverCacheBaseIT.java‎ renamed to ‎modules/cache-common/src/internalClusterTest/java/org/opensearch/common/cache/tier/TieredSpilloverCacheBaseIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.cache.common.tier;
9+
package org.opensearch.common.cache.tier;
1010

1111
import org.opensearch.common.cache.CacheType;
1212
import org.opensearch.common.cache.settings.CacheSettings;

‎modules/cache-common/src/internalClusterTest/java/org/opensearch/cache/common/tier/TieredSpilloverCacheIT.java‎ renamed to ‎modules/cache-common/src/internalClusterTest/java/org/opensearch/common/cache/tier/TieredSpilloverCacheIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.cache.common.tier;
9+
package org.opensearch.common.cache.tier;
1010

1111
import org.opensearch.action.admin.cluster.node.info.NodeInfo;
1212
import org.opensearch.action.admin.cluster.node.info.NodesInfoRequest;
@@ -76,7 +76,7 @@ public void testPluginsAreInstalled() {
7676
.collect(Collectors.toList());
7777
Assert.assertTrue(
7878
pluginInfos.stream()
79-
.anyMatch(pluginInfo -> pluginInfo.getName().equals("org.opensearch.cache.common.tier.TieredSpilloverCachePlugin"))
79+
.anyMatch(pluginInfo -> pluginInfo.getName().equals("org.opensearch.common.cache.tier.TieredSpilloverCachePlugin"))
8080
);
8181
}
8282

‎modules/cache-common/src/internalClusterTest/java/org/opensearch/cache/common/tier/TieredSpilloverCacheStatsIT.java‎ renamed to ‎modules/cache-common/src/internalClusterTest/java/org/opensearch/common/cache/tier/TieredSpilloverCacheStatsIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.cache.common.tier;
9+
package org.opensearch.common.cache.tier;
1010

1111
import org.opensearch.action.admin.cluster.node.stats.NodesStatsRequest;
1212
import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse;

‎modules/cache-common/src/main/java/org/opensearch/cache/common/policy/TookTimePolicy.java‎ renamed to ‎modules/cache-common/src/main/java/org/opensearch/common/cache/policy/TookTimePolicy.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@
1111
* GitHub history for details.
1212
*/
1313

14-
package org.opensearch.cache.common.policy;
14+
package org.opensearch.common.cache.policy;
1515

1616
import org.opensearch.common.cache.CacheType;
17-
import org.opensearch.common.cache.policy.CachedQueryResult;
1817
import org.opensearch.common.settings.ClusterSettings;
1918
import org.opensearch.common.unit.TimeValue;
2019

2120
import java.util.function.Function;
2221
import java.util.function.Predicate;
2322

24-
import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP;
23+
import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP;
2524

2625
/**
2726
* A cache tier policy which accepts queries whose took time is greater than some threshold.

‎modules/cache-common/src/main/java/org/opensearch/cache/common/policy/package-info.java‎ renamed to ‎modules/cache-common/src/main/java/org/opensearch/common/cache/policy/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
*/
88

99
/** A package for policies controlling what can enter caches. */
10-
package org.opensearch.cache.common.policy;
10+
package org.opensearch.common.cache.policy;

‎modules/cache-common/src/main/java/org/opensearch/common/cache/stats/TieredSpilloverCacheStatsHolder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
package org.opensearch.common.cache.stats;
1010

11-
import org.opensearch.cache.common.tier.TieredSpilloverCache;
11+
import org.opensearch.common.cache.tier.TieredSpilloverCache;
1212

1313
import java.util.ArrayList;
1414
import java.util.List;

‎modules/cache-common/src/main/java/org/opensearch/cache/common/tier/TieredSpilloverCache.java‎ renamed to ‎modules/cache-common/src/main/java/org/opensearch/common/cache/tier/TieredSpilloverCache.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.cache.common.tier;
9+
package org.opensearch.common.cache.tier;
1010

1111
import org.apache.logging.log4j.LogManager;
1212
import org.apache.logging.log4j.Logger;
13-
import org.opensearch.cache.common.policy.TookTimePolicy;
1413
import org.opensearch.common.annotation.ExperimentalApi;
1514
import org.opensearch.common.cache.CacheType;
1615
import org.opensearch.common.cache.ICache;
@@ -20,6 +19,7 @@
2019
import org.opensearch.common.cache.RemovalNotification;
2120
import org.opensearch.common.cache.RemovalReason;
2221
import org.opensearch.common.cache.policy.CachedQueryResult;
22+
import org.opensearch.common.cache.policy.TookTimePolicy;
2323
import org.opensearch.common.cache.stats.ImmutableCacheStatsHolder;
2424
import org.opensearch.common.cache.stats.TieredSpilloverCacheStatsHolder;
2525
import org.opensearch.common.cache.store.config.CacheConfig;
@@ -50,14 +50,14 @@
5050
import java.util.function.Predicate;
5151
import java.util.function.ToLongBiFunction;
5252

53-
import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.DISK_CACHE_ENABLED_SETTING_MAP;
54-
import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_DISK_STORE_SIZE;
55-
import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_ONHEAP_STORE_SIZE;
56-
import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_SEGMENTS;
5753
import static org.opensearch.common.cache.settings.CacheSettings.INVALID_SEGMENT_COUNT_EXCEPTION_MESSAGE;
5854
import static org.opensearch.common.cache.settings.CacheSettings.VALID_SEGMENT_COUNT_VALUES;
5955
import static org.opensearch.common.cache.stats.TieredSpilloverCacheStatsHolder.TIER_DIMENSION_VALUE_DISK;
6056
import static org.opensearch.common.cache.stats.TieredSpilloverCacheStatsHolder.TIER_DIMENSION_VALUE_ON_HEAP;
57+
import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.DISK_CACHE_ENABLED_SETTING_MAP;
58+
import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_DISK_STORE_SIZE;
59+
import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_ONHEAP_STORE_SIZE;
60+
import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TIERED_SPILLOVER_SEGMENTS;
6161

6262
/**
6363
* This cache spillover the evicted items from heap tier to disk tier. All the new items are first cached on heap

‎modules/cache-common/src/main/java/org/opensearch/cache/common/tier/TieredSpilloverCachePlugin.java‎ renamed to ‎modules/cache-common/src/main/java/org/opensearch/common/cache/tier/TieredSpilloverCachePlugin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.cache.common.tier;
9+
package org.opensearch.common.cache.tier;
1010

1111
import org.opensearch.common.cache.CacheType;
1212
import org.opensearch.common.cache.ICache;
@@ -20,8 +20,8 @@
2020
import java.util.List;
2121
import java.util.Map;
2222

23-
import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.DISK_CACHE_ENABLED_SETTING_MAP;
24-
import static org.opensearch.cache.common.tier.TieredSpilloverCacheSettings.TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP;
23+
import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.DISK_CACHE_ENABLED_SETTING_MAP;
24+
import static org.opensearch.common.cache.tier.TieredSpilloverCacheSettings.TOOK_TIME_POLICY_CONCRETE_SETTINGS_MAP;
2525

2626
/**
2727
* Plugin for TieredSpilloverCache.

‎modules/cache-common/src/main/java/org/opensearch/cache/common/tier/TieredSpilloverCacheSettings.java‎ renamed to ‎modules/cache-common/src/main/java/org/opensearch/common/cache/tier/TieredSpilloverCacheSettings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.cache.common.tier;
9+
package org.opensearch.common.cache.tier;
1010

1111
import org.opensearch.common.cache.CacheType;
1212
import org.opensearch.common.settings.Setting;

‎modules/cache-common/src/main/java/org/opensearch/cache/common/tier/package-info.java‎ renamed to ‎modules/cache-common/src/main/java/org/opensearch/common/cache/tier/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
*/
88

99
/** Package related to cache tiers **/
10-
package org.opensearch.cache.common.tier;
10+
package org.opensearch.common.cache.tier;

0 commit comments

Comments
 (0)