Changeset 18465 in josm

Timestamp:

2022-06-06T16:56:25+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22106: Avoid allocations for point objects in QuadBuckets

Nodes do not keep their bboxes in memory (to reduce overall memory usage).
This does mean that every time someone searches a quadbucket for nodes, we
have to recreate the BBox for every node in a quadbucket leaf. This is a
significant number of allocations that are unnecessary (~80% of the memory
allocations from QuadBuckets#search for nodes is from the creation of
temporary bboxes). The remaining cost for the search is from List#grow calls.

File:

• trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.data.IQuadBucketType;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.QuadTiling;
@@ -174 +175 @@
 
         boolean matches(final T o, final BBox searchBbox) {
+            // Avoid allocations for point (AKA Node) objects
+            if (o instanceof ILatLon) {
+                return searchBbox.contains((ILatLon) o);
+            }
             return o.getBBox().intersects(searchBbox);
         }