Changeset 17822 in josm

Timestamp:

2021-04-26T19:31:01+02:00 (3 years ago)

Author:

simon04

Message:

see #20745 - Avoid heap allocations in OsmReader

12.0% of OsmReaderPerformanceTest amount to org.openstreetmap.josm.data.osm.OsmPrimitive.updateTagged

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmPrimitive.java (modified) (1 diff)
• io/AbstractReader.java (modified) (7 diffs)
• io/OsmJsonReader.java (modified) (3 diffs)
• io/OsmReader.java (modified) (6 diffs)

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

@@ -570 +570 @@
         // 'area' is not really uninteresting (putting it in that list may have unpredictable side effects)
         // but it's clearly not enough to consider an object as tagged (see #9261)
-        updateFlagsNoLock(FLAG_TAGGED, keys()
+        updateFlagsNoLock(FLAG_TAGGED, hasKeys() && keys()
                 .anyMatch(key -> !isUninterestingKey(key) && !"area".equals(key)));
     }

trunk/src/org/openstreetmap/josm/io/AbstractReader.java

@@ -595 +595 @@
          * @throws IllegalDataException in case of invalid data
          */
-        void accept(Node n) throws IllegalDataException;
+        void accept(NodeData n) throws IllegalDataException;
     }
 
@@ -606 +606 @@
          * @throws IllegalDataException in case of invalid data
          */
-        void accept(Way w, Collection<Long> nodeIds) throws IllegalDataException;
+        void accept(WayData w, Collection<Long> nodeIds) throws IllegalDataException;
     }
 
@@ -617 +617 @@
          * @throws IllegalDataException in case of invalid data
          */
-        void accept(Relation r, Collection<RelationMemberData> members) throws IllegalDataException;
+        void accept(RelationData r, Collection<RelationMemberData> members) throws IllegalDataException;
     }
 
@@ -643 +643 @@
 
     private Node addNode(NodeData nd, NodeReader nodeReader) throws IllegalDataException {
-        Node n = (Node) buildPrimitive(nd);
-        nodeReader.accept(n);
-        return n;
+        nodeReader.accept(nd);
+        return (Node) buildPrimitive(nd);
     }
 
@@ -691 +690 @@
         WayData wd = new WayData(0);
         commonReader.accept(wd);
-        Way w = (Way) buildPrimitive(wd);
 
         Collection<Long> nodeIds = new ArrayList<>();
-        wayReader.accept(w, nodeIds);
-        if (w.isDeleted() && !nodeIds.isEmpty()) {
-            Logging.info(tr("Deleted way {0} contains nodes", Long.toString(w.getUniqueId())));
+        wayReader.accept(wd, nodeIds);
+        if (wd.isDeleted() && !nodeIds.isEmpty()) {
+            Logging.info(tr("Deleted way {0} contains nodes", Long.toString(wd.getUniqueId())));
             nodeIds = new ArrayList<>();
         }
         ways.put(wd.getUniqueId(), nodeIds);
-        return w;
+        return (Way) buildPrimitive(wd);
     }
 
@@ -706 +704 @@
         RelationData rd = new RelationData(0);
         commonReader.accept(rd);
-        Relation r = (Relation) buildPrimitive(rd);
 
         Collection<RelationMemberData> members = new ArrayList<>();
-        relationReader.accept(r, members);
-        if (r.isDeleted() && !members.isEmpty()) {
-            Logging.info(tr("Deleted relation {0} contains members", Long.toString(r.getUniqueId())));
+        relationReader.accept(rd, members);
+        if (rd.isDeleted() && !members.isEmpty()) {
+            Logging.info(tr("Deleted relation {0} contains members", Long.toString(rd.getUniqueId())));
             members = new ArrayList<>();
         }
         relations.put(rd.getUniqueId(), members);
-        return r;
-    }
-
-    protected final RelationMemberData parseRelationMember(Relation r, String ref, String type, String role) throws IllegalDataException {
+        return (Relation) buildPrimitive(rd);
+    }
+
+    protected final RelationMemberData parseRelationMember(RelationData r, String ref, String type, String role) throws IllegalDataException {
         if (ref == null) {
             throw new IllegalDataException(tr("Missing attribute ''ref'' on member in relation {0}.",
@@ -731 +728 @@
     }
 
-    protected final RelationMemberData parseRelationMember(Relation r, long id, String type, String role) throws IllegalDataException {
+    protected final RelationMemberData parseRelationMember(RelationData r, long id, String type, String role) throws IllegalDataException {
         if (id == 0) {
             throw new IllegalDataException(tr("Incomplete <member> specification with ref=0"));

trunk/src/org/openstreetmap/josm/io/OsmJsonReader.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
-import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationData;
 import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.Tagged;
-import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WayData;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -144 +144 @@
     }
 
-    private static void readWayNodesAndTags(JsonObject item, Way w, Collection<Long> nodeIds) {
+    private static void readWayNodesAndTags(JsonObject item, WayData w, Collection<Long> nodeIds) {
         for (JsonValue v : item.getJsonArray("nodes")) {
             nodeIds.add(((JsonNumber) v).longValue());
@@ -155 +155 @@
     }
 
-    private void readRelationMembersAndTags(JsonObject item, Relation r, Collection<RelationMemberData> members)
+    private void readRelationMembersAndTags(JsonObject item, RelationData r, Collection<RelationMemberData> members)
             throws IllegalDataException {
         JsonArray jsonArray = item.getJsonArray("members");

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.NodeData;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationData;
 import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WayData;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -235 +238 @@
     }
 
-    private void parseNodeTags(Node n) throws IllegalDataException {
+    private void parseNodeTags(NodeData n) throws IllegalDataException {
         try {
             while (parser.hasNext()) {
@@ -263 +266 @@
     }
 
-    private void parseWayNodesAndTags(Way w, Collection<Long> nodeIds) throws IllegalDataException {
+    private void parseWayNodesAndTags(WayData w, Collection<Long> nodeIds) throws IllegalDataException {
         try {
             while (parser.hasNext()) {
@@ -287 +290 @@
     }
 
-    private long parseWayNode(Way w) throws XMLStreamException {
+    private long parseWayNode(WayData w) throws XMLStreamException {
         if (parser.getAttributeValue(null, "ref") == null) {
             throwException(
@@ -312 +315 @@
     }
 
-    private void parseRelationMembersAndTags(Relation r, Collection<RelationMemberData> members) throws IllegalDataException {
+    private void parseRelationMembersAndTags(RelationData r, Collection<RelationMemberData> members) throws IllegalDataException {
         try {
             while (parser.hasNext()) {
@@ -336 +339 @@
     }
 
-    private RelationMemberData parseRelationMember(Relation r) throws XMLStreamException {
+    private RelationMemberData parseRelationMember(RelationData r) throws XMLStreamException {
         RelationMemberData result = null;
         try {