Make methods static

[controller.git] / opendaylight / md-sal / sal-akka-raft / src / test / java / org / opendaylight / controller / cluster / raft / utils / InMemorySnapshotStore.java

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/InMemorySnapshotStore.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/InMemorySnapshotStore.java
index e16d7949745004ca91dbf20e4d186beb8d84cf50..bf130897354d12b9a89d75730f7353ba9135526c 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/InMemorySnapshotStore.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/InMemorySnapshotStore.java
@@ -14,7 +14,6 @@ import akka.persistence.SelectedSnapshot;
 import akka.persistence.SnapshotMetadata;
 import akka.persistence.SnapshotSelectionCriteria;
 import akka.persistence.snapshot.japi.SnapshotStore;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Uninterruptibles;
 import java.util.ArrayList;
@@ -40,6 +39,7 @@ public class InMemorySnapshotStore extends SnapshotStore {
 
     private static Map<String, List<StoredSnapshot>> snapshots = new ConcurrentHashMap<>();
     private static final Map<String, CountDownLatch> snapshotSavedLatches = new ConcurrentHashMap<>();
+    private static final Map<String, CountDownLatch> snapshotDeletedLatches = new ConcurrentHashMap<>();
 
     public static void addSnapshot(String persistentId, Object snapshot) {
         List<StoredSnapshot> snapshotList = snapshots.get(persistentId);
@@ -66,8 +66,8 @@ public class InMemorySnapshotStore extends SnapshotStore {
         synchronized (stored) {
             retList = Lists.newArrayListWithCapacity(stored.size());
             for(StoredSnapshot s: stored) {
-                if(type.isInstance(s.getData())) {
-                    retList.add((T) s.getData());
+                if(type.isInstance(s.data)) {
+                    retList.add((T) s.data);
                 }
             }
         }
@@ -83,6 +83,10 @@ public class InMemorySnapshotStore extends SnapshotStore {
         snapshotSavedLatches.put(persistenceId, new CountDownLatch(1));
     }
 
+    public static void addSnapshotDeletedLatch(String persistenceId) {
+        snapshotDeletedLatches.put(persistenceId, new CountDownLatch(1));
+    }
+
     public static <T> T waitForSavedSnapshot(String persistenceId, Class<T> type) {
         if(!Uninterruptibles.awaitUninterruptibly(snapshotSavedLatches.get(persistenceId), 5, TimeUnit.SECONDS)) {
             throw new AssertionError("Snapshot was not saved");
@@ -91,24 +95,45 @@ public class InMemorySnapshotStore extends SnapshotStore {
         return getSnapshots(persistenceId, type).get(0);
     }
 
+    public static void waitForDeletedSnapshot(String persistenceId) {
+        if(!Uninterruptibles.awaitUninterruptibly(snapshotDeletedLatches.get(persistenceId), 5, TimeUnit.SECONDS)) {
+            throw new AssertionError("Snapshot was not deleted");
+        }
+    }
+
     @Override
-    public Future<Option<SelectedSnapshot>> doLoadAsync(String s,
-        SnapshotSelectionCriteria snapshotSelectionCriteria) {
-        List<StoredSnapshot> snapshotList = snapshots.get(s);
+    public Future<Option<SelectedSnapshot>> doLoadAsync(String persistenceId,
+            SnapshotSelectionCriteria snapshotSelectionCriteria) {
+        List<StoredSnapshot> snapshotList = snapshots.get(persistenceId);
         if(snapshotList == null){
             return Futures.successful(Option.<SelectedSnapshot>none());
         }
 
-        StoredSnapshot snapshot = Iterables.getLast(snapshotList);
-        SelectedSnapshot selectedSnapshot =
-            new SelectedSnapshot(snapshot.getMetadata(), snapshot.getData());
-        return Futures.successful(Option.some(selectedSnapshot));
+        synchronized(snapshotList) {
+            for(int i = snapshotList.size() - 1; i >= 0; i--) {
+                StoredSnapshot snapshot = snapshotList.get(i);
+                if(matches(snapshot, snapshotSelectionCriteria)) {
+                    return Futures.successful(Option.some(new SelectedSnapshot(snapshot.metadata,
+                            snapshot.data)));
+                }
+            }
+        }
+
+        return Futures.successful(Option.<SelectedSnapshot>none());
+    }
+
+    private static boolean matches(StoredSnapshot snapshot, SnapshotSelectionCriteria criteria) {
+        return snapshot.metadata.sequenceNr() <= criteria.maxSequenceNr() &&
+                snapshot.metadata.timestamp() <= criteria.maxTimestamp();
     }
 
     @Override
     public Future<Void> doSaveAsync(SnapshotMetadata snapshotMetadata, Object o) {
         List<StoredSnapshot> snapshotList = snapshots.get(snapshotMetadata.persistenceId());
 
+        LOG.trace("doSaveAsync: persistentId {}: sequenceNr: {}: timestamp {}: {}", snapshotMetadata.persistenceId(),
+                snapshotMetadata.sequenceNr(), snapshotMetadata.timestamp(), o);
+
         if(snapshotList == null){
             snapshotList = new ArrayList<>();
             snapshots.put(snapshotMetadata.persistenceId(), snapshotList);
@@ -137,44 +162,43 @@ public class InMemorySnapshotStore extends SnapshotStore {
             return;
         }
 
-        int deleteIndex = -1;
-
         synchronized (snapshotList) {
             for(int i=0;i<snapshotList.size(); i++){
                 StoredSnapshot snapshot = snapshotList.get(i);
-                if(snapshotMetadata.equals(snapshot.getMetadata())){
-                    deleteIndex = i;
+                if(snapshotMetadata.equals(snapshot.metadata)){
+                    snapshotList.remove(i);
                     break;
                 }
             }
-
-            if(deleteIndex != -1){
-                snapshotList.remove(deleteIndex);
-            }
         }
     }
 
     @Override
     public void doDelete(String persistentId, SnapshotSelectionCriteria snapshotSelectionCriteria)
-        throws Exception {
-        List<StoredSnapshot> snapshotList = snapshots.get(persistentId);
-
-        if(snapshotList == null){
-            return;
-        }
+            throws Exception {
+        LOG.trace("doDelete: persistentId {}: maxSequenceNr: {}: maxTimestamp {}", persistentId,
+                snapshotSelectionCriteria.maxSequenceNr(), snapshotSelectionCriteria.maxTimestamp());
 
-        synchronized (snapshotList) {
-            Iterator<StoredSnapshot> iter = snapshotList.iterator();
-            while(iter.hasNext()) {
-                StoredSnapshot s = iter.next();
-                LOG.trace("doDelete: sequenceNr: {}, maxSequenceNr: {}", s.getMetadata().sequenceNr(),
-                        snapshotSelectionCriteria.maxSequenceNr());
-
-                if(s.getMetadata().sequenceNr() <= snapshotSelectionCriteria.maxSequenceNr()) {
-                    iter.remove();
+        List<StoredSnapshot> snapshotList = snapshots.get(persistentId);
+        if(snapshotList != null){
+            synchronized (snapshotList) {
+                Iterator<StoredSnapshot> iter = snapshotList.iterator();
+                while(iter.hasNext()) {
+                    StoredSnapshot s = iter.next();
+                    if(matches(s, snapshotSelectionCriteria)) {
+                        LOG.trace("Deleting snapshot for sequenceNr: {}, timestamp: {}: {}",
+                                s.metadata.sequenceNr(), s.metadata.timestamp(), s.data);
+
+                        iter.remove();
+                    }
                 }
             }
         }
+
+        CountDownLatch latch = snapshotDeletedLatches.get(persistentId);
+        if(latch != null) {
+            latch.countDown();
+        }
     }
 
     private static class StoredSnapshot {
@@ -185,13 +209,5 @@ public class InMemorySnapshotStore extends SnapshotStore {
             this.metadata = metadata;
             this.data = data;
         }
-
-        public SnapshotMetadata getMetadata() {
-            return metadata;
-        }
-
-        public Object getData() {
-            return data;
-        }
     }
 }