From 71fe1acd327db1e5c7e989917623e9a3dc904538 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Thu, 8 Nov 2018 11:51:03 +0100 Subject: [PATCH] [RCI] Adapt NoOpEngine to latest FrozenEngine changes Changes were made in #34357 --- .../main/java/org/elasticsearch/index/engine/NoOpEngine.java | 3 ++- .../java/org/elasticsearch/index/engine/NoOpEngineTests.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/engine/NoOpEngine.java b/server/src/main/java/org/elasticsearch/index/engine/NoOpEngine.java index 8e857d2606d9b..265aac34ea079 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/NoOpEngine.java +++ b/server/src/main/java/org/elasticsearch/index/engine/NoOpEngine.java @@ -75,7 +75,8 @@ public NoOpEngine(EngineConfig engineConfig) { } @Override - protected DirectoryReader open(final Directory directory) throws IOException { + protected DirectoryReader open(final IndexCommit commit) throws IOException { + final Directory directory = commit.getDirectory(); final List indexCommits = DirectoryReader.listCommits(directory); assert indexCommits.size() == 1 : "expected only one commit point"; IndexCommit indexCommit = indexCommits.get(indexCommits.size() - 1); diff --git a/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java index ee76e44e97593..a401725f4c335 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java @@ -167,7 +167,8 @@ public void testNoOpEngineDocStats() throws Exception { IOUtils.close(engine, store); final AtomicLong globalCheckpoint = new AtomicLong(SequenceNumbers.NO_OPS_PERFORMED); try (Store store = createStore()) { - EngineConfig config = config(defaultSettings, store, createTempDir(), newMergePolicy(), null, null, globalCheckpoint::get); + Path translogPath = createTempDir(); + EngineConfig config = config(defaultSettings, store, translogPath, NoMergePolicy.INSTANCE, null, null, globalCheckpoint::get); final int numDocs = scaledRandomIntBetween(10, 3000); int deletions = 0; try (InternalEngine engine = createEngine(config)) {