Remove MVCC setting and use MVCC logic if and only if MVStore is used

h2/src/main/org/h2/api/ErrorCode.java

@@ -1861,7 +1861,7 @@ public class ErrorCode {
      * connections at the same time, or trying to insert two rows with the same
      * key from two connections. Example:
      * <pre>
-     * jdbc:h2:~/test;MVCC=TRUE
+     * jdbc:h2:~/test
      * Session 1:
      * CREATE TABLE TEST(ID INT);
      * INSERT INTO TEST VALUES(1);
@@ -1887,8 +1887,7 @@ public class ErrorCode {
     /**
      * The error with code <code>90133</code> is thrown when
      * trying to change a specific database property while the database is
-     * already open. The MVCC property needs to be set in the first connection
-     * (in the connection opening the database) and can not be changed later on.
+     * already open.
      */
     public static final int CANNOT_CHANGE_SETTING_WHEN_OPEN_1 = 90133;
 

h2/src/main/org/h2/command/Parser.java

@@ -5589,10 +5589,8 @@ public class Parser {
             return new TransactionCommand(session, setting);
         } else if (readIf("MVCC")) {
             readIfEqualOrTo();
-            boolean value = readBooleanSetting();
-            Set command = new Set(session, SetTypes.MVCC);
-            command.setInt(value ? 1 : 0);
-            return command;
+            readBooleanSetting();
+            return new NoOperation(session);
         } else if (readIf("EXCLUSIVE")) {
             readIfEqualOrTo();
             Set command = new Set(session, SetTypes.EXCLUSIVE);

h2/src/main/org/h2/command/dml/Select.java

@@ -1308,7 +1308,7 @@ public class Select extends Query {
     public void setForUpdate(boolean b) {
         this.isForUpdate = b;
         if (session.getDatabase().getSettings().selectForUpdateMvcc &&
-                session.getDatabase().isMultiVersion()) {
+                session.getDatabase().isMVStore()) {
             isForUpdateMvcc = b;
         }
     }

h2/src/main/org/h2/command/dml/Set.java

@@ -354,13 +354,6 @@ public class Set extends Prepared {
             }
             break;
         }
-        case SetTypes.MVCC: {
-            if (database.isMultiVersion() != (getIntValue() == 1)) {
-                throw DbException.get(
-                        ErrorCode.CANNOT_CHANGE_SETTING_WHEN_OPEN_1, "MVCC");
-            }
-            break;
-        }
         case SetTypes.OPTIMIZE_REUSE_RESULTS: {
             session.getUser().checkAdmin();
             database.setOptimizeReuseResults(getIntValue() != 0);

h2/src/main/org/h2/command/dml/SetTypes.java

@@ -162,100 +162,95 @@ public class SetTypes {
      */
     public static final int REFERENTIAL_INTEGRITY = 30;
 
-    /**
-     * The type of a SET MVCC statement.
-     */
-    public static final int MVCC = 31;
-
     /**
      * The type of a SET MAX_OPERATION_MEMORY statement.
      */
-    public static final int MAX_OPERATION_MEMORY = 32;
+    public static final int MAX_OPERATION_MEMORY = 31;
 
     /**
      * The type of a SET EXCLUSIVE statement.
      */
-    public static final int EXCLUSIVE = 33;
+    public static final int EXCLUSIVE = 32;
 
     /**
      * The type of a SET CREATE_BUILD statement.
      */
-    public static final int CREATE_BUILD = 34;
+    public static final int CREATE_BUILD = 33;
 
     /**
      * The type of a SET \@VARIABLE statement.
      */
-    public static final int VARIABLE = 35;
+    public static final int VARIABLE = 34;
 
     /**
      * The type of a SET QUERY_TIMEOUT statement.
      */
-    public static final int QUERY_TIMEOUT = 36;
+    public static final int QUERY_TIMEOUT = 35;
 
     /**
      * The type of a SET REDO_LOG_BINARY statement.
      */
-    public static final int REDO_LOG_BINARY = 37;
+    public static final int REDO_LOG_BINARY = 36;
 
     /**
      * The type of a SET BINARY_COLLATION statement.
      */
-    public static final int BINARY_COLLATION = 38;
+    public static final int BINARY_COLLATION = 37;
 
     /**
      * The type of a SET JAVA_OBJECT_SERIALIZER statement.
      */
-    public static final int JAVA_OBJECT_SERIALIZER = 39;
+    public static final int JAVA_OBJECT_SERIALIZER = 38;
 
     /**
      * The type of a SET RETENTION_TIME statement.
      */
-    public static final int RETENTION_TIME = 40;
+    public static final int RETENTION_TIME = 39;
 
     /**
      * The type of a SET QUERY_STATISTICS statement.
      */
-    public static final int QUERY_STATISTICS = 41;
+    public static final int QUERY_STATISTICS = 40;
 
     /**
      * The type of a SET QUERY_STATISTICS_MAX_ENTRIES statement.
      */
-    public static final int QUERY_STATISTICS_MAX_ENTRIES = 42;
+    public static final int QUERY_STATISTICS_MAX_ENTRIES = 41;
 
     /**
      * The type of a SET ROW_FACTORY statement.
      */
-    public static final int ROW_FACTORY = 43;
+    public static final int ROW_FACTORY = 42;
 
     /**
      * The type of SET BATCH_JOINS statement.
      */
-    public static final int BATCH_JOINS = 44;
+    public static final int BATCH_JOINS = 43;
 
     /**
      * The type of SET FORCE_JOIN_ORDER statement.
      */
-    public static final int FORCE_JOIN_ORDER = 45;
+    public static final int FORCE_JOIN_ORDER = 44;
 
     /**
      * The type of SET LAZY_QUERY_EXECUTION statement.
      */
-    public static final int LAZY_QUERY_EXECUTION = 46;
+    public static final int LAZY_QUERY_EXECUTION = 45;
 
     /**
      * The type of SET BUILTIN_ALIAS_OVERRIDE statement.
      */
-    public static final int BUILTIN_ALIAS_OVERRIDE = 47;
+    public static final int BUILTIN_ALIAS_OVERRIDE = 46;
 
     /**
      * The type of a SET COLUMN_NAME_RULES statement.
      */
-    public static final int COLUMN_NAME_RULES = 48;
+    public static final int COLUMN_NAME_RULES = 47;
 
     /**
      * The type of a SET AUTHENTICATOR statement.
      */
-    public static final int AUTHENTICATOR= 49;
+    public static final int AUTHENTICATOR = 48;
 
     private static final int COUNT = AUTHENTICATOR + 1;
 
@@ -298,7 +293,6 @@ public class SetTypes {
         list.add(SCHEMA_SEARCH_PATH, "SCHEMA_SEARCH_PATH");
         list.add(UNDO_LOG, "UNDO_LOG");
         list.add(REFERENTIAL_INTEGRITY, "REFERENTIAL_INTEGRITY");
-        list.add(MVCC, "MVCC");
         list.add(MAX_OPERATION_MEMORY, "MAX_OPERATION_MEMORY");
         list.add(EXCLUSIVE, "EXCLUSIVE");
         list.add(CREATE_BUILD, "CREATE_BUILD");

h2/src/main/org/h2/engine/ConnectionInfo.java

@@ -92,7 +92,7 @@ public class ConnectionInfo implements Cloneable {
     static {
         String[] connectionTime = { "ACCESS_MODE_DATA", "AUTOCOMMIT", "CIPHER",
                 "CREATE", "CACHE_TYPE", "FILE_LOCK", "IGNORE_UNKNOWN_SETTINGS",
-                "IFEXISTS", "INIT", "PASSWORD", "RECOVER", "RECOVER_TEST",
+                "IFEXISTS", "INIT", "MVCC", "PASSWORD", "RECOVER", "RECOVER_TEST",
                 "USER", "AUTO_SERVER", "AUTO_SERVER_PORT", "NO_UPGRADE",
                 "AUTO_RECONNECT", "OPEN_NEW", "PAGE_SIZE", "PASSWORD_HASH", "JMX",
                 "SCOPE_GENERATED_KEYS", "AUTHREALM", "AUTHZPWD" };

h2/src/main/org/h2/engine/Database.java

@@ -185,8 +185,6 @@ public class Database implements DataHandler {
     private final String cacheType;
     private final String accessModeData;
     private boolean referentialIntegrity = true;
-    /** ie. the MVCC setting */
-    private boolean multiVersion;
     private Mode mode = Mode.getRegular();
     /** ie. the MULTI_THREADED setting */
     private boolean multiThreaded;
@@ -284,8 +282,6 @@ public class Database implements DataHandler {
         if (modeName != null) {
             this.mode = Mode.getInstance(modeName);
         }
-        this.multiVersion =
-                ci.getProperty("MVCC", dbSettings.mvStore);
         this.logMode =
                 ci.getProperty("LOG", PageStore.LOG_MODE_SYNC);
         this.javaObjectSerializerName =
@@ -657,7 +653,6 @@ public class Database implements DataHandler {
                 dbSettings.mvStore = false;
                 // Need to re-init this because the first time we do it we don't
                 // know if we have an mvstore or a pagestore.
-                multiVersion = ci.getProperty("MVCC", false);
                 multiThreaded = ci.getProperty("MULTI_THREADED", false);
             }
             if (readOnly) {
@@ -920,7 +915,7 @@ public class Database implements DataHandler {
                 verifyMetaLocked(session);
             }
             meta.addRow(session, r);
-            if (isMultiVersion()) {
+            if (isMVStore()) {
                 // TODO this should work without MVCC, but avoid risks at the
                 // moment
                 session.log(meta, UndoLogRecord.INSERT, r);
@@ -1026,7 +1021,7 @@ public class Database implements DataHandler {
                     }
                     Row found = cursor.get();
                     meta.removeRow(session, found);
-                    if (isMultiVersion()) {
+                    if (isMVStore()) {
                         // TODO this should work without MVCC, but avoid risks at
                         // the moment
                         session.log(meta, UndoLogRecord.DELETE, found);
@@ -2423,12 +2418,12 @@ public class Database implements DataHandler {
     }
 
     /**
-     * Check if multi version concurrency is enabled for this database.
+     * Check if MVStore backend is used for this database.
      *
-     * @return true if it is enabled
+     * @return {@code true} for MVStore, {@code false} for PageStore
      */
-    public boolean isMultiVersion() {
-        return multiVersion;
+    public boolean isMVStore() {
+        return dbSettings.mvStore;
     }
 
     /**
@@ -2458,13 +2453,6 @@ public class Database implements DataHandler {
 
     public void setMultiThreaded(boolean multiThreaded) {
         if (multiThreaded && this.multiThreaded != multiThreaded) {
-            if (multiVersion && mvStore == null) {
-                // currently the combination of MVCC and MULTI_THREADED is not
-                // supported
-                throw DbException.get(
-                        ErrorCode.UNSUPPORTED_SETTING_COMBINATION,
-                        "MVCC & MULTI_THREADED & !MV_STORE");
-            }
             if (lockMode == 0) {
                 // currently the combination of LOCK_MODE=0 and MULTI_THREADED
                 // is not supported
@@ -2872,10 +2860,6 @@ public class Database implements DataHandler {
         this.defaultTableType = defaultTableType;
     }
 
-    public void setMultiVersion(boolean multiVersion) {
-        this.multiVersion = multiVersion;
-    }
-
     public DbSettings getSettings() {
         return dbSettings;
     }

h2/src/main/org/h2/engine/Session.java

@@ -693,7 +693,7 @@ public class Session extends SessionWithState implements TransactionStore.Rollba
         removeTemporaryLobs(true);
         if (undoLog.size() > 0) {
             // commit the rows when using MVCC
-            if (database.isMultiVersion()) {
+            if (database.isMVStore()) {
                 synchronized (database) {
                     ArrayList<Row> rows = new ArrayList<>(undoLog.size());
                     while (undoLog.size() > 0) {
@@ -916,7 +916,7 @@ public class Session extends SessionWithState implements TransactionStore.Rollba
             if (SysProperties.CHECK) {
                 int lockMode = database.getLockMode();
                 if (lockMode != Constants.LOCK_MODE_OFF &&
-                        !database.isMultiVersion()) {
+                        !database.isMVStore()) {
                     TableType tableType = log.getTable().getTableType();
                     if (!locks.contains(log.getTable())
                             && TableType.TABLE_LINK != tableType
@@ -927,7 +927,7 @@ public class Session extends SessionWithState implements TransactionStore.Rollba
             }
             undoLog.add(log);
         } else {
-            if (database.isMultiVersion()) {
+            if (database.isMVStore()) {
                 // see also UndoLogRecord.commit
                 ArrayList<Index> indexes = table.getIndexes();
                 for (Index index : indexes) {
@@ -943,7 +943,7 @@ public class Session extends SessionWithState implements TransactionStore.Rollba
      * READ_COMMITTED.
      */
     public void unlockReadLocks() {
-        if (database.isMultiVersion()) {
+        if (database.isMVStore()) {
             // MVCC: keep shared locks (insert / update / delete)
             return;
         }

h2/src/main/org/h2/engine/UndoLog.java

@@ -156,7 +156,7 @@ public class UndoLog {
             memoryUndo++;
             if (memoryUndo > database.getMaxMemoryUndo() &&
                     database.isPersistent() &&
-                    !database.isMultiVersion()) {
+                    !database.isMVStore()) {
                 if (file == null) {
                     String fileName = database.createTempFile();
                     file = database.openFile(fileName, "rw", false);
@@ -185,7 +185,7 @@ public class UndoLog {
             }
             if (memoryUndo > database.getMaxMemoryUndo() &&
                     database.isPersistent() &&
-                    !database.isMultiVersion()) {
+                    !database.isMVStore()) {
                 if (file == null) {
                     String fileName = database.createTempFile();
                     file = database.openFile(fileName, "rw", false);

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

@@ -58,7 +58,7 @@ public class PageDataIndex extends PageIndex {
     public PageDataIndex(RegularTable table, int id, IndexColumn[] columns,
             IndexType indexType, boolean create, Session session) {
         initBaseIndex(table, id, table.getName() + "_DATA", columns, indexType);
-        this.multiVersion = database.isMultiVersion();
+        this.multiVersion = database.isMVStore();
 
         // trace = database.getTrace(Trace.PAGE_STORE + "_di");
         // trace.setLevel(TraceSystem.DEBUG);

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

@@ -44,7 +44,7 @@ public class ScanIndex extends BaseIndex {
     public ScanIndex(RegularTable table, int id, IndexColumn[] columns,
             IndexType indexType) {
         initBaseIndex(table, id, table.getName() + "_DATA", columns, indexType);
-        if (database.isMultiVersion()) {
+        if (database.isMVStore()) {
             sessionRowCount = new HashMap<>();
         } else {
             sessionRowCount = null;
@@ -67,7 +67,7 @@ public class ScanIndex extends BaseIndex {
         tableData.setRowCount(0);
         rowCount = 0;
         rowCountDiff = 0;
-        if (database.isMultiVersion()) {
+        if (database.isMVStore()) {
             sessionRowCount.clear();
         }
     }
@@ -102,7 +102,7 @@ public class ScanIndex extends BaseIndex {
             rows.set((int) key, row);
         }
         row.setDeleted(false);
-        if (database.isMultiVersion()) {
+        if (database.isMVStore()) {
             if (delta == null) {
                 delta = new HashSet<>();
             }
@@ -117,7 +117,7 @@ public class ScanIndex extends BaseIndex {
 
     @Override
     public void commit(int operation, Row row) {
-        if (database.isMultiVersion()) {
+        if (database.isMVStore()) {
             if (delta != null) {
                 delta.remove(row);
             }
@@ -127,7 +127,7 @@ public class ScanIndex extends BaseIndex {
     }
 
     private void incrementRowCount(int sessionId, int count) {
-        if (database.isMultiVersion()) {
+        if (database.isMVStore()) {
             Integer id = sessionId;
             Integer c = sessionRowCount.get(id);
             int current = c == null ? 0 : c.intValue();
@@ -139,7 +139,7 @@ public class ScanIndex extends BaseIndex {
     @Override
     public void remove(Session session, Row row) {
         // in-memory
-        if (!database.isMultiVersion() && rowCount == 1) {
+        if (!database.isMVStore() && rowCount == 1) {
             rows = Utils.newSmallArrayList();
             firstFree = -1;
         } else {
@@ -153,7 +153,7 @@ public class ScanIndex extends BaseIndex {
             rows.set((int) key, free);
             firstFree = key;
         }
-        if (database.isMultiVersion()) {
+        if (database.isMVStore()) {
             // if storage is null, the delete flag is not yet set
             row.setDeleted(true);
             if (delta == null) {
@@ -170,7 +170,7 @@ public class ScanIndex extends BaseIndex {
 
     @Override
     public Cursor find(Session session, SearchRow first, SearchRow last) {
-        return new ScanCursor(session, this, database.isMultiVersion());
+        return new ScanCursor(session, this, database.isMVStore());
     }
 
     @Override
@@ -182,7 +182,7 @@ public class ScanIndex extends BaseIndex {
 
     @Override
     public long getRowCount(Session session) {
-        if (database.isMultiVersion()) {
+        if (database.isMVStore()) {
             Integer i = sessionRowCount.get(session.getId());
             long count = i == null ? 0 : i.intValue();
             count += rowCount;

h2/src/main/org/h2/jmx/DatabaseInfo.java

@@ -116,7 +116,7 @@ public class DatabaseInfo implements DatabaseInfoMBean {
 
     @Override
     public boolean isMvcc() {
-        return database.isMultiVersion();
+        return database.isMVStore();
     }
 
     @Override

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

@@ -167,7 +167,7 @@ public class MVTable extends TableBase {
         if (lockMode == Constants.LOCK_MODE_OFF) {
             return false;
         }
-        if (!forceLockEvenInMvcc && database.isMultiVersion()) {
+        if (!forceLockEvenInMvcc && database.isMVStore()) {
             // MVCC: update, delete, and insert use a shared lock.
             // Select doesn't lock except when using FOR UPDATE and
             // the system property h2.selectForUpdateMvcc
@@ -310,7 +310,7 @@ public class MVTable extends TableBase {
             if (lockExclusiveSession == null) {
                 if (lockMode == Constants.LOCK_MODE_READ_COMMITTED) {
                     if (!database.isMultiThreaded() &&
-                            !database.isMultiVersion()) {
+                            !database.isMVStore()) {
                         // READ_COMMITTED: a read lock is acquired,
                         // but released immediately after the operation
                         // is complete.

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

@@ -360,13 +360,7 @@ public class PageStore implements CacheWriter {
         readVariableHeader();
         log = new PageLog(this);
         log.openForReading(logKey, logFirstTrunkPage, logFirstDataPage);
-        boolean old = database.isMultiVersion();
-        // temporarily disabling multi-version concurrency, because
-        // the multi-version index sometimes compares rows
-        // and the LOB storage is not yet available.
-        database.setMultiVersion(false);
         boolean isEmpty = recover();
-        database.setMultiVersion(old);
         if (!database.isReadOnly()) {
             readMode = true;
             if (!isEmpty || !SysProperties.MODIFY_ON_WRITE || tempObjects != null) {

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

@@ -1043,7 +1043,7 @@ public class MetaTable extends Table {
                     "FALSE" : "TRUE");
             add(rows, "MODE", database.getMode().getName());
             add(rows, "MULTI_THREADED", database.isMultiThreaded() ? "1" : "0");
-            add(rows, "MVCC", database.isMultiVersion() ? "TRUE" : "FALSE");
+            add(rows, "MVCC", database.isMVStore() ? "TRUE" : "FALSE");
             add(rows, "QUERY_TIMEOUT", Integer.toString(session.getQueryTimeout()));
             add(rows, "RETENTION_TIME", Integer.toString(database.getRetentionTime()));
             add(rows, "LOG", Integer.toString(database.getLogMode()));

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

@@ -116,7 +116,7 @@ public class RegularTable extends TableBase {
     @Override
     public void addRow(Session session, Row row) {
         lastModificationId = database.getNextModificationDataId();
-        if (database.isMultiVersion()) {
+        if (database.isMVStore()) {
             row.setSessionId(session.getId());
         }
         int i = 0;
@@ -167,7 +167,7 @@ public class RegularTable extends TableBase {
     }
 
     private void checkRowCount(Session session, Index index, int offset) {
-        if (SysProperties.CHECK && !database.isMultiVersion()) {
+        if (SysProperties.CHECK && !database.isMVStore()) {
             if (!(index instanceof PageDelegateIndex)) {
                 long rc = index.getRowCount(session);
                 if (rc != rowCount + offset) {
@@ -259,7 +259,7 @@ public class RegularTable extends TableBase {
                 index = new TreeIndex(this, indexId, indexName, cols, indexType);
             }
         }
-        if (database.isMultiVersion()) {
+        if (database.isMVStore()) {
             index = new MultiVersionIndex(index, this);
         }
         if (index.needRebuild() && rowCount > 0) {
@@ -366,7 +366,7 @@ public class RegularTable extends TableBase {
 
     @Override
     public long getRowCount(Session session) {
-        if (database.isMultiVersion()) {
+        if (database.isMVStore()) {
             return getScanIndex(session).getRowCount(session);
         }
         return rowCount;
@@ -374,7 +374,7 @@ public class RegularTable extends TableBase {
 
     @Override
     public void removeRow(Session session, Row row) {
-        if (database.isMultiVersion()) {
+        if (database.isMVStore()) {
             if (row.isDeleted()) {
                 throw DbException.get(ErrorCode.CONCURRENT_UPDATE_1, getName());
             }
@@ -444,7 +444,7 @@ public class RegularTable extends TableBase {
         if (lockMode == Constants.LOCK_MODE_OFF) {
             return lockExclusiveSession != null;
         }
-        if (!forceLockEvenInMvcc && database.isMultiVersion()) {
+        if (!forceLockEvenInMvcc && database.isMVStore()) {
             // MVCC: update, delete, and insert use a shared lock.
             // Select doesn't lock except when using FOR UPDATE
             if (exclusive) {
@@ -550,7 +550,7 @@ public class RegularTable extends TableBase {
         } else {
             if (lockExclusiveSession == null) {
                 if (lockMode == Constants.LOCK_MODE_READ_COMMITTED) {
-                    if (!database.isMultiThreaded() && !database.isMultiVersion()) {
+                    if (!database.isMultiThreaded() && !database.isMVStore()) {
                         // READ_COMMITTED: a read lock is acquired,
                         // but released immediately after the operation
                         // is complete.

h2/src/test/org/h2/test/TestBase.java

@@ -251,7 +251,6 @@ public abstract class TestBase {
         if (name.startsWith("jdbc:")) {
             if (config.mvStore) {
                 name = addOption(name, "MV_STORE", "true");
-                // name = addOption(name, "MVCC", "true");
             } else {
                 name = addOption(name, "MV_STORE", "false");
             }

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

@@ -527,7 +527,7 @@ public class TestGeneralCommonTableQueries extends AbstractBaseForCommonTableExp
         config = new TestAll();
 
         try {
-            // Test with settings: lazy mvStore memory mvcc multiThreaded
+            // Test with settings: lazy mvStore memory multiThreaded
             // connection url is
             // mem:script;MV_STORE=true;LOG=1;LOCK_TIMEOUT=50;
             // MULTI_THREADED=TRUE;LAZY_QUERY_EXECUTION=1

h2/src/test/org/h2/test/mvcc/TestMvcc1.java

@@ -36,27 +36,9 @@ public class TestMvcc1 extends TestBase {
     @Override
     public void test() throws SQLException {
         testCases();
-        testSetMode();
         deleteDb("mvcc1");
     }
 
-    private void testSetMode() throws SQLException {
-        deleteDb("mvcc1");
-        c1 = getConnection("mvcc1;MVCC=FALSE");
-        Statement stat = c1.createStatement();
-        ResultSet rs = stat.executeQuery(
-                "select * from information_schema.settings where name='MVCC'");
-        rs.next();
-        assertEquals("FALSE", rs.getString("VALUE"));
-        assertThrows(ErrorCode.CANNOT_CHANGE_SETTING_WHEN_OPEN_1, stat).
-                execute("SET MVCC TRUE");
-        rs = stat.executeQuery("select * from information_schema.settings " +
-                "where name='MVCC'");
-        rs.next();
-        assertEquals("FALSE", rs.getString("VALUE"));
-        c1.close();
-    }
-
     private void testCases() throws SQLException {
         if (!config.mvStore) {
             return;

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

@@ -82,12 +82,10 @@ public class TestMVTableEngine extends TestBase {
         testAutoCommit();
         testReopen();
         testBlob();
-        testExclusiveLock();
         testEncryption();
         testReadOnly();
         testReuseDiskSpace();
         testDataTypes();
-        testLocking();
         testSimple();
         if (!config.travis) {
             testReverseDeletePerformance();
@@ -1112,29 +1110,6 @@ public class TestMVTableEngine extends TestBase {
         conn.close();
     }
 
-    private void testExclusiveLock() throws Exception {
-        deleteDb(getTestName());
-        String dbName = getTestName() + ";MV_STORE=TRUE;MVCC=FALSE";
-        Connection conn, conn2;
-        Statement stat, stat2;
-        conn = getConnection(dbName);
-        stat = conn.createStatement();
-        stat.execute("create table test(id int)");
-        stat.execute("insert into test values(1)");
-        conn.setAutoCommit(false);
-        // stat.execute("update test set id = 2");
-        stat.executeQuery("select * from test for update");
-        conn2 = getConnection(dbName);
-        stat2 = conn2.createStatement();
-        ResultSet rs2 = stat2.executeQuery(
-                "select * from information_schema.locks");
-        assertTrue(rs2.next());
-        assertEquals("TEST", rs2.getString("table_name"));
-        assertEquals("WRITE", rs2.getString("lock_type"));
-        conn2.close();
-        conn.close();
-    }
-
     private void testReadOnly() throws Exception {
         if (config.memory) {
             return;
@@ -1343,42 +1318,6 @@ public class TestMVTableEngine extends TestBase {
         conn.close();
     }
 
-    private void testLocking() throws Exception {
-        deleteDb(getTestName());
-        String dbName = getTestName() + ";MV_STORE=TRUE;MVCC=FALSE";
-        Connection conn = getConnection(dbName);
-        Statement stat = conn.createStatement();
-        stat.execute("set lock_timeout 1000");
-
-        stat.execute("create table a(id int primary key, name varchar)");
-        stat.execute("create table b(id int primary key, name varchar)");
-
-        Connection conn1 = getConnection(dbName);
-        final Statement stat1 = conn1.createStatement();
-        stat1.execute("set lock_timeout 1000");
-
-        conn.setAutoCommit(false);
-        conn1.setAutoCommit(false);
-        stat.execute("insert into a values(1, 'Hello')");
-        stat1.execute("insert into b values(1, 'Hello')");
-        Task t = new Task() {
-            @Override
-            public void call() throws Exception {
-                stat1.execute("insert into a values(2, 'World')");
-            }
-        };
-        t.execute();
-        try {
-            stat.execute("insert into b values(2, 'World')");
-            throw t.getException();
-        } catch (SQLException e) {
-            assertEquals(e.toString(), ErrorCode.DEADLOCK_1, e.getErrorCode());
-        }
-
-        conn1.close();
-        conn.close();
-    }
-
     private void testSimple() throws Exception {
         deleteDb(getTestName());
         String dbName = getTestName() + ";MV_STORE=TRUE";

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

@@ -31,7 +31,6 @@ public class TestConcurrentUpdate extends TestBase {
         config.memory = true;
         config.multiThreaded = true;
 //        config.mvStore = false;
-//        config.mvcc = false;
         System.out.println(config);
         TestBase test = createCaller().init(config);
         for (int i = 0; i < 10; i++) {

h2/src/test/org/h2/test/unit/TestPageStore.java

@@ -167,7 +167,7 @@ public class TestPageStore extends TestBase {
     private void testRecoverLobInDatabase() throws SQLException {
         deleteDb("pageStoreRecoverLobInDatabase");
         String url = getURL("pageStoreRecoverLobInDatabase;" +
-                "MVCC=TRUE;CACHE_SIZE=1", true);
+                "CACHE_SIZE=1", true);
         Connection conn;
         Statement stat;
         conn = getConnection(url, getUser(), getPassword());
@@ -182,7 +182,7 @@ public class TestPageStore extends TestBase {
             Connection conn2 = getConnection(url, getUser(), getPassword());
             list.add(conn2);
             Statement stat2 = conn2.createStatement();
-            conn2.setAutoCommit(false);
+            // conn2.setAutoCommit(false);
             if (r.nextBoolean()) {
                 stat2.execute("update test set id = id where id = " + r.nextInt(100));
             } else {