reduce memory usage of import a bit when turn costs are enabled and a…

…llow one worker thread only for #916

core/src/main/java/com/graphhopper/GraphHopper.java

@@ -107,7 +107,7 @@ public class GraphHopper implements GraphHopperAPI {
     // for data reader
     private String dataReaderFile;
     private double dataReaderWayPointMaxDistance = 1;
-    private int dataReaderWorkerThreads = -1;
+    private int dataReaderWorkerThreads = 2;
     private boolean calcPoints = true;
     private ElevationProvider eleProvider = ElevationProvider.NOOP;
     private FlagEncoderFactory flagEncoderFactory = FlagEncoderFactory.DEFAULT;

core/src/main/java/com/graphhopper/reader/ReaderElement.java

@@ -37,11 +37,16 @@ public abstract class ReaderElement {
     public static final int FILEHEADER = 3;
     private final int type;
     private final long id;
-    private final Map<String, Object> properties = new HashMap<String, Object>(5);
+    private final Map<String, Object> properties;
 
     protected ReaderElement(long id, int type) {
+        this(id, type, 4);
+    }
+
+    protected ReaderElement(long id, int type, int propertyMapSize) {
         this.id = id;
         this.type = type;
+        properties = new HashMap<>(propertyMapSize);
     }
 
     public long getId() {

core/src/main/java/com/graphhopper/reader/ReaderRelation.java

@@ -18,6 +18,7 @@
 package com.graphhopper.reader;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -27,54 +28,37 @@
  * @author Nop
  */
 public class ReaderRelation extends ReaderElement {
-    protected final List<Member> members = new ArrayList<Member>(5);
+    protected List<Member> members;
 
     public ReaderRelation(long id) {
-        super(id, RELATION);
+        super(id, RELATION, 2);
     }
 
     @Override
     public String toString() {
-        return "Relation (" + getId() + ", " + members.size() + " members)";
+        return "Relation (" + getId() + ", " + ((members == null) ? 0 : members.size()) + " members)";
     }
 
     public List<Member> getMembers() {
+        if (members == null)
+            return Collections.emptyList();
+
         return members;
     }
 
     public boolean isMetaRelation() {
-        for (Member member : members) {
-            if (member.getType() == RELATION) {
-                return true;
+        if (members != null)
+            for (Member member : members) {
+                if (member.getType() == RELATION) {
+                    return true;
+                }
             }
-        }
         return false;
     }
 
-    public boolean isMixedRelation() {
-        boolean hasRel = false;
-        boolean hasOther = false;
-
-        for (Member member : members) {
-            if (member.getType() == RELATION)
-                hasRel = true;
-            else
-                hasOther = true;
-
-            if (hasRel && hasOther)
-                return true;
-        }
-        return false;
-    }
-
-    public void removeRelations() {
-        for (int i = members.size() - 1; i >= 0; i--) {
-            if (members.get(i).getType() == RELATION)
-                members.remove(i);
-        }
-    }
-
     public void add(Member member) {
+        if (members == null)
+            members = new ArrayList<>(3);
         members.add(member);
     }
 
@@ -89,12 +73,6 @@ public static class Member {
         private final long ref;
         private final String role;
 
-        public Member(Member input) {
-            type = input.type;
-            ref = input.ref;
-            role = input.role;
-        }
-
         public Member(int type, long ref, String role) {
             this.type = type;
             this.ref = ref;

core/src/main/java/com/graphhopper/search/NameIndex.java

@@ -43,8 +43,8 @@ public NameIndex(Directory dir) {
     }
 
     @Override
-    public NameIndex create(long cap) {
-        names.create(cap);
+    public NameIndex create(long initBytes) {
+        names.create(initBytes);
         return this;
     }
 

core/src/main/java/com/graphhopper/storage/BaseGraph.java

@@ -29,6 +29,7 @@
 import com.graphhopper.util.shapes.BBox;
 
 import static com.graphhopper.util.Helper.nf;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -355,8 +356,10 @@ public void checkFreeze() {
     void create(long initSize) {
         nodes.create(initSize);
         edges.create(initSize);
+
+        initSize = Math.min(initSize, 2000);
         wayGeometry.create(initSize);
-        nameIndex.create(1000);
+        nameIndex.create(initSize);
         extStorage.create(initSize);
         initStorage();
         // 0 stands for no separate geoRef

core/src/main/java/com/graphhopper/storage/TurnCostExtension.java

@@ -75,7 +75,7 @@ public void setSegmentSize(int bytes) {
 
     @Override
     public TurnCostExtension create(long initBytes) {
-        turnCosts.create((long) initBytes * turnCostsEntryBytes);
+        turnCosts.create(initBytes);
         return this;
     }
 

reader-osm/src/main/java/com/graphhopper/reader/osm/OSMInputFile.java

@@ -236,7 +236,7 @@ public void close() throws IOException {
     private void openPBFReader(InputStream stream) {
         hasIncomingData = true;
         if (workerThreads <= 0)
-            workerThreads = 2;
+            workerThreads = 1;
 
         PbfReader reader = new PbfReader(stream, this, workerThreads);
         pbfReaderThread = new Thread(reader, "PBF Reader");

reader-osm/src/main/java/com/graphhopper/reader/osm/OSMReader.java

@@ -559,9 +559,7 @@ void prepareWaysWithRelationInfo(ReaderRelation osmRelation) {
         if (encodingManager.handleRelationTags(osmRelation, 0) == 0)
             return;
 
-        int size = osmRelation.getMembers().size();
-        for (int index = 0; index < size; index++) {
-            ReaderRelation.Member member = osmRelation.getMembers().get(index);
+        for (ReaderRelation.Member member : osmRelation.getMembers()) {
             if (member.getType() != ReaderRelation.Member.WAY)
                 continue;
 

reader-osm/src/main/java/com/graphhopper/reader/osm/OSMXMLHelper.java

@@ -85,17 +85,17 @@ public static ReaderRelation createRelation(long id, XMLStreamReader parser) thr
         ReaderRelation rel = new ReaderRelation(id);
 
         parser.nextTag();
-        readMembers(rel.getMembers(), parser);
+        readMembers(rel, parser);
         readTags(rel, parser);
         return rel;
     }
 
-    private static void readMembers(List<Member> members, XMLStreamReader parser) throws XMLStreamException {
+    private static void readMembers(ReaderRelation rel, XMLStreamReader parser) throws XMLStreamException {
         int event = parser.getEventType();
         while (event != XMLStreamConstants.END_DOCUMENT && parser.getLocalName().equalsIgnoreCase("member")) {
             if (event == XMLStreamConstants.START_ELEMENT) {
                 // read member
-                members.add(createMember(parser));
+                rel.add(createMember(parser));
             }
 
             event = parser.nextTag();

reader-osm/src/main/java/com/graphhopper/reader/osm/pbf/PbfBlobDecoder.java

@@ -267,8 +267,6 @@ private void buildRelationMembers(ReaderRelation relation,
                                       List<Long> memberIds, List<Integer> memberRoles, List<Osmformat.Relation.MemberType> memberTypes,
                                       PbfFieldDecoder fieldDecoder) {
 
-        List<ReaderRelation.Member> members = relation.getMembers();
-
         // Ensure parallel lists are of equal size.
         if (checkData) {
             if ((memberIds.size() != memberRoles.size()) || (memberIds.size() != memberTypes.size())) {
@@ -302,8 +300,7 @@ private void buildRelationMembers(ReaderRelation relation,
             }
 
             ReaderRelation.Member member = new ReaderRelation.Member(entityType, refId, fieldDecoder.decodeString(memberRoleIterator.next()));
-
-            members.add(member);
+            relation.add(member);
         }
     }
 

reader-osm/src/main/java/com/graphhopper/reader/osm/pbf/PbfDecoder.java

@@ -3,6 +3,7 @@
 
 import com.graphhopper.reader.ReaderElement;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
@@ -25,7 +26,7 @@ public class PbfDecoder implements Runnable {
     private final Sink sink;
     private final Lock lock;
     private final Condition dataWaitCondition;
-    private final Queue<PbfBlobResult> blobResults;
+    private final List<PbfBlobResult> blobResults;
 
     /**
      * Creates a new instance.
@@ -48,7 +49,7 @@ public PbfDecoder(PbfStreamSplitter streamSplitter, ExecutorService executorServ
         dataWaitCondition = lock.newCondition();
 
         // Create the queue of blobs being decoded.
-        blobResults = new LinkedList<PbfBlobResult>();
+        blobResults = new ArrayList<>();
     }
 
     /**
@@ -74,7 +75,7 @@ private void signalUpdate() {
     private void sendResultsToSink(int targetQueueSize) {
         while (blobResults.size() > targetQueueSize) {
             // Get the next result from the queue and wait for it to complete.
-            PbfBlobResult blobResult = blobResults.remove();
+            PbfBlobResult blobResult = blobResults.remove(blobResults.size() - 1);
             while (!blobResult.isComplete()) {
                 // The thread hasn't finished processing yet so wait for an
                 // update from another thread before checking again.