Changeset 19214 in josm

Timestamp:

2024-09-09T17:55:46+02:00 (6 months ago)

Author:

taylor.smock

Message:

Fix #23908: Significantly improve the performance of copy/paste when dealing with large amounts of data

From #23908, at least one valid workflow involves copy/pasting large amounts of
data (specifically updating boundaries). The relation for Terwolde in the
sample data had 2206 objects. This took >5 minutes to copy between layers. With
this change, it takes <1 second.

This is a performance regression from r19176. The primary culprit from r19176 is
when we check the size of the dataset. The problem is that we check to see if the
size of the primitives being changed is greater than or equal to the non-deleted
complete primitives in the dataset. We get a new filtered collection each time
we get those primitives, and therefore the size of that is not cached. The size
calculation for the filtered collection is where almost all the expense is. We
fix that by wrapping the work from AddPrimitivesCommand in DataSet#update to
have a single large update at the end of the copy operation. This ensures that
we do not have many spurious fired event calls when a mass operation is going on.

File:

• trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -10 +10 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
-
-import javax.swing.Icon;
 
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -69 +67 @@
     public boolean executeCommand() {
         DataSet ds = getAffectedDataSet();
+        ds.update(() -> this.executeRealCommand(ds));
+        if (toSelect != null) {
+            ds.setSelected(toSelect.stream().map(ds::getPrimitiveById).collect(Collectors.toList()));
+        }
+        return true;
+    }
+
+    private void executeRealCommand(DataSet ds) {
         if (createdPrimitives == null) { // first time execution
             List<OsmPrimitive> newPrimitives = new ArrayList<>(data.size());
@@ -110 +116 @@
             }
         }
-        if (toSelect != null) {
-            ds.setSelected(toSelect.stream().map(ds::getPrimitiveById).collect(Collectors.toList()));
-        }
-        return true;
     }
 
@@ -150 +152 @@
 
     @Override
-    public Icon getDescriptionIcon() {
-        return null;
-    }
-
-    @Override
     public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
             Collection<OsmPrimitive> added) {