iter

Author: martijnvg

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

@@ -243,7 +243,7 @@ public void restoreLocalCheckpointFromTranslog() throws IOException {
         try (ReleasableLock ignored = writeLock.acquire()) {
             ensureOpen();
             final long localCheckpoint = seqNoService().getLocalCheckpoint();
-            try (Translog.Snapshot snapshot = getTranslog().newSnapshotFromMinSeqNo(localCheckpoint + 1)) {
+            try (Translog.Snapshot snapshot = getTranslog().newSnapshotFrom(localCheckpoint + 1)) {
                 Translog.Operation operation;
                 while ((operation = snapshot.next()) != null) {
                     if (operation.seqNo() > localCheckpoint) {

core/src/main/java/org/elasticsearch/index/shard/IndexShard.java

@@ -2424,14 +2424,6 @@ public void addRefreshListener(Translog.Location location, Consumer<Boolean> lis
         }
     }
 
-    /**
-     * Returns a snapshot with translog operations having a sequence number equal or greater than <code>minSeqNo</code> and
-     * equal or lesser than <code>maxSeqNo</code>.
-     */
-    public Translog.Snapshot getTranslogOperationsBetweenMinAndMaxSeqNo(long minSeqNo, long maxSeqNo) throws IOException {
-        return getEngine().getTranslog().newSnapshotBetweenMinAndMaxSeqNo(minSeqNo, maxSeqNo);
-    }
-
     private static class RefreshMetricUpdater implements ReferenceManager.RefreshListener {
 
         private final MeanMetric refreshMetric;

core/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java

@@ -82,7 +82,7 @@ public void resync(final IndexShard indexShard, final ActionListener<ResyncTask>
         ActionListener<ResyncTask> resyncListener = null;
         try {
             final long startingSeqNo = indexShard.getGlobalCheckpoint() + 1;
-            Translog.Snapshot snapshot = indexShard.getTranslog().newSnapshotFromMinSeqNo(startingSeqNo);
+            Translog.Snapshot snapshot = indexShard.getTranslog().newSnapshotFrom(startingSeqNo);
             resyncListener = new ActionListener<ResyncTask>() {
                 @Override
                 public void onResponse(final ResyncTask resyncTask) {

core/src/main/java/org/elasticsearch/index/translog/Translog.java

@@ -589,15 +589,15 @@ public Snapshot newSnapshotFromGen(long minGeneration) throws IOException {
         }
     }
 
-    public Snapshot newSnapshotFromMinSeqNo(long minSeqNo) throws IOException {
-        return newSnapshotBetweenMinAndMaxSeqNo(minSeqNo, Long.MAX_VALUE);
+    public Snapshot newSnapshotFrom(long minSeqNo) throws IOException {
+        return getSnapshotBetween(minSeqNo, Long.MAX_VALUE);
     }
 
     /**
      * Returns a snapshot with operations having a sequence number equal or greater than <code>minSeqNo</code> and
      * equal or lesser than <code>maxSeqNo</code>.
      */
-    public Snapshot newSnapshotBetweenMinAndMaxSeqNo(long minSeqNo, long maxSeqNo) throws IOException {
+    public Snapshot getSnapshotBetween(long minSeqNo, long maxSeqNo) throws IOException {
         try (ReleasableLock ignored = readLock.acquire()) {
             ensureOpen();
             TranslogSnapshot[] snapshots = readersBetweenMinAndMaxSeqNo(minSeqNo, maxSeqNo)

core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java

@@ -188,7 +188,7 @@ public RecoveryResponse recoverToTarget() throws IOException {
 
             logger.trace("snapshot translog for recovery; current size is [{}]", translog.estimateTotalOperationsFromMinSeq(startingSeqNo));
             final long targetLocalCheckpoint;
-            try(Translog.Snapshot snapshot = translog.newSnapshotFromMinSeqNo(startingSeqNo)) {
+            try(Translog.Snapshot snapshot = translog.newSnapshotFrom(startingSeqNo)) {
                 targetLocalCheckpoint = phase2(startingSeqNo, snapshot);
             } catch (Exception e) {
                 throw new RecoveryEngineException(shard.shardId(), 2, "phase2 failed", e);
@@ -244,7 +244,7 @@ boolean isTranslogReadyForSequenceNumberBasedRecovery() throws IOException {
             logger.trace("all operations up to [{}] completed, checking translog content", endingSeqNo);
 
             final LocalCheckpointTracker tracker = new LocalCheckpointTracker(shard.indexSettings(), startingSeqNo, startingSeqNo - 1);
-            try (Translog.Snapshot snapshot = shard.getTranslog().newSnapshotFromMinSeqNo(startingSeqNo)) {
+            try (Translog.Snapshot snapshot = shard.getTranslog().newSnapshotFrom(startingSeqNo)) {
                 Translog.Operation operation;
                 while ((operation = snapshot.next()) != null) {
                     if (operation.seqNo() != SequenceNumbers.UNASSIGNED_SEQ_NO) {

core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java

@@ -890,7 +890,7 @@ protected void doRun() throws Exception {
                         // these are what we expect the snapshot to return (and potentially some more).
                         Set<Translog.Operation> expectedOps = new HashSet<>(writtenOps.keySet());
                         expectedOps.removeIf(op -> op.seqNo() <= committedLocalCheckpointAtView);
-                        try (Translog.Snapshot snapshot = translog.newSnapshotFromMinSeqNo(committedLocalCheckpointAtView + 1L)) {
+                        try (Translog.Snapshot snapshot = translog.newSnapshotFrom(committedLocalCheckpointAtView + 1L)) {
                             Translog.Operation op;
                             while ((op = snapshot.next()) != null) {
                                 expectedOps.remove(op);
@@ -2481,7 +2481,7 @@ public void testMinSeqNoBasedAPI() throws IOException {
             }
             assertThat(translog.estimateTotalOperationsFromMinSeq(seqNo), equalTo(expectedSnapshotOps));
             int readFromSnapshot = 0;
-            try (Translog.Snapshot snapshot = translog.newSnapshotFromMinSeqNo(seqNo)) {
+            try (Translog.Snapshot snapshot = translog.newSnapshotFrom(seqNo)) {
                 assertThat(snapshot.totalOperations(), equalTo(expectedSnapshotOps));
                 Translog.Operation op;
                 while ((op = snapshot.next()) != null) {
@@ -2497,7 +2497,7 @@ public void testMinSeqNoBasedAPI() throws IOException {
         }
     }
 
-    public void testGetOperationsBetweenMinAndMaxSeqNoAPI() throws IOException {
+    public void testGetSnapshotBetweenAPI() throws IOException {
         final int operations = randomIntBetween(2, 8096);
         long seqNo = 0;
         for (int i = 0; i < operations; i++) {
@@ -2512,7 +2512,7 @@ public void testGetOperationsBetweenMinAndMaxSeqNoAPI() throws IOException {
         for (int iter = 0; iter < iters; iter++) {
             int min = randomIntBetween(0, operations - 1);
             int max = randomIntBetween(min, operations);
-            try (Translog.Snapshot snapshot = translog.newSnapshotBetweenMinAndMaxSeqNo(min, max)) {
+            try (Translog.Snapshot snapshot = translog.getSnapshotBetween(min, max)) {
                 Translog.Operation operation;
                 do {
                     operation = snapshot.next();