lazy creation of ch+base IntsRefs for CH

graphhopper · Feb 7, 2019 · c47493c · c47493c
1 parent 6eeb221
commit c47493c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/core/src/main/java/com/graphhopper/storage/BaseGraph.java b/core/src/main/java/com/graphhopper/storage/BaseGraph.java
@@ -55,7 +55,7 @@ class BaseGraph implements Graph {
     final BitUtil bitUtil;
     final EncodingManager encodingManager;
     final EdgeAccess edgeAccess;
-    private final int bytesForFlags;
+    final int bytesForFlags;
     // length | nodeA | nextNode | ... | nodeB
     // as we use integer index in 'egdes' area => 'geometry' area is limited to 4GB (we use pos&neg values!)
     private final DataAccess wayGeometry;
@@ -102,7 +102,7 @@ public BaseGraph(Directory dir, final EncodingManager encodingManager, boolean w
         this.edgeAccess = new EdgeAccess(edges, bitUtil) {
             @Override
             final EdgeIterable createSingleEdge(EdgeFilter filter) {
-                return new EdgeIterable(BaseGraph.this, this, filter);
+                return new EdgeIterable(BaseGraph.this, this, filter, true);
             }
 
             @Override
@@ -507,7 +507,7 @@ public EdgeIteratorState edge(int nodeA, int nodeB) {
 
         ensureNodeIndex(Math.max(nodeA, nodeB));
         int edgeId = edgeAccess.internalEdgeAdd(nextEdgeId(), nodeA, nodeB);
-        EdgeIterable iter = new EdgeIterable(this, edgeAccess, EdgeFilter.ALL_EDGES);
+        EdgeIterable iter = new EdgeIterable(this, edgeAccess, EdgeFilter.ALL_EDGES, true);
         boolean ret = iter.init(edgeId, nodeB);
         assert ret;
         if (extStorage.isRequireEdgeField())
@@ -551,7 +551,7 @@ final void checkAdjNodeBounds(int adjNode) {
 
     @Override
     public EdgeExplorer createEdgeExplorer(EdgeFilter filter) {
-        return new EdgeIterable(this, edgeAccess, filter);
+        return new EdgeIterable(this, edgeAccess, filter, true);
     }
 
     @Override
@@ -941,8 +941,8 @@ protected static class EdgeIterable extends CommonEdgeIterator implements EdgeEx
         final EdgeFilter filter;
         int nextEdgeId;
 
-        public EdgeIterable(BaseGraph baseGraph, EdgeAccess edgeAccess, EdgeFilter filter) {
-            super(-1, edgeAccess, baseGraph);
+        public EdgeIterable(BaseGraph baseGraph, EdgeAccess edgeAccess, EdgeFilter filter, boolean createIntsRef) {
+            super(-1, edgeAccess, baseGraph, createIntsRef);
 
             if (filter == null)
                 throw new IllegalArgumentException("Instead null filter use EdgeFilter.ALL_EDGES");
@@ -1049,7 +1049,7 @@ public AllEdgeIterator(BaseGraph baseGraph) {
         }
 
         private AllEdgeIterator(BaseGraph baseGraph, EdgeAccess edgeAccess) {
-            super(-1, edgeAccess, baseGraph);
+            super(-1, edgeAccess, baseGraph, true);
         }
 
         @Override
@@ -1115,14 +1115,15 @@ static abstract class CommonEdgeIterator implements EdgeIteratorState {
         boolean reverse = false;
         boolean freshFlags;
         int edgeId = -1;
-        final IntsRef baseIntsRef;
+        IntsRef baseIntsRef;
         IntsRef cachedIntsRef;
 
-        public CommonEdgeIterator(long edgePointer, EdgeAccess edgeAccess, BaseGraph baseGraph) {
+        public CommonEdgeIterator(long edgePointer, EdgeAccess edgeAccess, BaseGraph baseGraph, boolean createIntsRef) {
             this.edgePointer = edgePointer;
             this.edgeAccess = edgeAccess;
             this.baseGraph = baseGraph;
-            this.cachedIntsRef = this.baseIntsRef = new IntsRef(baseGraph.bytesForFlags / 4);
+            if (createIntsRef)
+                this.cachedIntsRef = this.baseIntsRef = new IntsRef(baseGraph.bytesForFlags / 4);
         }
 
         @Override

diff --git a/core/src/main/java/com/graphhopper/storage/CHGraphImpl.java b/core/src/main/java/com/graphhopper/storage/CHGraphImpl.java
@@ -504,11 +504,13 @@ public int getNumNodes() {
     }
 
     class CHEdgeIteratorImpl extends EdgeIterable implements CHEdgeExplorer, CHEdgeIterator {
-        final IntsRef chIntsRef;
+        IntsRef chIntsRef;
 
+        //        /**
+//         * @param createBaseIntsRef for creating shortcuts or detaching them we do never need the base IntsRef object
+//         */
         public CHEdgeIteratorImpl(BaseGraph baseGraph, EdgeAccess edgeAccess, EdgeFilter filter) {
-            super(baseGraph, edgeAccess, filter);
-            chIntsRef = new IntsRef(shortcutBytesForFlags / 4);
+            super(baseGraph, edgeAccess, filter, false);
         }
 
         @Override
@@ -618,10 +620,16 @@ public final double getWeight() {
         @Override
         protected final void selectEdgeAccess() {
             if (nextEdgeId < baseGraph.edgeCount) {
+                if (baseIntsRef == null)
+                    baseIntsRef = new IntsRef(baseGraph.bytesForFlags / 4);
+
                 // iterate over edges
                 edgeAccess = baseGraph.edgeAccess;
                 cachedIntsRef = baseIntsRef;
             } else {
+                if (chIntsRef == null)
+                    chIntsRef = new IntsRef(shortcutBytesForFlags / 4);
+
                 // ... or shortcuts
                 edgeAccess = chEdgeAccess;
                 cachedIntsRef = chIntsRef;
@@ -687,7 +695,7 @@ protected final boolean checkRange() {
             if (super.checkRange())
                 return true;
 
-            // iterate over shortcuts
+            // now start iterating over shortcuts
             edgeAccess = chEdgeAccess;
             edgeId = 0;
             edgePointer = (long) edgeId * shortcutEntryBytes;

diff --git a/core/src/test/java/com/graphhopper/routing/AbstractRoutingAlgorithmTester.java b/core/src/test/java/com/graphhopper/routing/AbstractRoutingAlgorithmTester.java
@@ -810,7 +810,6 @@ public void test0SpeedButUnblocked_Issue242() {
         edge12.set(carAvSpeedEnc, 0.0).set(carAccessEnc, true).setReverse(carAccessEnc, true);
         edge12.setFlags(edge12.getFlags());
 
-
         RoutingAlgorithm algo = createAlgo(graph);
         try {
             Path p = algo.calcPath(0, 2);