A persistent tree map (work in progress).

h2/src/test/org/h2/test/TestAll.java

@@ -663,6 +663,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
     private void testUnit() {
         // store
         new TestTreeMapStore().runTest(this);
+        new TestCache().runTest(this);
 
         // unit
         new TestAutoReconnect().runTest(this);

h2/src/test/org/h2/test/store/RowType.java

@@ -108,6 +108,13 @@ public class RowType implements DataType {
         return buff.toString();
     }
 
+    /**
+     * Convert a row type to a row.
+     *
+     * @param t the type string
+     * @param factory the data type factory
+     * @return the row type
+     */
     static RowType fromString(String t, DataTypeFactory factory) {
         if (!t.startsWith("r(") || !t.endsWith(")")) {
             throw new RuntimeException("Unknown type: " + t);

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -705,4 +705,5 @@ clusterable shortcut quota wcslen flyway cacao tea memcpy someone iced
 korea cpp raspberry inttypes korean hmac swprintf ptr agile rawtypes belgium
 jia laurent midori stdc macros clocks xaltjvm teruo dylan debian counted
 serializes semantics advances severe defensive maintaining collision
-authenticating
+authenticating song lir evict edge adjusts recency lirs prune heads sigmetrics
+resident guard hir jiang resistance zhang xiaodong 

h2/src/tools/org/h2/dev/store/btree/BtreeMap.java

@@ -37,6 +37,7 @@ public class BtreeMap<K, V> {
      * @param <K> the key type
      * @param <V> the value type
      * @param store the tree store
+     * @param id the map id
      * @param name the name of the map
      * @param keyClass the key class
      * @param valueClass the value class

h2/src/tools/org/h2/dev/store/btree/DataType.java

@@ -51,7 +51,7 @@ public interface DataType {
      * Write the object.
      *
      * @param buff the target buffer
-     * @param x the value
+     * @param obj the value
      */
     void write(ByteBuffer buff, Object obj);
 

h2/src/tools/org/h2/dev/store/btree/DataUtils.java

@@ -138,6 +138,14 @@ public class DataUtils {
         buff.put((byte) x);
     }
 
+    /**
+     * Copy the elements of an array, with a gap.
+     *
+     * @param src the source array
+     * @param dst the target array
+     * @param oldSize the size of the old array
+     * @param gapIndex the index of the gap
+     */
     static void copyWithGap(Object src, Object dst, int oldSize, int gapIndex) {
         if (gapIndex > 0) {
             System.arraycopy(src, 0, dst, 0, gapIndex);
@@ -147,6 +155,14 @@ public class DataUtils {
         }
     }
 
+    /**
+     * Copy the elements of an array, and remove one element.
+     *
+     * @param src the source array
+     * @param dst the target array
+     * @param oldSize the size of the old array
+     * @param removeIndex the index of the entry to remove
+     */
     static void copyExcept(Object src, Object dst, int oldSize, int removeIndex) {
         if (removeIndex > 0 && oldSize > 0) {
             System.arraycopy(src, 0, dst, 0, removeIndex);

h2/src/tools/org/h2/dev/store/btree/Dump.java

@@ -8,6 +8,7 @@ package org.h2.dev.store.btree;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.io.StringReader;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
@@ -23,6 +24,16 @@ public class Dump {
 
     private static int blockSize = 4 * 1024;
 
+    /**
+     * Runs this tool.
+     * Options are case sensitive. Supported options are:
+     * <table>
+     * <tr><td>[-file]</td>
+     * <td>The database file name</td></tr>
+     * </table>
+     *
+     * @param args the command line arguments
+     */
     public static void main(String... args) {
         String fileName = "test.h3";
         for (int i = 0; i < args.length; i++) {
@@ -30,12 +41,18 @@ public class Dump {
                 fileName = args[++i];
             }
         }
-        dump(fileName);
+        dump(fileName, new PrintWriter(System.out));
     }
 
-    public static void dump(String fileName) {
+    /**
+     * Dump the contents of the file.
+     *
+     * @param fileName the name of the file
+     * @param writer the print writer
+     */
+    public static void dump(String fileName, PrintWriter writer) {
         if (!FileUtils.exists(fileName)) {
-            System.out.println("File not found: " + fileName);
+            writer.println("File not found: " + fileName);
             return;
         }
         FileChannel file = null;
@@ -48,9 +65,9 @@ public class Dump {
             Properties prop = new Properties();
             prop.load(new ByteArrayInputStream(header));
             prop.load(new StringReader(new String(header, "UTF-8")));
-            System.out.println("file " + fileName);
-            System.out.println("    length " + fileLength);
-            System.out.println("    " + prop);
+            writer.println("file " + fileName);
+            writer.println("    length " + fileLength);
+            writer.println("    " + prop);
             ByteBuffer block = ByteBuffer.wrap(new byte[16]);
             for (long pos = 0; pos < fileLength;) {
                 file.position(pos);
@@ -64,7 +81,7 @@ public class Dump {
                 int length = block.getInt();
                 int chunkId = block.getInt();
                 int metaRootOffset = block.getInt();
-                System.out.println("    chunk " + chunkId + " at " + pos +
+                writer.println("    chunk " + chunkId + " at " + pos +
                         " length " + length + " offset " + metaRootOffset);
                 ByteBuffer chunk = ByteBuffer.allocate(length);
                 file.position(pos);
@@ -83,16 +100,16 @@ public class Dump {
                         for (int i = 0; i < count; i++) {
                             children[i] = chunk.getLong();
                         }
-                        System.out.println("        map " + mapId + " at " + p + " node, " + count + " children: " + Arrays.toString(children));
+                        writer.println("        map " + mapId + " at " + p + " node, " + count + " children: " + Arrays.toString(children));
                     } else {
-                        System.out.println("        map " + mapId + " at " + p + " leaf, " + count + " rows");
+                        writer.println("        map " + mapId + " at " + p + " leaf, " + count + " rows");
                     }
                     p += len;
                     length -= len;
                 }
             }
         } catch (IOException e) {
-            System.out.println("ERROR: " + e);
+            writer.println("ERROR: " + e);
         } finally {
             try {
                 file.close();
@@ -100,7 +117,7 @@ public class Dump {
                 // ignore
             }
         }
-        System.out.println();
+        writer.println();
     }
 
 }

h2/src/tools/org/h2/dev/store/btree/Page.java

@@ -482,7 +482,7 @@ public class Page {
         buff.getInt();
         long id = buff.getLong();
         if (id != map.getId()) {
-            throw new RuntimeException("Page map id missmatch, expected " + map.getId() + " got " + id);
+            throw new RuntimeException("Page map id mismatch, expected " + map.getId() + " got " + id);
         }
         boolean node = buff.get() == 1;
         if (node) {
@@ -541,7 +541,6 @@ public class Page {
     /**
      * Get the maximum length in bytes to store temporary records, recursively.
      *
-     * @param pageId the new page id
      * @return the next page id
      */
     int getMaxLengthTempRecursive() {