Merge pull request #1250 from h2database/batch-append

Batch append mode for MVMap

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

@@ -836,6 +836,8 @@ public abstract class Page implements Cloneable
         }
     }
 
+    public abstract CursorPos getAppendCursorPos(CursorPos cursorPos);
+
     public abstract void removeAllRecursive();
 
     private Object[] createKeyStorage(int size)
@@ -1083,6 +1085,13 @@ public abstract class Page implements Cloneable
             removePage();
         }
 
+        @Override
+        public CursorPos getAppendCursorPos(CursorPos cursorPos) {
+            int keyCount = getKeyCount();
+            Page childPage = getChildPage(keyCount);
+            return childPage.getAppendCursorPos(new CursorPos(this, keyCount, cursorPos));
+        }
+
         @Override
         protected void readPayLoad(ByteBuffer buff) {
             int keyCount = getKeyCount();
@@ -1322,6 +1331,12 @@ public abstract class Page implements Cloneable
             removePage();
         }
 
+        @Override
+        public CursorPos getAppendCursorPos(CursorPos cursorPos) {
+            int keyCount = getKeyCount();
+            return new CursorPos(this, -keyCount - 1, cursorPos);
+        }
+
         @Override
         protected void readPayLoad(ByteBuffer buff) {
             int keyCount = getKeyCount();

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

@@ -19,6 +19,7 @@ import org.h2.index.Cursor;
 import org.h2.index.IndexType;
 import org.h2.message.DbException;
 import org.h2.mvstore.MVMap;
+import org.h2.mvstore.MVStore;
 import org.h2.mvstore.tx.Transaction;
 import org.h2.mvstore.tx.TransactionMap;
 import org.h2.result.Row;
@@ -79,8 +80,9 @@ public final class MVSecondaryIndex extends BaseIndex implements MVIndex {
         MVMap<ValueArray, Value> map = openMap(bufferName);
         for (Row row : rows) {
             ValueArray key = convertToKey(row);
-            map.put(key, ValueNull.INSTANCE);
+            map.append(key, ValueNull.INSTANCE);
         }
+        map.flushAppendBuffer();
     }
 
     private static final class Source {
@@ -154,9 +156,9 @@ public final class MVSecondaryIndex extends BaseIndex implements MVIndex {
                 }
             }
         } finally {
+            MVStore store = database.getMvStore().getStore();
             for (String tempMapName : bufferNames) {
-                MVMap<ValueArray, Value> map = openMap(tempMapName);
-                map.getStore().removeMap(map);
+                store.removeMap(tempMapName);
             }
         }
     }
@@ -171,7 +173,9 @@ public final class MVSecondaryIndex extends BaseIndex implements MVIndex {
                 database.getCompareMode(), database, sortTypes);
         ValueDataType valueType = new ValueDataType(null, null, null);
         MVMap.Builder<ValueArray, Value> builder =
-                new MVMap.Builder<ValueArray, Value>().keyType(keyType).valueType(valueType);
+                new MVMap.Builder<ValueArray, Value>()
+                        .singleWriter()
+                        .keyType(keyType).valueType(valueType);
         MVMap<ValueArray, Value> map = database.getMvStore().
                 getStore().openMap(mapName, builder);
         if (!keyType.equals(map.getKeyType())) {

h2/src/main/org/h2/mvstore/tx/Transaction.java

@@ -300,7 +300,7 @@ public class Transaction {
         }
         int currentStatus = getStatus(currentState);
         checkOpen(currentStatus);
-        store.removeUndoLogRecord(transactionId, logId);
+        store.removeUndoLogRecord(transactionId);
     }
 
     /**

h2/src/main/org/h2/mvstore/tx/TransactionMap.java

@@ -88,9 +88,9 @@ public class TransactionMap<K, V> {
             for (int i = opentransactions.nextSetBit(0); i >= 0; i = opentransactions.nextSetBit(i+1)) {
                 MVMap<Long, Object[]> undoLog = store.undoLogs[i];
                 if (undoLog != null) {
-                    MVMap.RootReference rootReference = undoLog.getRoot();
+                    MVMap.RootReference rootReference = undoLog.flushAppendBuffer();
                     undoLogRootReferences[i] = rootReference;
-                    undoLogSize += rootReference.root.getTotalCount();
+                    undoLogSize += rootReference.root.getTotalCount() + rootReference.getAppendCounter();
                 }
             }
         } while(committingTransactions != store.committingTransactions.get() ||

h2/src/main/org/h2/mvstore/tx/TransactionStore.java

@@ -16,6 +16,7 @@ import org.h2.mvstore.Cursor;
 import org.h2.mvstore.DataUtils;
 import org.h2.mvstore.MVMap;
 import org.h2.mvstore.MVStore;
+import org.h2.mvstore.Page;
 import org.h2.mvstore.WriteBuffer;
 import org.h2.mvstore.type.DataType;
 import org.h2.mvstore.type.ObjectDataType;
@@ -132,7 +133,9 @@ public class TransactionStore {
         ArrayType undoLogValueType = new ArrayType(new DataType[]{
                 new ObjectDataType(), dataType, oldValueType
         });
-        undoLogBuilder = new MVMap.Builder<Long, Object[]>().valueType(undoLogValueType);
+        undoLogBuilder = new MVMap.Builder<Long, Object[]>()
+                .singleWriter()
+                .valueType(undoLogValueType);
     }
 
     /**
@@ -391,24 +394,16 @@ public class TransactionStore {
                     "is still open: {0}",
                     transactionId);
         }
-        undoLog.put(undoKey, undoLogRecord);
+        undoLog.append(undoKey, undoLogRecord);
         return undoKey;
     }
 
     /**
      * Remove an undo log entry.
      * @param transactionId id of the transaction
-     * @param logId sequential number of the log record within transaction
      */
