[RCI] Adapt NoOpEngine to latest FrozenEngine changes

Changes were made in #34357
elastic · Dec 4, 2018 · 71fe1ac · 71fe1ac
1 parent d595ee6
commit 71fe1ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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<IndexCommit> 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
@@ -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)) {