From 269cb0bc2638f5fa9138426b88c8b50628b611d4 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 and #36467 --- .../java/org/elasticsearch/index/engine/NoOpEngine.java | 3 ++- .../org/elasticsearch/index/engine/NoOpEngineTests.java | 8 ++++---- .../java/org/elasticsearch/index/shard/IndexShardIT.java | 1 - 3 files changed, 6 insertions(+), 6 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..bac67b10dfb36 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java @@ -116,7 +116,7 @@ public void testNoopEngineWithInvalidTranslogUUID() throws IOException { for (int i = 0; i < numDocs; i++) { ParsedDocument doc = testParsedDocument(Integer.toString(i), null, testDocument(), new BytesArray("{}"), null); engine.index(new Engine.Index(newUid(doc), doc, i, primaryTerm.get(), 1, null, Engine.Operation.Origin.REPLICA, - System.nanoTime(), -1, false)); + System.nanoTime(), -1, false, SequenceNumbers.UNASSIGNED_SEQ_NO, 0)); if (rarely()) { engine.flush(); } @@ -147,7 +147,7 @@ public void testNoopEngineWithNonZeroTranslogOperations() throws IOException { for (int i = 0; i < numDocs; i++) { ParsedDocument doc = testParsedDocument(Integer.toString(i), null, testDocument(), new BytesArray("{}"), null); engine.index(new Engine.Index(newUid(doc), doc, i, primaryTerm.get(), 1, null, Engine.Operation.Origin.REPLICA, - System.nanoTime(), -1, false)); + System.nanoTime(), -1, false, SequenceNumbers.UNASSIGNED_SEQ_NO, 0)); if (rarely()) { engine.flush(); } @@ -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)) { @@ -190,7 +191,6 @@ public void testNoOpEngineDocStats() throws Exception { } engine.waitForOpsToComplete(numDocs + deletions - 1); flushAndTrimTranslog(engine); - engine.close(); } final DocsStats expectedDocStats; diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java index bc914da5e9131..11b6673c4dd09 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java @@ -38,7 +38,6 @@ import org.elasticsearch.cluster.routing.RecoverySource; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.ShardRoutingState; -import org.elasticsearch.cluster.routing.TestShardRouting; import org.elasticsearch.cluster.routing.UnassignedInfo; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.CheckedRunnable;