remove streams and switch to fixed size lists

vert-x3 · Aug 27, 2024 · 37a64ac · 37a64ac
1 parent c5b6405
commit 37a64ac
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/src/main/java/io/vertx/spi/cluster/ignite/IgniteClusterManager.java b/src/main/java/io/vertx/spi/cluster/ignite/IgniteClusterManager.java
@@ -50,7 +50,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
@@ -270,8 +269,15 @@ public void getNodeInfo(String id, Promise<NodeInfo> promise) {
   @Override
   public List<String> getNodes() {
     try {
-      return ignite.cluster().nodes().stream()
-        .map(IgniteClusterManager::nodeId).collect(Collectors.toList());
+      Collection<ClusterNode> nodes = ignite.cluster().nodes();
+      List<String> nodeIds;
+      synchronized (nodes) {
+        nodeIds = new ArrayList<>(nodes.size());
+        for (ClusterNode node : nodes) {
+          nodeIds.add(nodeId(node));
+        }
+      }
+      return nodeIds;
     } catch (IllegalStateException e) {
       log.debug(e.getMessage());
       return Collections.emptyList();

diff --git a/src/main/java/io/vertx/spi/cluster/ignite/impl/SubsMapHelper.java b/src/main/java/io/vertx/spi/cluster/ignite/impl/SubsMapHelper.java
@@ -35,11 +35,8 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import static java.util.stream.Collectors.toList;
-
 /**
  * @author Thomas Segismont
  * @author Lukas Prettenthaler
@@ -71,12 +68,11 @@ public void get(String address, Promise<List<RegistrationInfo>> promise) {
       return;
     }
     try {
-      List<RegistrationInfo> infos = map.query(new ScanQuery<IgniteRegistrationInfo, Boolean>((k, v) -> k.address().equals(address)))
-        .getAll().stream()
-        .map(Cache.Entry::getKey)
-        .map(IgniteRegistrationInfo::registrationInfo)
-        .collect(toList());
-      int size = infos.size();
+      List<Cache.Entry<IgniteRegistrationInfo, Boolean>> remote = map
+        .query(new ScanQuery<IgniteRegistrationInfo, Boolean>((k, v) -> k.address().equals(address)))
+        .getAll();
+      List<RegistrationInfo> infos;
+      int size = remote.size();
       Set<RegistrationInfo> local = localSubs.get(address);
       if (local != null) {
         synchronized (local) {
@@ -85,13 +81,18 @@ public void get(String address, Promise<List<RegistrationInfo>> promise) {
             promise.complete(Collections.emptyList());
             return;
           }
+          infos = new ArrayList<>(size);
           infos.addAll(local);
         }
       } else if (size == 0) {
         promise.complete(Collections.emptyList());
         return;
+      } else {
+        infos = new ArrayList<>(size);
+      }
+      for (Cache.Entry<IgniteRegistrationInfo, Boolean> info : remote) {
+        infos.add(info.getKey().registrationInfo());
       }
-
       promise.complete(infos);
     } catch (IllegalStateException | CacheException e) {
       promise.fail(new VertxException(e));
@@ -145,13 +146,12 @@ private Set<RegistrationInfo> removeFromSet(RegistrationInfo registrationInfo, S
   }
 
   public void removeAllForNode(String nodeId) {
-    TreeSet<IgniteRegistrationInfo> toRemove = map.query(new ScanQuery<IgniteRegistrationInfo, Boolean>((k, v) -> k.registrationInfo().nodeId().equals(nodeId)))
-      .getAll().stream()
-      .map(Cache.Entry::getKey)
-      .collect(Collectors.toCollection(TreeSet::new));
-    for (IgniteRegistrationInfo info : toRemove) {
+    List<Cache.Entry<IgniteRegistrationInfo, Boolean>> toRemove = map
+      .query(new ScanQuery<IgniteRegistrationInfo, Boolean>((k, v) -> k.registrationInfo().nodeId().equals(nodeId)))
+      .getAll();
+    for (Cache.Entry<IgniteRegistrationInfo, Boolean> info : toRemove) {
       try {
-        map.remove(info, Boolean.TRUE);
+        map.remove(info.getKey(), Boolean.TRUE);
       } catch (IllegalStateException | CacheException t) {
         log.warn("Could not remove subscriber: " + t.getMessage());
       }