-    public void removeUndoLogRecord(int transactionId, long logId) {
-        Long undoKey = getOperationId(transactionId, logId);
-        Object[] old = undoLogs[transactionId].remove(undoKey);
-        if (old == null) {
-            throw DataUtils.newIllegalStateException(
-                    DataUtils.ERROR_TRANSACTION_ILLEGAL_STATE,
-                    "Transaction {0} was concurrently rolled back",
-                    transactionId);
-        }
+    void removeUndoLogRecord(int transactionId) {
+        undoLogs[transactionId].trimLast();
     }
 
     /**
@@ -442,7 +437,9 @@ public class TransactionStore {
                     store.renameMap(undoLog, getUndoLogName(true, transactionId));
                 }
                 try {
-                    Cursor<Long, Object[]> cursor = undoLog.cursor(null);
+                    MVMap.RootReference rootReference = undoLog.flushAppendBuffer();
+                    Page rootPage = rootReference.root;
+                    Cursor<Long, Object[]> cursor = new Cursor<>(rootPage, null);
                     while (cursor.hasNext()) {
                         Long undoKey = cursor.next();
                         Object[] op = cursor.getValue();
@@ -597,6 +594,7 @@ public class TransactionStore {
     void rollbackTo(Transaction t, long maxLogId, long toLogId) {
         int transactionId = t.getId();
         MVMap<Long, Object[]> undoLog = undoLogs[transactionId];
+        undoLog.flushAppendBuffer();
         RollbackDecisionMaker decisionMaker = new RollbackDecisionMaker(this, transactionId, toLogId, t.listener);
         for (long logId = maxLogId - 1; logId >= toLogId; logId--) {
             Long undoKey = getOperationId(transactionId, logId);
@@ -618,6 +616,7 @@ public class TransactionStore {
             final long toLogId) {
 
         final MVMap<Long, Object[]> undoLog = undoLogs[t.getId()];
+        undoLog.flushAppendBuffer();
         return new Iterator<Change>() {
 
             private long logId = maxLogId - 1;

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

@@ -509,7 +509,7 @@ public class TestMultiThread extends TestDb implements Runnable {
         @Override
         public void run() {
             try {
-                Connection c = getConnection("concurrentUpdate2");
+                Connection c = getConnection("concurrentUpdate2;LOCK_TIMEOUT=10000");
                 PreparedStatement ps = c.prepareStatement("UPDATE TEST SET V = ? WHERE " + column + " = ?");
                 for (int test = 0; test < 1000; test++) {
                     for (int i = 0; i < 16; i++) {

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

@@ -76,7 +76,7 @@ public class TestMVTableEngine extends TestDb {
         testMinMaxWithNull();
         testTimeout();
         testExplainAnalyze();
-        testTransactionLogUsuallyNotStored();
+        testTransactionLogEmptyAfterCommit();
         testShrinkDatabaseFile();
         testTwoPhaseCommit();
         testRecover();
@@ -642,17 +642,16 @@ public class TestMVTableEngine extends TestDb {
         conn.close();
     }
 
-    private void testTransactionLogUsuallyNotStored() throws Exception {
+    private void testTransactionLogEmptyAfterCommit() throws Exception {
         Connection conn;
         Statement stat;
-        // we expect the transaction log is empty in at least some of the cases
-        for (int test = 0; test < 5; test++) {
         deleteDb(getTestName());
         String url = getTestName() + ";MV_STORE=TRUE";
         url = getURL(url, true);
         conn = getConnection(url);
         stat = conn.createStatement();
         stat.execute("create table test(id identity, name varchar)");
+        stat.execute("set write_delay 0");
         conn.setAutoCommit(false);
         PreparedStatement prep = conn.prepareStatement(
                 "insert into test(name) values(space(10000))");
@@ -673,11 +672,9 @@ public class TestMVTableEngine extends TestDb {
         t.init();
         int openTransactions = t.getOpenTransactions().size();
         store.close();
-            if (openTransactions == 0) {
-                return;
-            }
+        if (openTransactions != 0) {
+            fail("transaction log was not empty");
         }
-        fail("transaction log was never empty");
     }
 
     private void testShrinkDatabaseFile() throws Exception {