Stream state more efficient loading of subjects (#1179)

nats-io · Jul 11, 2024 · b6804c0 · b6804c0
1 parent f80d42d
commit b6804c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/io/nats/client/api/StreamState.java b/src/main/java/io/nats/client/api/StreamState.java
@@ -16,6 +16,7 @@
 import io.nats.client.support.JsonValue;
 
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,13 +49,20 @@ public class StreamState {
         lastTime = readDate(vStreamState, LAST_TS);
         subjectCount = readLong(vStreamState, NUM_SUBJECTS, 0);
         deletedCount = readLong(vStreamState, NUM_DELETED, 0);
-        subjects = Subject.listOf(readValue(vStreamState, SUBJECTS));
         deletedStreamSequences = readLongList(vStreamState, DELETED);
         lostStreamData = LostStreamData.optionalInstance(readValue(vStreamState, LOST));
 
+        subjects = new ArrayList<>();
         subjectMap = new HashMap<>();
-        for (Subject s : subjects) {
-            subjectMap.put(s.getName(), s.getCount());
+        JsonValue vSubjects = readValue(vStreamState, SUBJECTS);
+        if (vSubjects != null && vSubjects.map != null) {
+            for (String subject : vSubjects.map.keySet()) {
+                Long count = getLong(vSubjects.map.get(subject));
+                if (count != null) {
+                    subjects.add(new Subject(subject, count));
+                    subjectMap.put(subject, count);
+                }
+            }
         }
     }
 

diff --git a/src/main/java/io/nats/client/api/Subject.java b/src/main/java/io/nats/client/api/Subject.java
@@ -37,7 +37,7 @@ static List<Subject> listOf(JsonValue vSubjects) {
         return list;
     }
 
-    private Subject(String name, long count) {
+    public Subject(String name, long count) {
         this.name = name;
         this.count = count;
     }