提交 ddf7b783 authored 作者: Noel Grandin's avatar Noel Grandin 提交者: GitHub

Merge pull request #500 from danguria/master

fix #499
......@@ -350,8 +350,12 @@ public class TransactionStore {
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
map.remove(key);
}
} else {
VersionedValue v2 = new VersionedValue();
v2.value = value.value;
......
......@@ -117,6 +117,7 @@ import org.h2.test.mvcc.TestMvcc2;
import org.h2.test.mvcc.TestMvcc3;
import org.h2.test.mvcc.TestMvcc4;
import org.h2.test.mvcc.TestMvccMultiThreaded;
import org.h2.test.mvcc.TestMvccMultiThreaded2;
import org.h2.test.poweroff.TestReorderWrites;
import org.h2.test.recover.RecoverLobTest;
import org.h2.test.rowlock.TestRowLocks;
......@@ -803,6 +804,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
addTest(new TestMvcc3());
addTest(new TestMvcc4());
addTest(new TestMvccMultiThreaded());
addTest(new TestMvccMultiThreaded2());
addTest(new TestRowLocks());
// synth
......
/*
* Copyright 2004-2014 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.test.mvcc;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import org.h2.test.TestBase;
import org.h2.jdbc.JdbcSQLException;
import org.h2.api.ErrorCode;
/**
* Additional MVCC (multi version concurrency) test cases.
*/
public class TestMvccMultiThreaded2 extends TestBase {
private static final AtomicBoolean running = new AtomicBoolean(true);
private static final String url = ";MVCC=TRUE;LOCK_TIMEOUT=120000;MULTI_THREADED=TRUE";
/**
* Run just this test.
*
* @param a ignored
*/
public static void main(String... a) throws Exception {
TestBase test = TestBase.createCaller().init();
test.config.mvcc = true;
test.config.lockTimeout = 120000;
test.config.memory = true;
test.config.multiThreaded = true;
test.test();
}
@Override
public void test() throws SQLException {
if (config.cipher != null || !config.lazy) {
return;
}
testSelectForUpdateConcurrency();
}
private void testSelectForUpdateConcurrency() throws SQLException {
deleteDb(getTestName());
Connection conn = getConnection(getTestName() + url);
conn.setAutoCommit(false);
String sql = "CREATE TABLE testmvccmultithreaded2 ("
+ "entity_id INTEGER NOT NULL PRIMARY KEY, "
+ "lastUpdated INTEGER NOT NULL)";
Statement smtm = conn.createStatement();
smtm.executeUpdate(sql);
PreparedStatement ps = conn.prepareStatement(
"INSERT INTO testmvccmultithreaded2 (entity_id, lastUpdated) VALUES (?, ?)");
ps.setInt(1, 1);
ps.setInt(2, 100);
ps.executeUpdate();
conn.commit();
int howManyThreads = 100;
Thread[] threads = new SelectForUpdate[howManyThreads];
for (int i = 0; i < howManyThreads; i++) {
threads[i] = new SelectForUpdate();
threads[i].start();
}
try {
for (int i = 0; i < howManyThreads; i++) {
threads[i].join();
}
} catch (InterruptedException e) {
e.printStackTrace();
}
smtm = conn.createStatement();
smtm.execute("DROP TABLE testmvccmultithreaded2");
if (conn != null) {
try {
conn.close();
} catch (SQLException e1) {
e1.printStackTrace();
}
}
}
private class SelectForUpdate extends Thread {
@Override
public void run() {
long start = System.currentTimeMillis();
boolean done = false;
Connection conn = null;
while(running.get() && !done) {
try {
conn = getConnection(getTestName() + url);
conn.setAutoCommit(false);
PreparedStatement ps = conn.prepareStatement(
"SELECT * FROM testmvccmultithreaded2 WHERE entity_id = ? FOR UPDATE");
ps.setString(1, "1");
ResultSet rs = ps.executeQuery();
assertTrue(rs.next());
assertTrue(rs.getInt(2) == 100);
conn.commit();
long now = System.currentTimeMillis();
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)
e1.printStackTrace();
} catch (SQLException e2) {
e2.printStackTrace();
}
}
if (conn != null) {
try {
conn.close();
} catch (SQLException e1) {
e1.printStackTrace();
}
}
}
}
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论