Remove MultiVersionIndex (PageStore+MVCC)

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

-/*
- * Copyright 2004-2018 H2 Group. Multiple-Licensed under the MPL 2.0,
- * and the EPL 1.0 (http://h2database.com/html/license.html).
- * Initial Developer: H2 Group
- */
-package org.h2.index;
-
-import org.h2.engine.Session;
-import org.h2.engine.SysProperties;
-import org.h2.message.DbException;
-import org.h2.result.Row;
-import org.h2.result.SearchRow;
-
-/**
- * The cursor implementation for the multi-version index.
- */
-public class MultiVersionCursor implements Cursor {
-
-    private final MultiVersionIndex index;
-    private final Session session;
-    private final Cursor baseCursor, deltaCursor;
-    private final Object sync;
-    private SearchRow baseRow;
-    private Row deltaRow;
-    private boolean onBase;
-    private boolean end;
-    private boolean needNewDelta, needNewBase;
-    private boolean reverse;
-
-    MultiVersionCursor(Session session, MultiVersionIndex index, Cursor base,
-            Cursor delta, Object sync) {
-        this.session = session;
-        this.index = index;
-        this.baseCursor = base;
-        this.deltaCursor = delta;
-        this.sync = sync;
-        needNewDelta = true;
-        needNewBase = true;
-    }
-
-    /**
-     * Load the current row.
-     */
-    void loadCurrent() {
-        synchronized (sync) {
-            baseRow = baseCursor.getSearchRow();
-            deltaRow = deltaCursor.get();
-            needNewDelta = false;
-            needNewBase = false;
-        }
-    }
-
-    private void loadNext(boolean base) {
-        synchronized (sync) {
-            if (base) {
-                if (step(baseCursor)) {
-                    baseRow = baseCursor.getSearchRow();
-                } else {
-                    baseRow = null;
-                }
-            } else {
-                if (step(deltaCursor)) {
-                    deltaRow = deltaCursor.get();
-                } else {
-                    deltaRow = null;
-                }
-            }
-        }
-    }
-
-    private boolean step(Cursor cursor) {
-        return reverse ? cursor.previous() : cursor.next();
-    }
-
-    @Override
-    public Row get() {
-        synchronized (sync) {
-            if (end) {
-                return null;
-            }
-            return onBase ? baseCursor.get() : deltaCursor.get();
-        }
-    }
-
-    @Override
-    public SearchRow getSearchRow() {
-        synchronized (sync) {
-            if (end) {
-                return null;
-            }
-            return onBase ? baseCursor.getSearchRow() : deltaCursor.getSearchRow();
-        }
-    }
-
-    @Override
-    public boolean next() {
-        synchronized (sync) {
-            if (SysProperties.CHECK && end) {
-                DbException.throwInternalError();
-            }
-            while (true) {
-                if (needNewDelta) {
-                    loadNext(false);
-                    needNewDelta = false;
-                }
-                if (needNewBase) {
-                    loadNext(true);
-                    needNewBase = false;
-                }
-                if (deltaRow == null) {
-                    if (baseRow == null) {
-                        end = true;
-                        return false;
-                    }
-                    onBase = true;
-                    needNewBase = true;
-                    return true;
-                }
-                int sessionId = deltaRow.getSessionId();
-                boolean isThisSession = sessionId == session.getId();
-                boolean isDeleted = deltaRow.isDeleted();
-                if (isThisSession && isDeleted) {
-                    needNewDelta = true;
-                    continue;
-                }
-                if (baseRow == null) {
-                    if (isDeleted) {
-                        if (isThisSession) {
-                            end = true;
-                            return false;
-                        }
-                        // the row was deleted by another session: return it
-                        onBase = false;
-                        needNewDelta = true;
-                        return true;
-                    }
-                    DbException.throwInternalError();
-                }
-                int compare = index.compareRows(deltaRow, baseRow);
-                if (compare == 0) {
-                    // can't use compareKeys because the
-                    // version would be compared as well
-                    long k1 = deltaRow.getKey();
-                    long k2 = baseRow.getKey();
-                    compare = Long.compare(k1, k2);
-                }
-                if (compare == 0) {
-                    if (isDeleted) {
-                        if (isThisSession) {
-                            DbException.throwInternalError();
-                        }
-                        // another session updated the row
-                    } else {
-                        if (isThisSession) {
-                            onBase = false;
-                            needNewBase = true;
-                            needNewDelta = true;
-                            return true;
-                        }
-                        // another session inserted the row: ignore
-                        needNewBase = true;
-                        needNewDelta = true;
-                        continue;
-                    }
-                }
-                if (compare > 0) {
-                    onBase = true;
-                    needNewBase = true;
-                    return true;
-                }
-                onBase = false;
-                needNewDelta = true;
-                return true;
-            }
-        }
-    }
-
-    @Override
-    public boolean previous() {
-        reverse = true;
-        try {
-            return next();
-        } finally {
-            reverse = false;
-        }
-    }
-
-}

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

