Skip to content

H
h2database
提交 03402e74 authored 作者: Thomas Mueller's avatar Thomas Mueller
浏览文件
操作

Transaction store: re-use transaction ids, and they are not integer and no… 

Transaction store: re-use transaction ids, and they are not integer and no longer long (work in progress)
上级 71888e43
显示空白字符变更
内嵌 并排
正在显示 包含 127 行增加 和 84 行删除
h2/src/main/org/h2/mvstore/DataUtils.java
浏览文件 @ 03402e74
......@@ -76,6 +76,11 @@ public class DataUtils {
*/
public static final int ERROR_TRANSACTION_LOCK_TIMEOUT = 101;
/**
* A very old transaction is still open.
*/
public static final int ERROR_TRANSACTION_STILL_OPEN = 102;
/**
* The type for leaf page.
*/
......
h2/src/main/org/h2/mvstore/db/TransactionStore.java
浏览文件 @ 03402e74
......@@ -27,8 +27,6 @@ import org.h2.util.New;
*/
public class TransactionStore {
private static final String LAST_TRANSACTION_ID = "lastTransactionId";
// TODO should not be hard-coded
private static final int MAX_UNSAVED_PAGES = 4 * 1024;
......@@ -41,7 +39,7 @@ public class TransactionStore {
* The persisted map of prepared transactions.
* Key: transactionId, value: [ status, name ].
*/
final MVMap<Long, Object[]> preparedTransactions;
final MVMap<Integer, Object[]> preparedTransactions;
/**
* The undo log.
......@@ -55,26 +53,19 @@ public class TransactionStore {
*/
final MVMap<long[], Object[]> undoLog;
;
// TODO should be <long, Object[]>
// TODO should be <long, Object[]> (operationId, oldValue)
// TODO probably opType is not needed
/**
* The lock timeout in milliseconds. 0 means timeout immediately.
*/
long lockTimeout;
/**
* The transaction settings. The entry "lastTransaction" contains the last
* transaction id.
*/
private final MVMap<String, String> settings;
private final DataType dataType;
private long lastTransactionIdStored;
private long lastTransactionId;
private int lastTransactionId;
private long firstOpenTransaction = -1;
private int maxTransactionId = 0xffff;
private HashMap<Integer, MVMap<Object, VersionedValue>> maps = New.hashMap();
......@@ -96,9 +87,8 @@ public class TransactionStore {
public TransactionStore(MVStore store, DataType dataType) {
this.store = store;
this.dataType = dataType;
settings = store.openMap("settings");
preparedTransactions = store.openMap("openTransactions",
new MVMap.Builder<Long, Object[]>());
new MVMap.Builder<Integer, Object[]>());
// TODO commit of larger transaction could be faster if we have one undo
// log per transaction, or a range delete operation for maps
VersionedValueType oldValueType = new VersionedValueType(dataType);
......@@ -114,20 +104,38 @@ public class TransactionStore {
init();
}
private synchronized void init() {
String s = settings.get(LAST_TRANSACTION_ID);
lastTransactionId = DataUtils.parseLong(s, 0);
lastTransactionIdStored = lastTransactionId;
Long lastKey = preparedTransactions.lastKey();
if (lastKey != null && lastKey.longValue() > lastTransactionId) {
throw DataUtils.newIllegalStateException(
DataUtils.ERROR_TRANSACTION_CORRUPT,
"Last transaction not stored");
/**
* Set the maximum transaction id, after which ids are re-used. If the old
* transaction is still in use when re-using an old id, the new transaction
* fails.
*
* @param max the maximum id
*/
public void setMaxTransactionId(int max) {
this.maxTransactionId = max;
}
private static long getOperationId(int transactionId, long logId) {
DataUtils.checkArgument(transactionId >= 0 && transactionId < (1 << 24),
"Transaction id out of range: {0}", transactionId);
DataUtils.checkArgument(logId >= 0 && logId < (1L << 40),
"Transaction log id out of range: {0}", logId);
return ((long) transactionId << 40) | logId;
}
private static int getTransactionId(long operationId) {
return (int) (operationId >>> 40);
}
private static long getLogId(long operationId) {
return operationId & ((1L << 40) - 1);
}
private synchronized void init() {
synchronized (undoLog) {
if (undoLog.size() > 0) {
long[] key = undoLog.firstKey();
firstOpenTransaction = key[0];
lastTransactionId = (int) key[0];
}
}
}
......@@ -142,7 +150,7 @@ public class TransactionStore {
ArrayList<Transaction> list = New.arrayList();
long[] key = undoLog.firstKey();
while (key != null) {
long transactionId = key[0];
int transactionId = (int) key[0];
long[] end = { transactionId, Long.MAX_VALUE };
key = undoLog.floorKey(end);
long logId = key[1] + 1;
......@@ -173,8 +181,6 @@ public class TransactionStore {
* Close the transaction store.
*/
public synchronized void close() {
// to avoid losing transaction ids
settings.put(LAST_TRANSACTION_ID, "" + lastTransactionId);
store.commit();
}
......@@ -184,10 +190,9 @@ public class TransactionStore {
* @return the transaction
*/
public synchronized Transaction begin() {
long transactionId = lastTransactionId++;
if (lastTransactionId > lastTransactionIdStored) {
lastTransactionIdStored += 64;
settings.put(LAST_TRANSACTION_ID, "" + lastTransactionIdStored);
int transactionId = ++lastTransactionId;
if (lastTransactionId >= maxTransactionId) {
lastTransactionId = 0;
}
int status = Transaction.STATUS_OPEN;
return new Transaction(this, transactionId, status, null, 0);
......@@ -227,10 +232,15 @@ public class TransactionStore {
long[] undoKey = { t.getId(), logId };
Object[] log = new Object[] { opType, mapId, key, oldValue };
synchronized (undoLog) {
undoLog.put(undoKey, log);
if (logId == 0) {
if (undoLog.containsKey(undoKey)) {
throw DataUtils.newIllegalStateException(
DataUtils.ERROR_TRANSACTION_STILL_OPEN,
"An old transaction with the same id is still open: {0}",
t.getId());
}
}
if (firstOpenTransaction == -1 || t.getId() < firstOpenTransaction) {
firstOpenTransaction = t.getId();
undoLog.put(undoKey, log);
}
}
......@@ -277,20 +287,23 @@ public class TransactionStore {
logId = undoKey[1] - 1;
continue;
}
int opType = (Integer) op[0];
if (opType == Transaction.OP_REMOVE) {
;
// TODO undoLog: do we need the opType?
int mapId = (Integer) op[1];
MVMap<Object, VersionedValue> map = openMap(mapId);
Object key = op[2];
VersionedValue value = map.get(key);
// possibly the entry was added later on
// so we have to check
if (value == null) {
// nothing to do
} else if (value.value == null) {
// remove the value
map.remove(key);
}
} else {
VersionedValue v2 = new VersionedValue();
v2.value = value.value;
map.put(key, v2);
}
undoLog.remove(undoKey);
}
......@@ -328,26 +341,11 @@ public class TransactionStore {
* @return true if it is open
*/
boolean isTransactionOpen(long transactionId) {
if (transactionId < firstOpenTransaction) {
return false;
}
;
// TODO probably not needed at all
synchronized (undoLog) {
if (firstOpenTransaction == -1) {
if (undoLog.size() == 0) {
return false;
}
long[] key = undoLog.firstKey();
if (key == null) {
// unusual, but can happen
return false;
}
firstOpenTransaction = key[0];
}
if (firstOpenTransaction == transactionId) {
return true;
}
long[] key = { transactionId, -1 };
key = undoLog.higherKey(key);
long[] key = { transactionId, 0 };
key = undoLog.ceilingKey(key);
return key != null && key[0] == transactionId;
}
}
......@@ -362,9 +360,6 @@ public class TransactionStore {
preparedTransactions.remove(t.getId());
}
t.setStatus(Transaction.STATUS_CLOSED);
if (t.getId() == firstOpenTransaction) {
firstOpenTransaction = -1;
}
if (store.getAutoCommitDelay() == 0) {
store.commit();
return;
......@@ -560,7 +555,7 @@ public class TransactionStore {
/**
* The transaction id.
*/
final long transactionId;
final int transactionId;
/**
* The log id of the last entry in the undo log map.
......@@ -571,7 +566,7 @@ public class TransactionStore {
private String name;
Transaction(TransactionStore store, long transactionId, int status, String name, long logId) {
Transaction(TransactionStore store, int transactionId, int status, String name, long logId) {
this.store = store;
this.transactionId = transactionId;
this.status = status;
......@@ -579,7 +574,7 @@ public class TransactionStore {
this.logId = logId;
}
public long getId() {
public int getId() {
return transactionId;
}
......@@ -620,7 +615,9 @@ public class TransactionStore {
* @param oldValue the old value
*/
void log(int opType, int mapId, Object key, Object oldValue) {
store.log(this, logId++, opType, mapId, key, oldValue);
store.log(this, logId, opType, mapId, key, oldValue);
// only increment the log id if logging was successful
logId++;
}
/**
......
h2/src/test/org/h2/test/store/TestTransactionStore.java
浏览文件 @ 03402e74
......@@ -45,6 +45,7 @@ public class TestTransactionStore extends TestBase {
@Override
public void test() throws Exception {
FileUtils.createDirectories(getBaseDir());
testTransactionAge();
testStopWhileCommitting();
testGetModifiedMaps();
testKeyIterator();
......@@ -56,6 +57,46 @@ public class TestTransactionStore extends TestBase {
testCompareWithPostgreSQL();
}
private void testTransactionAge() throws Exception {
MVStore s;
TransactionStore ts;
s = MVStore.open(null);
ts = new TransactionStore(s);
ts.setMaxTransactionId(16);
for (int i = 0, j = 1; i < 64; i++) {
Transaction t = ts.begin();
assertEquals(j, t.getId());
t.commit();
j++;
if (j > 16) {
j = 1;
}
}
s = MVStore.open(null);
ts = new TransactionStore(s);
ts.setMaxTransactionId(16);
ArrayList<Transaction> fifo = New.arrayList();
int open = 0;
for (int i = 0; i < 64; i++) {
Transaction t = ts.begin();
if (open >= 16) {
try {
t.openMap("data").put(i, i);
fail();
} catch (IllegalStateException e) {
// expected - too many open
}
Transaction first = fifo.remove(0);
first.commit();
open--;
}
fifo.add(t);
open++;
t.openMap("data").put(i, i);
}
s.close();
}
private void testStopWhileCommitting() throws Exception {
String fileName = getBaseDir() + "/testStopWhileCommitting.h3";
FileUtils.delete(fileName);
......@@ -342,7 +383,7 @@ public class TestTransactionStore extends TestBase {
assertEquals(null, tx.getName());
tx.setName("first transaction");
assertEquals("first transaction", tx.getName());
assertEquals(0, tx.getId());
assertEquals(1, tx.getId());
assertEquals(Transaction.STATUS_OPEN, tx.getStatus());
m = tx.openMap("test");
m.put("1", "Hello");
......@@ -350,6 +391,7 @@ public class TestTransactionStore extends TestBase {
assertEquals(1, list.size());
txOld = list.get(0);
assertTrue(tx.getId() == txOld.getId());
assertEquals("first transaction", txOld.getName());
s.commit();
ts.close();
s.close();
......@@ -357,14 +399,14 @@ public class TestTransactionStore extends TestBase {
s = MVStore.open(fileName);
ts = new TransactionStore(s);
tx = ts.begin();
assertEquals(1, tx.getId());
assertEquals(2, tx.getId());
m = tx.openMap("test");
assertEquals(null, m.get("1"));
m.put("2", "Hello");
list = ts.getOpenTransactions();
assertEquals(2, list.size());
txOld = list.get(0);
assertEquals(0, txOld.getId());
assertEquals(1, txOld.getId());
assertEquals(Transaction.STATUS_OPEN, txOld.getStatus());
assertEquals("first transaction", txOld.getName());
txOld.prepare();
......@@ -376,17 +418,16 @@ public class TestTransactionStore extends TestBase {
ts = new TransactionStore(s);
tx = ts.begin();
m = tx.openMap("test");
// TransactionStore was not closed, so we lost some ids
assertEquals(65, tx.getId());
assertEquals(2, tx.getId());
list = ts.getOpenTransactions();
assertEquals(2, list.size());
txOld = list.get(1);
assertEquals(1, txOld.getId());
assertEquals(2, txOld.getId());
assertEquals(Transaction.STATUS_OPEN, txOld.getStatus());
assertEquals(null, txOld.getName());
txOld.rollback();
txOld = list.get(0);
assertEquals(0, txOld.getId());
assertEquals(1, txOld.getId());
assertEquals(Transaction.STATUS_PREPARED, txOld.getStatus());
assertEquals("first transaction", txOld.getName());
txOld.commit();
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论