Compaction bugfix

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

@@ -1224,7 +1224,7 @@ public class MVMap<K, V> extends AbstractMap<K, V>
 
     private Page copy(Page source, CursorPos parent) {
         Page target = Page.create(this, writeVersion, source);
-        if (target.isLeaf()) {
+        if (source.isLeaf()) {
             Page child = target;
             for (CursorPos p = parent; p != null; p = p.parent) {
                 p.page.setChild(p.index, child);
@@ -1236,6 +1236,11 @@ public class MVMap<K, V> extends AbstractMap<K, V>
                 }
             }
         } else {
+            // temporarily, replace child pages with empty pages,
+            // to ensure there are no links to the old store
+            for (int i = 0; i < getChildPageCount(target); i++) {
+                target.setChild(i, null);
+            }
             CursorPos pos = new CursorPos(target, 0, parent);
             for (int i = 0; i < getChildPageCount(target); i++) {
                 pos.index = i;

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

@@ -467,7 +467,14 @@ public class Page {
      * @param c the new child page
      */
     public void setChild(int index, Page c) {
-        if (c != children[index].page || c.getPos() != children[index].pos) {
+        if (c == null) {
+            long oldCount = children[index].count;
+            children = Arrays.copyOf(children, children.length);
+            PageReference ref = new PageReference(null, 0, 0);
+            children[index] = ref;
+            totalCount -= oldCount;
+        } else if (c != children[index].page ||
+                c.getPos() != children[index].pos) {
             long oldCount = children[index].count;
             children = Arrays.copyOf(children, children.length);
             PageReference ref = new PageReference(c, c.pos, c.totalCount);