Merge branch 'free_space_bs' into mv_nb

# Conflicts:
#	h2/src/main/org/h2/mvstore/FreeSpaceBitSet.java
#	h2/src/main/org/h2/mvstore/MVStore.java

h2/src/main/org/h2/mvstore/FileStore.java

@@ -54,12 +54,12 @@ public class FileStore {
     /**
      * The file name.
      */
-    protected String fileName;
+    private String fileName;
 
     /**
      * Whether this store is read-only.
      */
-    protected boolean readOnly;
+    private boolean readOnly;
 
     /**
      * The file size (cached).
@@ -69,7 +69,7 @@ public class FileStore {
     /**
      * The file.
      */
-    protected FileChannel file;
+    private FileChannel file;
 
     /**
      * The encrypted file (if encryption is used).

h2/src/main/org/h2/mvstore/FreeSpaceBitSet.java

@@ -113,6 +113,8 @@ public class FreeSpaceBitSet {
             int start = set.nextClearBit(i);
             int end = set.nextSetBit(start + 1);
             if (end < 0 || end - start >= blocks) {
+                assert set.nextSetBit(start) == -1 || set.nextSetBit(start) >= start + blocks :
+                        "Double alloc: " + Integer.toHexString(start) + "/" + Integer.toHexString(blocks) + " " + this;
                 if (allocate) {
                     set.set(start, start + blocks);
                 }
@@ -132,7 +134,7 @@ public class FreeSpaceBitSet {
         int start = getBlock(pos);
         int blocks = getBlockCount(length);
         assert set.nextSetBit(start) == -1 || set.nextSetBit(start) >= start + blocks :
-                                                start + "/" + blocks + " " + this;
+                "Double mark: " + Integer.toHexString(start) + "/" + Integer.toHexString(blocks) + " " + this;
         set.set(start, start + blocks);
     }
 
@@ -145,7 +147,8 @@ public class FreeSpaceBitSet {
     public void free(long pos, int length) {
         int start = getBlock(pos);
         int blocks = getBlockCount(length);
-        assert set.nextClearBit(start) >= start + blocks : start + "/" + blocks + " " + this;
+        assert set.nextClearBit(start) >= start + blocks :
+                "Double free: " + Integer.toHexString(start) + "/" + Integer.toHexString(blocks) + " " + this;
         set.clear(start, start + blocks);
     }
 

h2/src/main/org/h2/mvstore/MVStore.java

@@ -738,6 +738,8 @@ public final class MVStore {
         if (lastStoredVersion == INITIAL_VERSION) {
             lastStoredVersion = currentVersion - 1;
         }
+        assert fileStore.getFileLengthInUse() == measureFileLengthInUse() :
+                fileStore.getFileLengthInUse() + " != " + measureFileLengthInUse();
     }
 
     private void loadChunkMeta() {