Page store bugfix

h2/src/main/org/h2/index/MultiVersionIndex.java

@@ -317,4 +317,8 @@ public class MultiVersionIndex implements Index {
         return base.getRowCountApproximation();
     }
 
+    public Index getBaseIndex() {
+        return base;
+    }
+
 }

h2/src/main/org/h2/schema/Schema.java

@@ -178,7 +178,7 @@ public class Schema extends DbObjectBase {
         String name = obj.getName();
         HashMap<String, SchemaObject> map = getMap(obj.getType());
         if (SysProperties.CHECK && map.get(name) != null) {
-            Message.throwInternalError("object already exists");
+            Message.throwInternalError("object already exists: " + name);
         }
         map.put(name, obj);
         freeUniqueName(name);

h2/src/main/org/h2/store/PageStore.java

@@ -20,6 +20,7 @@ import org.h2.engine.Session;
 import org.h2.index.Cursor;
 import org.h2.index.Index;
 import org.h2.index.IndexType;
+import org.h2.index.MultiVersionIndex;
 import org.h2.index.PageBtreeIndex;
 import org.h2.index.PageBtreeLeaf;
 import org.h2.index.PageBtreeNode;
@@ -1191,6 +1192,9 @@ public class PageStore implements CacheWriter {
         Index index = metaObjects.get(id);
         int rootPageId = index.getRootPageId();
         index.getTable().removeIndex(index);
+        if (index instanceof MultiVersionIndex) {
+            index = ((MultiVersionIndex) index).getBaseIndex();
+        }
         if (index instanceof PageBtreeIndex) {
             if (index.isTemporary()) {
                 systemSession.removeLocalTempTableIndex(index);

h2/src/test/org/h2/test/synth/TestKillRestartMulti.java

@@ -145,8 +145,8 @@ public class TestKillRestartMulti extends TestBase {
             System.out.println("#Starting...");
             Random random = new Random();
             boolean wasRunning = false;
-            for (int i = 0; i < 3000; i++) {
-                if (i > 1000 && connections.size() > 1 && tables.size() > 1) {
+            for (int i = 0; i < 200; i++) {
+                if (connections.size() > 1 && tables.size() > 1) {
                     System.out.println("#Running connections: " + connections.size() + " tables: " + tables.size());
                     wasRunning = true;
                 }