MVStore bugfixes

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

@@ -549,17 +549,6 @@ public class MVStore {
                 // remove this chunk in the next save operation
                 registerFreePage(currentVersion, c.id, 0, 0);
             }
-            
-
-            if (c.id > lastChunkId) {
-                System.out.println("strange!");
-            }
-            lastChunkId = Math.max(c.id, lastChunkId);
-            if (c.start == Long.MAX_VALUE) {
-            ;;
-                System.out.println("??");
-                continue;
-            }
             int len = MathUtils.roundUpInt(c.length, BLOCK_SIZE) + BLOCK_SIZE;
             fileStore.markUsed(c.start, len);
         }
@@ -1221,6 +1210,11 @@ public class MVStore {
         // now re-use the empty space
         reuseSpace = true;
         for (Chunk c : move) {
+            if (!chunks.containsKey(c.id)) {
+                // already removed during the 
+                // previous store operation
+                continue;
+            }
             ByteBuffer buff = getWriteBuffer();
             int length = MathUtils.roundUpInt(c.length, BLOCK_SIZE) + BLOCK_SIZE;
             buff = DataUtils.ensureCapacity(buff, length);

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

@@ -698,7 +698,7 @@ public class Page {
         if (pageLength > maxLength) {
             throw DataUtils.newIllegalStateException(
                     DataUtils.ERROR_FILE_CORRUPT,
-                    "File corrupted, expected length =< {0}, got {1}",
+                    "File corrupted, expected page length =< {0}, got {1}",
                     maxLength, pageLength);
         }
         short check = buff.getShort();

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

@@ -198,5 +198,4 @@ public class TestRandomMapOps extends TestBase {
         // System.out.println(msg + "; // op " + op);
     }
 
-
 }