Changeset 17801 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

Timestamp:

2021-04-19T21:45:13+02:00 (3 years ago)

Author:

simon04

Message:

see #20745 - Avoid heap allocations in MapCSS MatchingReferrerFinder due to lambda expression

4.66% of MapCSSTagCheckerPerformanceTest#testCity amount to java.lang.invoke.Invokers$Holder.linkToTargetMethod

File:

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

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

@@ -26 +26 @@
 import org.openstreetmap.josm.data.osm.IRelationMember;
 import org.openstreetmap.josm.data.osm.IWay;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -208 +209 @@
             }
 
-            private <T extends IPrimitive> void doVisit(T parent, IntSupplier counter, IntFunction<IPrimitive> getter) {
+            private void doVisit(IPrimitive parent) {
                 // If e.parent is already set to the first matching referrer.
                 // We skip any following referrer injected into the visitor.
@@ -215 +216 @@
                 if (!left.matches(e.withPrimitive(parent)))
                     return;
-                int count = counter.getAsInt();
+                int count = parent instanceof IWay<?>
+                        ? ((IWay<?>) parent).getNodesCount()
+                        : ((IRelation<?>) parent).getMembersCount();
                 if (link.getConditions().isEmpty()) {
                     // index is not needed, we can avoid the sequential search below
@@ -225 +228 @@
                 int step = firstAndLastOnly() ? count - 1 : 1;
                 for (int i = 0; i < count; i += step) {
-                    if (getter.apply(i).equals(e.osm)
+                    IPrimitive o = parent instanceof IWay<?>
+                            ? ((IWay<?>) parent).getNode(i)
+                            : ((IRelation<?>) parent).getMember(i).getMember();
+                    if (Objects.equals(o, e.osm)
                             && link.matches(e.withParentAndIndexAndLinkContext(parent, i, count))) {
                         e.parent = parent;
@@ -241 +247 @@
             @Override
             public void visit(IWay<?> w) {
-                doVisit(w, w::getNodesCount, w::getNode);
+                doVisit(w);
             }
 
             @Override
             public void visit(IRelation<?> r) {
-                doVisit(r, r::getMembersCount, i -> r.getMember(i).getMember());
+                doVisit(r);
             }
         }