Skip to content

Commit 17b682f

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 5554bc2 commit 17b682f

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

server/src/main/java/org/elasticsearch/index/IndexService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import org.elasticsearch.index.engine.Engine;
5151
import org.elasticsearch.index.engine.EngineFactory;
5252
import org.elasticsearch.index.engine.ThreadPoolMergeExecutor;
53-
import org.elasticsearch.index.engine.ThreadPoolMergeScheduler;
5453
import org.elasticsearch.index.fielddata.FieldDataContext;
5554
import org.elasticsearch.index.fielddata.IndexFieldData;
5655
import org.elasticsearch.index.fielddata.IndexFieldDataCache;

server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,11 @@ public InternalEngine(EngineConfig engineConfig) {
253253
boolean success = false;
254254
try {
255255
this.lastDeleteVersionPruneTimeMSec = engineConfig.getThreadPool().relativeTimeInMillis();
256-
mergeScheduler = createMergeScheduler(engineConfig.getShardId(), engineConfig.getIndexSettings(), engineConfig.getThreadPoolMergeExecutor());
256+
mergeScheduler = createMergeScheduler(
257+
engineConfig.getShardId(),
258+
engineConfig.getIndexSettings(),
259+
engineConfig.getThreadPoolMergeExecutor()
260+
);
257261
scheduler = mergeScheduler.getMergeScheduler();
258262
throttle = new IndexThrottle();
259263
try {

server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,10 @@ public synchronized void registerMergeScheduler(ThreadPoolMergeScheduler threadP
7575
}
7676
}
7777

78-
public synchronized void updateMergeScheduler(ThreadPoolMergeScheduler threadPoolMergeScheduler,
79-
Consumer<ThreadPoolMergeScheduler> updater) {
78+
public synchronized void updateMergeScheduler(
79+
ThreadPoolMergeScheduler threadPoolMergeScheduler,
80+
Consumer<ThreadPoolMergeScheduler> updater
81+
) {
8082
boolean removed = registeredMergeSchedulers.remove(threadPoolMergeScheduler);
8183
if (false == removed) {
8284
throw new IllegalStateException("Cannot update a merge scheduler that is not registered");

0 commit comments

Comments
 (0)