Changeset 17800 in josm

Timestamp:

2021-04-19T21:45:11+02:00 (4 years ago)

Author:

simon04

Message:

see #20745 - Avoid heap allocations via Selector.AbstractSelector#conds

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (8 diffs)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java (modified) (2 diffs)

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

@@ -8 +8 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -215 +216 @@
                     return;
                 int count = counter.getAsInt();
-                if (link.conds == null || link.conds.isEmpty()) {
+                if (link.getConditions().isEmpty()) {
                     // index is not needed, we can avoid the sequential search below
                     e.parent = parent;
@@ -235 +236 @@
 
             private boolean firstAndLastOnly() {
-                return link.conds.stream().allMatch(c -> c instanceof IndexCondition && ((IndexCondition) c).isFirstOrLast);
+                return link.getConditions().stream().allMatch(c -> c instanceof IndexCondition && ((IndexCondition) c).isFirstOrLast);
             }
 
@@ -574 +575 @@
                 }
             } else if (ChildOrParentSelectorType.CHILD == type
-                    && link.conds != null && !link.conds.isEmpty()
-                    && link.conds.get(0) instanceof OpenEndPseudoClassCondition) {
+                    && !link.getConditions().isEmpty()
+                    && link.getConditions().get(0) instanceof OpenEndPseudoClassCondition) {
                 if (e.osm instanceof INode) {
                     e.osm.visitReferrers(new MultipolygonOpenEndFinder(e));
@@ -638 +639 @@
     abstract class AbstractSelector implements Selector {
 
-        protected final List<Condition> conds;
+        private final Condition[] conds;
 
         protected AbstractSelector(List<Condition> conditions) {
-            this.conds = Utils.toUnmodifiableList(conditions);
+            this.conds = conditions.toArray(new Condition[0]);
         }
 
@@ -666 +667 @@
         @Override
         public List<Condition> getConditions() {
-            return conds;
+            return Arrays.asList(conds);
         }
     }
@@ -703 +704 @@
         @Override
         public String toString() {
-            return "LinkSelector{conditions=" + conds + '}';
+            return "LinkSelector{conditions=" + getConditions() + '}';
         }
     }
@@ -832 +833 @@
             return base
                     + (Range.ZERO_TO_INFINITY.equals(range) ? "" : range)
-                    + (conds != null ? conds.stream().map(String::valueOf).collect(Collectors.joining("")) : "")
+                    + (getConditions().stream().map(String::valueOf).collect(Collectors.joining("")))
                     + (subpart != null && subpart != Subpart.DEFAULT_SUBPART ? ("::" + subpart) : "");
         }

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java

@@ -79 +79 @@
     @Test
     void testClassCondition() throws Exception {
-        List<Condition> conditions = ((Selector.GeneralSelector) getParser("way[name=X].highway:closed").selector()).conds;
+        List<Condition> conditions = getParser("way[name=X].highway:closed").selector().getConditions();
         assertTrue(conditions.get(0) instanceof SimpleKeyValueCondition);
         assertTrue(conditions.get(0).applies(getEnvironment("name", "X")));
@@ -89 +89 @@
     @Test
     void testPseudoClassCondition() throws Exception {
-        Condition c0 = ((Selector.GeneralSelector) getParser("way:area-style").selector()).conds.get(0);
-        Condition c1 = ((Selector.GeneralSelector) getParser("way!:area-style").selector()).conds.get(0);
-        Condition c2 = ((Selector.GeneralSelector) getParser("way!:areaStyle").selector()).conds.get(0);
-        Condition c3 = ((Selector.GeneralSelector) getParser("way!:area_style").selector()).conds.get(0);
+        Condition c0 = getParser("way:area-style").selector().getConditions().get(0);
+        Condition c1 = getParser("way!:area-style").selector().getConditions().get(0);
+        Condition c2 = getParser("way!:areaStyle").selector().getConditions().get(0);
+        Condition c3 = getParser("way!:area_style").selector().getConditions().get(0);
         assertEquals(":areaStyle", c0.toString());
         assertEquals("!:areaStyle", c1.toString());