Changeset 15426 in josm for trunk

Timestamp:

2019-10-05T23:38:29+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #13890 - improve performance of "Upload selection" checks

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/UploadSelectionAction.java (modified) (8 diffs)
• src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified) (4 diffs)
• test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

@@ -68 +68 @@
             setEnabled(false);
         }
-        if (isEnabled() && selection.stream().noneMatch(OsmPrimitive::isModified)) {
+        if (isEnabled() && selection.parallelStream().noneMatch(OsmPrimitive::isModified)) {
             setEnabled(false);
         }
@@ -74 +74 @@
 
     protected Set<OsmPrimitive> getDeletedPrimitives(DataSet ds) {
-        return ds.allPrimitives().stream()
+        return ds.allPrimitives().parallelStream()
                 .filter(p -> p.isDeleted() && !p.isNew() && p.isVisible() && p.isModified())
                 .collect(Collectors.toSet());
@@ -80 +80 @@
 
     protected Set<OsmPrimitive> getModifiedPrimitives(Collection<OsmPrimitive> primitives) {
-        return primitives.stream()
+        return primitives.parallelStream()
                 .filter(p -> p.isNewOrUndeleted() || (p.isModified() && !p.isIncomplete()))
                 .collect(Collectors.toSet());
@@ -124 +124 @@
      */
     protected boolean hasPrimitivesToDelete(Collection<OsmPrimitive> primitives) {
-        for (OsmPrimitive p: primitives) {
-            if (p.isDeleted() && p.isModified() && !p.isNew())
-                return true;
-        }
-        return false;
+        return primitives.parallelStream().anyMatch(p -> p.isDeleted() && p.isModified() && !p.isNew());
     }
 
@@ -240 +236 @@
 
         /**
-         *
+         * Constructs a new {@code DeletedParentsChecker}.
          * @param layer the data layer for which a collection of selected primitives is uploaded
          * @param toUpload the collection of primitives to upload
@@ -278 +274 @@
          */
         protected Set<OsmPrimitive> getPrimitivesToCheckForParents() {
-            return toUpload.stream().filter(p -> p.isDeleted() && !p.isNewOrUndeleted()).collect(Collectors.toSet());
+            return toUpload.parallelStream().filter(p -> p.isDeleted() && !p.isNewOrUndeleted()).collect(Collectors.toSet());
         }
 
@@ -291 +287 @@
                     OsmPrimitive current = toCheck.pop();
                     synchronized (this) {
-                        reader = new OsmServerBackreferenceReader(current);
+                        reader = new OsmServerBackreferenceReader(current).setAllowIncompleteParentWays(true);
                     }
                     getProgressMonitor().subTask(tr("Reading parents of ''{0}''", current.getDisplayName(DefaultNameFormatter.getInstance())));
@@ -302 +298 @@
                     for (OsmPrimitive p: ds.allPrimitives()) {
                         if (canceled) return;
+                        if (p instanceof Node || (p instanceof Way && !(current instanceof Node))) continue;
                         OsmPrimitive myDeletedParent = layer.data.getPrimitiveById(p);
                         // our local dataset includes a deleted parent of a primitive we want

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

@@ -42 +42 @@
     /** true if this reader should complete incomplete primitives */
     private boolean readFull;
+    /** true if this reader should allow incomplete parent ways */
+    private boolean allowIncompleteParentWays;
 
     /**
@@ -113 +115 @@
 
     /**
-     * Set true if this reader should reads immediate children of referring primitives too. False, otherweise.
-     *
-     * @param readFull true if this reader should reads immediate children of referring primitives too. False, otherweise.
-     */
-    public void setReadFull(boolean readFull) {
+     * Set true if this reader should reads immediate children of referring primitives too. False, otherwise.
+     *
+     * @param readFull true if this reader should reads immediate children of referring primitives too. False, otherwise.
+     * @return {@code this}, for easy chaining
+     * @since 15426
+     */
+    public OsmServerBackreferenceReader setReadFull(boolean readFull) {
         this.readFull = readFull;
+        return this;
+    }
+
+    /**
+     * Determines if this reader allows to return incomplete parent ways of a node.
+     * @return {@code true} if this reader allows to return incomplete parent ways of a node
+     * @since 15426
+     */
+    public boolean isAllowIncompleteParentWays() {
+        return allowIncompleteParentWays;
+    }
+
+    /**
+     * Sets whether this reader allows to return incomplete parent ways of a node.
+     * @param allowIncompleteWays {@code true} if this reader allows to return incomplete parent ways of a node
+     * @return {@code this}, for easy chaining
+     * @since 15426
+     */
+    public OsmServerBackreferenceReader setAllowIncompleteParentWays(boolean allowIncompleteWays) {
+        this.allowIncompleteParentWays = allowIncompleteWays;
+        return this;
     }
 
@@ -175 +200 @@
      * <ul>
      *   <li>if this reader reads referers for a {@link org.openstreetmap.josm.data.osm.Node}, referring ways are always
-     *     read individually from the server</li>
+     *     read fully, unless {@link #setAllowIncompleteParentWays(boolean)} is set to true.</li>
      *   <li>if this reader reads referers for an {@link Way} or a {@link Relation}, referring relations
      *    are only read fully if {@link #setReadFull(boolean)} is set to true.</li>
@@ -191 +216 @@
         try {
             Collection<Way> waysToCheck = new ArrayList<>(ds.getWays());
-            if (isReadFull() || primitiveType == OsmPrimitiveType.NODE) {
+            if (isReadFull() || (primitiveType == OsmPrimitiveType.NODE && !isAllowIncompleteParentWays())) {
                 for (Way way: waysToCheck) {
                     if (!way.isNew() && way.hasIncompleteNodes()) {

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -242 +242 @@
         assertNotNull(w);
 
-        OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(n);
-        reader.setReadFull(false);
-        DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
+        DataSet referers = new OsmServerBackreferenceReader(n).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE);
         printNumberOfPrimitives(referers);
 
@@ -298 +296 @@
         assertNotNull(n);
 
-        OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(n);
-        reader.setReadFull(true);
-        DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
+        DataSet referers = new OsmServerBackreferenceReader(n).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE);
         printNumberOfPrimitives(referers);
 
@@ -349 +345 @@
         //
 
-        OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(w);
-        reader.setReadFull(false);
-        DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
+        DataSet referers = new OsmServerBackreferenceReader(w).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE);
         printNumberOfPrimitives(referers);
 
@@ -394 +388 @@
         //
 
-        OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(w);
-        reader.setReadFull(true);
-        DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
+        DataSet referers = new OsmServerBackreferenceReader(w).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE);
         assertEquals(6, referers.getWays().size());  // 6 ways referred by two relations
         for (Way w1 : referers.getWays()) {
@@ -434 +426 @@
         //
 
-        OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(r);
-        reader.setReadFull(false);
-        DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
+        DataSet referers = new OsmServerBackreferenceReader(r).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE);
         printNumberOfPrimitives(referers);
 
@@ -554 +544 @@
         //
 
-        OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(r);
-        reader.setReadFull(true);
-        DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
+        DataSet referers = new OsmServerBackreferenceReader(r).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE);
 
         r = lookupRelation(referers, 6);