Merge pull request #515 from andreitokar/issue#499.2

"Unique index or primary key violation" in TestMvccMultiThreaded

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

@@ -361,26 +361,23 @@ public class TransactionStore {
                 }
                 int mapId = (Integer) op[0];
                 MVMap<Object, VersionedValue> map = openMap(mapId);
-                if (map == null) {
-                    // map was later removed
-                } else {
+                if (map != null) { // might be null if map was removed later
                     Object key = op[1];
                     VersionedValue value = map.get(key);
-                    if (value == null) {
-                        // nothing to do
-                    } else if (value.value == null) {
-                        int tx = getTransactionId(value.operationId);
-                        if (tx == t.transactionId) {
-                            // remove the value
-                            // only if it's transaction id is same as current transaction id
+                    if (value != null) {
+                        // only commit (remove/update) value if we've reached
+                        // last undoLog entry for a given key
+                        if (value.operationId == undoKey) {
+                            if (value.value == null) {
                                 map.remove(key);
-                        }
                             } else {
                                 VersionedValue v2 = new VersionedValue();
                                 v2.value = value.value;
                                 map.put(key, v2);
                             }
                         }
+                    }
+                }
                 undoLog.remove(undoKey);
             }
         } finally {

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

@@ -103,12 +103,9 @@ public class TestMvccMultiThreaded2 extends TestBase {
                         if (now - start > 1000 * 60)
                             done = true;
                     } catch (JdbcSQLException e1) {
-                        // skip DUPLICATE_KEY_1 to just focus on this bug.
-                        if (e1.getErrorCode() != ErrorCode.DUPLICATE_KEY_1) {
                         throw e1;
                     }
                 }
-                }
             } catch (SQLException e) {
                 TestBase.logError("error", e);
             }