Changeset 36230 in osm for applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java

Timestamp:

2024-03-19T17:42:16+01:00 (8 months ago)

Author:

taylor.smock

Message:

reverter: Speed up reverting of large changesets where many objects have changed since the changeset was closed

This is done by using the OSM multi-fetch API to avoid doing a request per
version per object. Instead, we now do a bulk request for a series of versions
until we have all the information we need.

Additional performance enhancements include:

• Don't do string concatenation prior to logging call for Reverting {target} to {old version}
• reverter multi-fetch now queries 2k objects or 8k characters, whichever comes first
• Some locations which fire DataSet events are now wrapped in DataSet#update calls

File:

• applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java (modified) (4 diffs)

applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -38 +40 @@
     private final DataSet targetDataSet;
 
-    private final List<Command> cmds = new LinkedList<>();
-    private final List<OsmPrimitive> nominalRevertedPrimitives = new LinkedList<>();
+    private final List<Command> cmds = new ArrayList<>();
+    private final Set<OsmPrimitive> nominalRevertedPrimitives = new HashSet<>();
 
     /**
@@ -60 +62 @@
                 nominalRevertedPrimitives.add(target);
             }
-            Logging.debug("Reverting " + target + " to " + newTarget);
+            Logging.debug("Reverting {0} to {1}", target, newTarget);
         }
     }
@@ -126 +128 @@
             // Target node has been deleted by a more recent changeset -> conflict
             } else if (sourceNode.isIncomplete() && !conflicts.hasConflictForMy(targetNode)) {
-                localConflicts.add(new Conflict<OsmPrimitive>(targetNode, sourceNode, true));
+                localConflicts.add(new Conflict<>(targetNode, sourceNode, true));
             } else {
                Logging.info("Skipping target node "+targetNode+" for source node "+sourceNode+" while reverting way "+source);