@@ -24,7 +24,6 @@ import org.h2.engine.SysProperties;
 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;
@@ -1731,13 +1730,7 @@ public class PageStore implements CacheWriter {
             }
             meta = table.addIndex(session, "I" + id, id, cols, indexType, false, null);
         }
-        PageIndex index;
-        if (meta instanceof MultiVersionIndex) {
-            index = (PageIndex) ((MultiVersionIndex) meta).getBaseIndex();
-        } else {
-            index = (PageIndex) meta;
-        }
-        metaObjects.put(id, index);
+        metaObjects.put(id, (PageIndex) meta);
     }
 
     /**

h2/src/main/org/h2/table/MetaTable.java

@@ -42,7 +42,6 @@ import org.h2.expression.ValueExpression;
 import org.h2.index.Index;
 import org.h2.index.IndexType;
 import org.h2.index.MetaIndex;
-import org.h2.index.MultiVersionIndex;
 import org.h2.jdbc.JdbcSQLException;
 import org.h2.message.DbException;
 import org.h2.mvstore.FileStore;
@@ -935,13 +934,7 @@ public class MetaTable extends Table {
                         }
                     }
                     IndexColumn[] cols = index.getIndexColumns();
-                    String indexClass;
-                    if (index instanceof MultiVersionIndex) {
-                        indexClass = ((MultiVersionIndex) index).
-                                getBaseIndex().getClass().getName();
-                    } else {
-                        indexClass = index.getClass().getName();
-                    }
+                    String indexClass = index.getClass().getName();
                     for (int k = 0; k < cols.length; k++) {
                         IndexColumn idxCol = cols[k];
                         Column column = idxCol.column;

h2/src/main/org/h2/table/RegularTable.java

@@ -26,7 +26,6 @@ import org.h2.index.Cursor;
 import org.h2.index.HashIndex;
 import org.h2.index.Index;
 import org.h2.index.IndexType;
-import org.h2.index.MultiVersionIndex;
 import org.h2.index.NonUniqueHashIndex;
 import org.h2.index.PageBtreeIndex;
 import org.h2.index.PageDataIndex;
@@ -141,19 +140,7 @@ public class RegularTable extends TableBase {
                 trace.error(e2, "could not undo operation");
                 throw e2;
             }
-            DbException de = DbException.convert(e);
-            if (de.getErrorCode() == ErrorCode.DUPLICATE_KEY_1) {
-                for (Index index : indexes) {
-                    if (index.getIndexType().isUnique() && index instanceof MultiVersionIndex) {
-                        MultiVersionIndex mv = (MultiVersionIndex) index;
-                        if (mv.isUncommittedFromOtherSession(session, row)) {
-                            throw DbException.get(
-                                    ErrorCode.CONCURRENT_UPDATE_1, index.getName());
-                        }
-                    }
-                }
-            }
-            throw de;
+            throw DbException.convert(e);
         }
         analyzeIfRequired(session);
     }
@@ -259,9 +246,6 @@ public class RegularTable extends TableBase {
                 index = new TreeIndex(this, indexId, indexName, cols, indexType);
             }
         }
-        if (database.isMVStore()) {
-            index = new MultiVersionIndex(index, this);
-        }
         if (index.needRebuild() && rowCount > 0) {
             try {
                 Index scan = getScanIndex(session);