Fix bookkeeping of live pages

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

@@ -154,6 +154,11 @@ public class Chunk {
         while (buff.position() - pos < minLength - 1) {
             buff.put((byte) ' ');
         }
+        if (minLength != 0 && buff.position() > minLength) {
+            throw DataUtils.newIllegalStateException(
+                    DataUtils.ERROR_INTERNAL, 
+                    "Chunk metadata too long");
+        }
         buff.put((byte) '\n');
     }
 

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

@@ -1844,7 +1844,8 @@ public class MVStore {
                 version = currentStoreVersion;
             }
         }
-        registerFreePage(version, c.id, DataUtils.getPageMaxLength(pos), 1);
+        registerFreePage(version, c.id,
+                DataUtils.getPageMaxLength(pos), 1);
     }
 
     private void registerFreePage(long version, int chunkId,

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

@@ -918,12 +918,14 @@ public class Page {
         store.cachePage(pos, this, getMemory());
         long max = DataUtils.getPageMaxLength(pos);
         chunk.maxLen += max;
-        chunk.pageCount++;
-        if (!removedInMemory) {
-            // if the page was removed _before_ the position was assigned, we
-            // must not increase the live fields.
         chunk.maxLenLive += max;
+        chunk.pageCount++;
         chunk.pageCountLive++;
+        if (removedInMemory) {
+            // if the page was removed _before_ the position was assigned, we
+            // need to mark it removed here, so the fields are updated
+            // when the next chunk is stored
+            map.removePage(pos, memory);
         }
         return typePos + 1;
     }

h2/src/main/org/h2/mvstore/db/MVTableEngine.java

@@ -342,14 +342,18 @@ public class MVTableEngine implements TableEngine {
                     }
                     String fileName = store.getFileStore().getFileName();
                     store.close();
-                    if (compactFully) {
+                    if (compactFully && FileUtils.exists(fileName)) {
+                        // the file could have been deleted concurrently,
+                        // so only compact if the file still exists
                         MVStoreTool.compact(fileName, true);
                     }
                 }
             } catch (IllegalStateException e) {
-                if (DataUtils.getErrorCode(e.getMessage()) ==
-                        DataUtils.ERROR_WRITING_FAILED) {
+                int errorCode = DataUtils.getErrorCode(e.getMessage());
+                if (errorCode == DataUtils.ERROR_WRITING_FAILED) {
                     // disk full - ok
+                } else if (errorCode == DataUtils.ERROR_FILE_CORRUPT) {
+                    // wrong encryption key - ok
                 } else {
   // TODO                    
   ;

h2/src/test/org/h2/test/db/TestBackup.java

@@ -85,9 +85,8 @@ public class TestBackup extends TestBase {
             updateEnd.set(System.currentTimeMillis() + 2000);
             stat2.execute("backup to '"+getBaseDir()+"/backup.zip'");
             stat2.execute("checkpoint");
-            Restore.execute(getBaseDir() + "/backup.zip", getBaseDir() + "/t2", "backup");
-            Connection conn3;
-            conn3 = getConnection("t2/backup");
+            Restore.execute(getBaseDir() + "/backup.zip", getBaseDir() + "/t" + i, "backup");
+            Connection conn3 = getConnection("t" + i + "/backup");
             Statement stat3 = conn3.createStatement();
             stat3.execute("script");
             ResultSet rs = stat3.executeQuery(
@@ -98,9 +97,9 @@ public class TestBackup extends TestBase {
             conn3.close();
         }
         task.get();
+        conn2.close();
         conn.close();
         conn1.close();
-        conn2.close();
     }
 
     /**

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

@@ -52,6 +52,7 @@ public class TestMVStore extends TestBase {
     public void test() throws Exception {
         FileUtils.deleteRecursive(getBaseDir(), true);
         FileUtils.createDirectories(getBaseDir());
+        testRemoveMapRollback();
         testProvidedFileStoreNotOpenedAndClosed();
         testVolatileMap();
         testEntrySet();
@@ -112,6 +113,37 @@ public class TestMVStore extends TestBase {
         testLargerThan2G();
     }
 
+    private void testRemoveMapRollback() {
+        MVStore store = new MVStore.Builder().
+                open();
+        MVMap<String, String> map = store.openMap("test");
+        map.put("1", "Hello");
+        store.commit();
+        store.removeMap(map);
+        store.rollback();
+        assertTrue(store.hasMap("test"));
+        map = store.openMap("test");
+        // TODO the data should get back alive
+        assertNull(map.get("1"));
+        store.close();
+
+        String fileName = getBaseDir() + "/testRemoveMapRollback.h3";
+        store = new MVStore.Builder().
+                autoCommitDisabled().
+                fileName(fileName).
+                open();
+        map = store.openMap("test");
+        map.put("1", "Hello");
+        store.commit();
+        store.removeMap(map);
+        store.rollback();
+        assertTrue(store.hasMap("test"));
+        map = store.openMap("test");
+        // TODO the data should get back alive
+        assertNull(map.get("1"));
+        store.close();
+    }
+
     private void testProvidedFileStoreNotOpenedAndClosed() {
         final AtomicInteger openClose = new AtomicInteger();
         FileStore fileStore = new OffHeapStore() {