Removed deprecated map change notification support

Change-Id: Ibff2e403129ee026092a24fc15b82e80ffb8dc48

Removed deprecated map change notification support
Change-Id: Ibff2e403129ee026092a24fc15b82e80ffb8dc48
Madan Jampani
Commit 8566863454b1b523bbc3c3765133cfc951c1ce0e 85668634 1 parent 14e684b5
Showing 3 changed files with 20 additions and 61 deletions
core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultAsyncConsistentMap.java
core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultConsistentMapBuilder.java
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
View file @8566863
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
View file @8566863
@@ -20,9 +20,9 @@ import com.google.common.base.Charsets;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.Futures;
@@ -68,7 +68,6 @@ import org.onosproject.store.service.ConsistentMapBuilder;
 import org.onosproject.store.service.ConsistentMapException;
 import org.onosproject.store.service.DistributedQueueBuilder;
 import org.onosproject.store.service.EventuallyConsistentMapBuilder;
-import org.onosproject.store.service.MapEvent;
 import org.onosproject.store.service.MapInfo;
 import org.onosproject.store.service.PartitionInfo;
 import org.onosproject.store.service.DistributedSetBuilder;
@@ -126,8 +125,8 @@ public class DatabaseManager implements StorageService, StorageAdminService {
     private ExecutorService queuePollExecutor;
     private ApplicationListener appListener = new InternalApplicationListener();
-    private final Map<String, DefaultAsyncConsistentMap> maps = Maps.newConcurrentMap();
+    private final Multimap<String, DefaultAsyncConsistentMap> maps = ArrayListMultimap.create();
-    private final ListMultimap<ApplicationId, DefaultAsyncConsistentMap> mapsByApplication = ArrayListMultimap.create();
+    private final Multimap<ApplicationId, DefaultAsyncConsistentMap> mapsByApplication = ArrayListMultimap.create();
     private final Map<String, DefaultDistributedQueue> queues = Maps.newConcurrentMap();
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -451,28 +450,15 @@ public class DatabaseManager implements StorageService, StorageAdminService {
     }
     protected <K, V> DefaultAsyncConsistentMap<K, V> registerMap(DefaultAsyncConsistentMap<K, V> map) {
-        DefaultAsyncConsistentMap<K, V> existing = maps.putIfAbsent(map.name(), map);
+        maps.put(map.name(), map);
-        if (existing != null) {
+        if (map.applicationId() != null) {
-            // FIXME: We need to cleanly support different map instances with same name.
+            mapsByApplication.put(map.applicationId(), map);
-            log.info("Map by name {} already exists", map.name());
-            return existing;
-        } else {
-            if (map.applicationId() != null) {
-                mapsByApplication.put(map.applicationId(), map);
-            }
         }
-
-        clusterCommunicator.<MapEvent<K, V>>addSubscriber(mapUpdatesSubject(map.name()),
-                map.serializer()::decode,
-                map::notifyLocalListeners,
-                eventDispatcher);
         return map;
     }
     protected <K, V> void unregisterMap(DefaultAsyncConsistentMap<K, V> map) {
-        if (maps.remove(map.name()) != null) {
+        maps.remove(map.name(), map);
-            clusterCommunicator.removeSubscriber(mapUpdatesSubject(map.name()));
-        }
         if (map.applicationId() != null) {
             mapsByApplication.remove(map.applicationId(), map);
         }
@@ -485,10 +471,6 @@ public class DatabaseManager implements StorageService, StorageAdminService {
         }
     }
-    protected static MessageSubject mapUpdatesSubject(String mapName) {
-        return new MessageSubject(mapName + "-map-updates");
-    }
-
     private class InternalApplicationListener implements ApplicationListener {
         @Override
         public void event(ApplicationEvent event) {
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultAsyncConsistentMap.java
View file @8566863
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultAsyncConsistentMap.java
View file @8566863
@@ -28,7 +28,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiFunction;
-import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -74,7 +73,6 @@ public class DefaultAsyncConsistentMap<K, V> implements AsyncConsistentMap<K, V>
     private final Serializer serializer;
     private final boolean readOnly;
     private final boolean purgeOnUninstall;
-    private final Consumer<MapEvent<K, V>> eventPublisher;
     private final MetricsService metricsService;
     private final MetricsComponent metricsComponent;
@@ -130,22 +128,20 @@ public class DefaultAsyncConsistentMap<K, V> implements AsyncConsistentMap<K, V>
             Database database,
             Serializer serializer,
             boolean readOnly,
-            boolean purgeOnUninstall,
+            boolean purgeOnUninstall) {
-            Consumer<MapEvent<K, V>> eventPublisher) {
         this.name = checkNotNull(name, "map name cannot be null");
         this.applicationId = applicationId;
         this.database = checkNotNull(database, "database cannot be null");
         this.serializer = checkNotNull(serializer, "serializer cannot be null");
         this.readOnly = readOnly;
         this.purgeOnUninstall = purgeOnUninstall;
-        this.eventPublisher = eventPublisher;
         this.database.registerConsumer(update -> {
             SharedExecutors.getSingleThreadExecutor().execute(() -> {
                 if (update.target() == MAP) {
                     Result<UpdateResult<String, byte[]>> result = update.output();
                     if (result.success() && result.value().mapName().equals(name)) {
                         MapEvent<K, V> mapEvent = result.value().<K, V>map(this::dK, serializer::decode).toMapEvent();
-                        notifyLocalListeners(mapEvent);
+                        notifyListeners(mapEvent);
                     }
                 }
             });
@@ -423,12 +419,7 @@ public class DefaultAsyncConsistentMap<K, V> implements AsyncConsistentMap<K, V>
                 oldVersionMatch,
                 value == null ? null : serializer.encode(value))
                 .thenApply(this::unwrapResult)
-                .thenApply(r -> r.<K, V>map(this::dK, serializer::decode))
+                .thenApply(r -> r.<K, V>map(this::dK, serializer::decode));
-                .whenComplete((r, e) -> {
-                    if (r != null && e == null && !database.hasChangeNotificationSupport()) {
-                        notifyListeners(r.toMapEvent());
-                    }
-                });
     }
     private <T> T unwrapResult(Result<T> result) {
@@ -458,26 +449,16 @@ public class DefaultAsyncConsistentMap<K, V> implements AsyncConsistentMap<K, V>
     }
     protected void notifyListeners(MapEvent<K, V> event) {
-        try {
+        if (event == null) {
-            if (event != null) {
+            return;
-                notifyLocalListeners(event);
-                notifyRemoteListeners(event);
-            }
-        } catch (Exception e) {
-            log.warn("Failure notifying listeners about {}", event, e);
-        }
-    }
-
-    protected void notifyLocalListeners(MapEvent<K, V> event) {
-        if (event != null) {
-            listeners.forEach(listener -> listener.event(event));
-        }
-    }
-
-    protected void notifyRemoteListeners(MapEvent<K, V> event) {
-        if (eventPublisher != null) {
-            eventPublisher.accept(event);
         }
+        listeners.forEach(listener -> {
+            try {
+                listener.event(event);
+            } catch (Exception e) {
+                log.warn("Failure notifying listener about {}", event, e);
+            }
+        });
     }
     private OperationTimer startTimer(String op) {
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultConsistentMapBuilder.java
View file @8566863
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultConsistentMapBuilder.java
View file @8566863
@@ -22,7 +22,6 @@ import org.onosproject.core.ApplicationId;
 import org.onosproject.store.service.AsyncConsistentMap;
 import org.onosproject.store.service.ConsistentMap;
 import org.onosproject.store.service.ConsistentMapBuilder;
-import org.onosproject.store.service.MapEvent;
 import org.onosproject.store.service.Serializer;
 /**
@@ -110,10 +109,7 @@ public class DefaultConsistentMapBuilder<K, V> implements ConsistentMapBuilder<K
                 partitionsEnabled ? manager.partitionedDatabase : manager.inMemoryDatabase,
                 serializer,
                 readOnly,
-                purgeOnUninstall,
+                purgeOnUninstall);
-                event -> manager.clusterCommunicator.<MapEvent<K, V>>broadcast(event,
-                        DatabaseManager.mapUpdatesSubject(name),
-                        serializer::encode));
         return manager.registerMap(asyncMap);
     }
 }
\ No newline at end of file