write out number of tags before writing the tags. #4

conveyal · Apr 19, 2015 · 327b5c2 · 327b5c2
1 parent a5f6dbe
commit 327b5c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/com/conveyal/osmlib/OSM.java b/src/main/java/com/conveyal/osmlib/OSM.java
@@ -66,11 +66,14 @@ public OSM (String diskPath) {
         }
 
         // Compression has no appreciable effect on speed but reduces file size by about 16 percent.
-
+        // Hash table cache (eviction by collision) is on by default with a size of 32k records.
+        // http://www.mapdb.org/doc/caches.html
+        // Our objects do not have semantic hash and equals functions, but I suppose it's the table keys that are hashed
+        // not the values.
         db = dbMaker.asyncWriteEnable()
                 .transactionDisable()
+                //.cacheDisable()
                 .compressionEnable()
-                .cacheSize(50 * 1024 * 1024)
                 .mmapFileEnableIfSupported()
                 .closeOnJvmShutdown()
                 .make();

diff --git a/src/main/java/com/conveyal/osmlib/serializer/VarInt.java b/src/main/java/com/conveyal/osmlib/serializer/VarInt.java
@@ -228,6 +228,7 @@ public static void writeTags(DataOutput out, OSMEntity tagged) throws IOExceptio
             writeRawVarint32(out, 0);
             return;
         }
+        writeRawVarint32(out, tagged.tags.size());
         for (OSMEntity.Tag tag : tagged.tags) {
             writeString(out, tag.key);
             writeString(out, tag.value);