Skip to content

Commit b10f30f

Browse files
committed
Update CacheMaintainer to be a generic ScheduledExecutor class that can accept a Runnable and an interval
Signed-off-by: owenhalpert <ohalpert@gmail.com>
1 parent 601a24a commit b10f30f

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

src/main/java/org/opensearch/knn/index/memory/NativeMemoryCacheManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.opensearch.knn.common.exception.OutOfNativeMemoryException;
2424
import org.opensearch.knn.common.featureflags.KNNFeatureFlags;
2525
import org.opensearch.knn.index.KNNSettings;
26-
import org.opensearch.knn.index.ScheduledExecutor;
26+
import org.opensearch.knn.index.util.ScheduledExecutor;
2727
import org.opensearch.knn.plugin.stats.StatNames;
2828

2929
import java.io.Closeable;

src/main/java/org/opensearch/knn/index/ScheduledExecutor.java src/main/java/org/opensearch/knn/index/util/ScheduledExecutor.java

+4-10
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package org.opensearch.knn.index;
6+
package org.opensearch.knn.index.util;
77

88
import java.io.Closeable;
99
import java.util.concurrent.Executors;
@@ -12,11 +12,10 @@
1212

1313
/**
1414
* Executes a task periodically
15-
1615
*/
1716
public class ScheduledExecutor implements Closeable {
18-
private final ScheduledExecutorService executor;
19-
final Runnable task;
17+
final ScheduledExecutorService executor;
18+
public final Runnable task;
2019

2120
/**
2221
* @param task task to be completed
@@ -25,12 +24,7 @@ public class ScheduledExecutor implements Closeable {
2524
public ScheduledExecutor(Runnable task, long scheduleMillis) {
2625
this.task = task;
2726
this.executor = Executors.newSingleThreadScheduledExecutor();
28-
executor.scheduleAtFixedRate(
29-
task,
30-
0,
31-
scheduleMillis,
32-
TimeUnit.MILLISECONDS
33-
);
27+
executor.scheduleAtFixedRate(task, 0, scheduleMillis, TimeUnit.MILLISECONDS);
3428
}
3529

3630
@Override

src/main/java/org/opensearch/knn/quantization/models/quantizationState/QuantizationStateCache.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.opensearch.common.unit.TimeValue;
1616
import org.opensearch.core.common.unit.ByteSizeValue;
1717
import org.opensearch.knn.index.KNNSettings;
18-
import org.opensearch.knn.index.ScheduledExecutor;
18+
import org.opensearch.knn.index.util.ScheduledExecutor;
1919

2020
import java.io.Closeable;
2121
import java.io.IOException;

src/test/java/org/opensearch/knn/index/CacheMaintainerTests.java

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.google.common.cache.Cache;
99
import com.google.common.cache.CacheBuilder;
1010
import org.junit.Test;
11+
import org.opensearch.knn.index.util.ScheduledExecutor;
1112

1213
import java.util.concurrent.TimeUnit;
1314

0 commit comments

Comments
 (0)