Changeset 7501 in josm for trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java

Timestamp:

2014-09-05T14:45:30+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10483 - drastic improvement of data consistency test performance

File:

• trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java (modified) (3 diffs)

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -105 +104 @@
     public void searchNodes() {
         long startTime = System.currentTimeMillis();
-        for (Node n : dataSet.getNodes()) {
-            if (!n.isIncomplete() && !n.isDeleted()) {
-                LatLon c = n.getCoor();
-                if (c != null) {
-                    BBox box = c.toBBox(0.0001);
-                    if (!dataSet.searchNodes(box).contains(n)) {
-                        printError("SEARCH NODES", "%s not found using Dataset.searchNodes()", n);
-                    }
-                }
-            }
+        dataSet.getReadLock().lock();
+        try {
+            for (Node n : dataSet.getNodes()) {
+                // Call isDrawable() as an efficient replacement to previous checks (!deleted, !incomplete, getCoor() != null)
+                if (n.isDrawable() && !dataSet.containsNode(n)) {
+                    printError("SEARCH NODES", "%s not found using Dataset.searchNodes()", n);
+                }
+            }
+        } finally {
+            dataSet.getReadLock().unlock();
         }
         printElapsedTime(startTime);
@@ -124 +123 @@
     public void searchWays() {
         long startTime = System.currentTimeMillis();
-        for (Way w : dataSet.getWays()) {
-            if (!w.isIncomplete() && !w.isDeleted() && w.getNodesCount() >= 2 && !dataSet.searchWays(w.getBBox()).contains(w)) {
-                printError("SEARCH WAYS", "%s not found using Dataset.searchWays()", w);
-            }
+        dataSet.getReadLock().lock();
+        try {
+            for (Way w : dataSet.getWays()) {
+                if (!w.isIncomplete() && !w.isDeleted() && w.getNodesCount() >= 2 && !dataSet.containsWay(w)) {
+                    printError("SEARCH WAYS", "%s not found using Dataset.searchWays()", w);
+                }
+            }
+        } finally {
+            dataSet.getReadLock().unlock();
         }
         printElapsedTime(startTime);