tostring

Author: tlrx

server/src/main/java/org/elasticsearch/cluster/SnapshotDeletionsPending.java

@@ -21,11 +21,9 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.function.Consumer;
 
 import static java.util.Collections.unmodifiableList;
@@ -116,7 +114,7 @@ public Version getMinimalSupportedVersion() {
         return Version.CURRENT.minimumCompatibilityVersion();
     }
 
-    public SnapshotDeletionsPending withRemovedSnapshots(Set<SnapshotId> snapshotIds) {
+    public SnapshotDeletionsPending withRemovedSnapshots(List<SnapshotId> snapshotIds) {
         if (snapshotIds == null || snapshotIds.isEmpty()) {
             return this;
         }
@@ -142,23 +140,19 @@ public SnapshotDeletionsPending withRemovedSnapshots(Set<SnapshotId> snapshotIds
     public String toString() {
         final StringBuilder builder = new StringBuilder("SnapshotDeletionsPending[");
         boolean prepend = true;
-
         final Iterator<Entry> iterator = entries.stream().iterator();
         while (iterator.hasNext()) {
             if (prepend == false) {
                 builder.append(',');
             }
-            final Entry entry = iterator.next();
-            builder.append('[').append(entry.repositoryName).append('/').append(entry.repositoryUuid).append(']');
-            builder.append('[').append(entry.snapshotId).append(',').append(entry.creationTime).append(']');
-            builder.append('\n');
+            builder.append(iterator.next());
             prepend = false;
         }
         builder.append(']');
         return builder.toString();
     }
 
-    public static class Entry implements Writeable, ToXContentObject, Comparable<Entry> {
+    public static class Entry implements Writeable, ToXContentObject {
 
         private final String repositoryName;
         private final String repositoryUuid;
@@ -233,11 +227,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         }
 
         @Override
-        public int compareTo(final Entry other) {
-            return Comparator.comparingLong(Entry::getCreationTime)
-                .reversed()
-                .thenComparing(Entry::getSnapshotId)
-                .compare(this, other);
+        public String toString() {
+            return '[' + repositoryName + '/' + repositoryUuid + ',' + snapshotId + ',' + creationTime + ']';
         }
     }
 

server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java

@@ -69,7 +69,6 @@
 import org.elasticsearch.common.util.concurrent.AbstractRunnable;
 import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
 import org.elasticsearch.common.util.concurrent.CountDown;
-import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.core.Tuple;
@@ -1438,7 +1437,7 @@ private class SnapshotsToDeleteRunnable extends AbstractRunnable {
 
         @Override
         protected void doRun() throws Exception {
-            final Set<SnapshotId> missingSnapshots = ConcurrentCollections.newConcurrentSet();
+            final List<SnapshotId> missingSnapshots = new CopyOnWriteArrayList<>();
             final CountDown countDown = new CountDown(snapshotIdsToDelete.size());
 
             for (SnapshotId snapshotId : snapshotIdsToDelete) {
@@ -2782,7 +2781,7 @@ protected SnapshotDeletionsInProgress filterDeletions(SnapshotDeletionsInProgres
                 @Override
                 protected SnapshotDeletionsPending filterPendingDeletions(@Nullable SnapshotDeletionsPending pendingDeletions) {
                     return pendingDeletions != null
-                        ? pendingDeletions.withRemovedSnapshots(Sets.newHashSet(deleteEntry.getSnapshots()))
+                        ? pendingDeletions.withRemovedSnapshots(deleteEntry.getSnapshots())
                         : null;
                 }