Changeset 17583 in josm for trunk/src/org/openstreetmap

Timestamp:

2021-03-18T00:57:03+01:00 (4 years ago)

Author:

simon04

Message:

see #20613 - Avoid heap allocations in AbstractSelector.matches

6.15%->1.92% in AbstractMapRendererPerformanceTestParent#testCity

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -653 +653 @@
         public boolean matches(Environment env) {
             CheckParameterUtil.ensureParameterNotNull(env, "env");
-            return conds.stream().allMatch(c -> {
+            // Avoid `conds.stream().allMatch(...)` for its high heap allocations
+            for (Condition c : conds) {
                 try {
-                    return c.applies(env);
+                    if (!c.applies(env)) return false;
                 } catch (PatternSyntaxException e) {
                     Logging.log(Logging.LEVEL_ERROR, "PatternSyntaxException while applying condition" + c + ':', e);
                     return false;
                 }
-            });
+            }
+            return true;
         }