Be more efficient in how we look up watched WS paths.

rollerderby · May 10, 2019 · ce53fbc · ce53fbc
1 parent eb2587c
commit ce53fbc
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/src/com/carolinarollergirls/scoreboard/jetty/WS.java b/src/com/carolinarollergirls/scoreboard/jetty/WS.java
@@ -14,7 +14,7 @@
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.TreeSet;
 import java.util.Set;
 import java.util.Map;
 import java.util.UUID;
@@ -103,7 +103,7 @@ public synchronized void onMessage(String message_data) {
                 if (action.equals("Register")) {
                     JSONArray jsonPaths = json.optJSONArray("paths");
                     if (jsonPaths != null) {
-                        Set<String> newPaths = new HashSet<>();
+                        TreeSet<String> newPaths = new TreeSet<>();
                         for (int i = 0; i < jsonPaths.length(); i++) {
                             newPaths.add(jsonPaths.getString(i));
                         }
@@ -237,17 +237,15 @@ public synchronized void sendUpdates(Map<String, Object> state, Set<String> chan
             sendWSUpdatesForPaths(paths, changed);
         }
 
-        private void sendWSUpdatesForPaths(Set<String> watchedPaths, Set<String> changed) {
+        private void sendWSUpdatesForPaths(TreeSet<String> watchedPaths, Set<String> changed) {
             Map<String, Object> updates = new HashMap<>();
             for (String k: changed) {
-                for (String p : watchedPaths) {
-                    if (k.startsWith(p)) {
-                        if (state.get(k) == null) {
-                            updates.put(k, JSONObject.NULL);
-                        } else {
-                            updates.put(k, state.get(k));
-                        }
-                        break;
+                String p = watchedPaths.floor(k);
+                if (p != null && k.startsWith(p)) {
+                    if (state.get(k) == null) {
+                        updates.put(k, JSONObject.NULL);
+                    } else {
+                        updates.put(k, state.get(k));
                     }
                 }
             }
@@ -266,7 +264,7 @@ private void sendWSUpdatesForPaths(Set<String> watchedPaths, Set<String> changed
         }
 
         protected UUID id;
-        protected Set<String> paths = new HashSet<>();
+        protected TreeSet<String> paths = new TreeSet<>();
         private Map<String, Object> state;
     }
 }