MVCC: if the page store is disabled, rollback of multiple rows with the same…

MVCC: if the page store is disabled, rollback of multiple rows with the same index key did not work correctly.

h2/src/main/org/h2/log/UndoLogRecord.java

@@ -122,6 +122,7 @@ public class UndoLogRecord {
             try {
                 if (!db.isPageStoreEnabled()) {
                     row.setKey(0);
+                    row.setVersion(row.getVersion() - 1);
                 }
                 table.addRow(session, row);
                 table.fireAfterRow(session, null, row, true);

h2/src/test/org/h2/test/TestAll.java

@@ -299,15 +299,9 @@ java org.h2.test.TestAll timer
 
 /*
 
-MVCCIndexCorruptedTest
-
 power failure test: larger binaries and additional indexes
 (with many columns).
 
-instead of trigger on views
-
-pseudo column rowid, oid, _rowid_
-
 outer join bug
 
 // System.setProperty("h2.pageSize", "64");

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

@@ -771,11 +771,11 @@ public abstract class TestBase {
     /**
      * Check that the result set row count matches.
      *
-     * @param rs the result set
      * @param expected the number of expected rows
+     * @param rs the result set
      * @throws AssertionError if a different number of rows have been found
      */
-    protected void assertResultRowCount(ResultSet rs, int expected) throws SQLException {
+    protected void assertResultRowCount(int expected, ResultSet rs) throws SQLException {
         int i = 0;
         while (rs.next()) {
             i++;

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

@@ -106,16 +106,16 @@ public class TestTempTables extends TestBase {
         s1.execute("create local temporary table test_temp(id int) on commit delete rows");
         s1.execute("insert into test_temp values(1)");
         rs = s1.executeQuery("select * from test_temp");
-        assertResultRowCount(rs, 1);
+        assertResultRowCount(1, rs);
         c1.commit();
         rs = s1.executeQuery("select * from test_temp");
-        assertResultRowCount(rs, 0);
+        assertResultRowCount(0, rs);
         s1.execute("drop table test_temp");
 
         s1.execute("create local temporary table test_temp(id int) on commit drop");
         s1.execute("insert into test_temp values(1)");
         rs = s1.executeQuery("select * from test_temp");
-        assertResultRowCount(rs, 1);
+        assertResultRowCount(1, rs);
         c1.commit();
         try {
             s1.executeQuery("select * from test_temp");

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

@@ -34,6 +34,7 @@ public class TestTransaction extends TestBase {
     }
 
     public void test() throws SQLException {
+        testRollback();
         testSetTransaction();
         testReferential();
         testSavepoint();
@@ -41,6 +42,51 @@ public class TestTransaction extends TestBase {
         deleteDb("transaction");
     }
 
+    private void testRollback() throws SQLException {
+        deleteDb("transaction");
+        Connection conn = getConnection("transaction");
+        Statement stat = conn.createStatement();
+        stat.execute("create table test(id int)");
+        stat.execute("create index idx_id on test(id)");
+        stat.execute("insert into test values(1), (1)");
+        if (!config.memory) {
+            conn.close();
+            conn = getConnection("transaction");
+            stat = conn.createStatement();
+        }
+        conn.setAutoCommit(false);
+        stat.execute("delete from test");
+        conn.rollback();
+        ResultSet rs;
+        rs = stat.executeQuery("select * from test where id = 1");
+        assertResultRowCount(2, rs);
+        conn.close();
+
+        conn = getConnection("transaction");
+        stat = conn.createStatement();
+        stat.execute("create table master(id int) as select 1");
+        stat.execute("create table child1(id int references master(id) on delete cascade)");
+        stat.execute("insert into child1 values(1), (1)");
+        stat.execute("create table child2(id int references master(id)) as select 1");
+        if (!config.memory) {
+            conn.close();
+            conn = getConnection("transaction");
+            stat = conn.createStatement();
+        }
+        stat = conn.createStatement();
+        try {
+            stat.execute("delete from master");
+            fail();
+        } catch (SQLException ex) {
+            // ok
+        }
+        rs = stat.executeQuery("select * from master where id=1");
+        assertResultRowCount(1, rs);
+        rs = stat.executeQuery("select * from child1 where id=1");
+        assertResultRowCount(2, rs);
+        conn.close();
+    }
+
     private void testSetTransaction() throws SQLException {
         deleteDb("transaction");
         Connection conn = getConnection("transaction");