Merge pull request #1717 from h2database/issue-1592_invalid_tree

Backward compatibility patch for #1952

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

@@ -154,7 +154,6 @@ public class Cursor<K, V> implements Iterator<K> {
     private static CursorPos traverseDown(Page p, Object key) {
         CursorPos cursorPos = null;
         while (!p.isLeaf()) {
-            assert p.getKeyCount() > 0;
             int index = 0;
             if(key != null) {
                 index = p.binarySearch(key) + 1;

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

@@ -294,7 +294,7 @@ public class MVMap<K, V> extends AbstractMap<K, V>
     @SuppressWarnings("unchecked")
     private K getFirstLast(boolean first) {
         Page p = getRootPage();
-        if (p.getKeyCount() == 0) {
+        if (p.getTotalCount() == 0) {
             return null;
         }
         while (true) {
@@ -1305,10 +1305,15 @@ public class MVMap<K, V> extends AbstractMap<K, V>
     private static Page replacePage(CursorPos path, Page replacement, IntValueHolder unsavedMemoryHolder) {
         int unsavedMemory = replacement.getMemory();
         while (path != null) {
+            Page parent = path.page;
+            // condition below sould always be true, but older versions (up to 1.4.197)
+            // may create single-childed (with no keys) internal nodes, which we skip here
+            if (parent.getKeyCount() > 0) {
                 Page child = replacement;
-            replacement = path.page.copy();
+                replacement = parent.copy();
                 replacement.setChild(path.index, child);
                 unsavedMemory += replacement.getMemory();
+            }
             path = path.parent;
         }
         unsavedMemoryHolder.value += unsavedMemory;
@@ -1706,15 +1711,27 @@ public class MVMap<K, V> extends AbstractMap<K, V>
                         }
 
                         if (p.getTotalCount() == 1 && pos != null) {
+                            int keyCount;
+                            do {
                                 p = pos.page;
                                 index = pos.index;
                                 pos = pos.parent;
-                            if (p.getKeyCount() == 1) {
+                                keyCount = p.getKeyCount();
+                                // condition below sould always be false, but older versions (up to 1.4.197)
+                                // may create single-childed (with no keys) internal nodes, which we skip here
+                            } while (keyCount == 0 && pos != null);
+
+                            if (keyCount <= 1) {
+                                if (keyCount == 1) {
                                     assert index <= 1;
                                     p = p.getChildPage(1 - index);
+                                } else {
+                                    // if root happens to be such single-childed (with no keys) internal node,
+                                    // then just replace it with empty leaf
+                                    p = Page.createEmptyLeaf(this);
+                                }
                                 break;
                             }
-                            assert p.getKeyCount() > 1;
                         }
                         p = p.copy();
                         p.remove(index);
@@ -1864,7 +1881,6 @@ public class MVMap<K, V> extends AbstractMap<K, V>
     private static CursorPos traverseDown(Page p, Object key) {
         CursorPos pos = null;
         while (!p.isLeaf()) {
-            assert p.getKeyCount() > 0;
             int index = p.binarySearch(key) + 1;
             if (index < 0) {
                 index = -index;