提交 7ff15eab authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov

Fix long lines and indentation

上级 17db86f1
...@@ -281,7 +281,8 @@ public class TransactionMap<K, V> { ...@@ -281,7 +281,8 @@ public class TransactionMap<K, V> {
Page mapRootPage = mapRootReference.root; Page mapRootPage = mapRootReference.root;
current = map.get(mapRootPage, key); current = map.get(mapRootPage, key);
VersionedValue old = getValue(mapRootPage, undoLogRootReference.root, key, readLogId, current, committingTransactions); VersionedValue old = getValue(mapRootPage, undoLogRootReference.root, key, readLogId, current,
committingTransactions);
if (!map.areValuesEqual(old, current)) { if (!map.areValuesEqual(old, current)) {
assert current != null; assert current != null;
long tx = TransactionStore.getTransactionId(current.getOperationId()); long tx = TransactionStore.getTransactionId(current.getOperationId());
...@@ -681,8 +682,7 @@ public class TransactionMap<K, V> { ...@@ -681,8 +682,7 @@ public class TransactionMap<K, V> {
private static final class KeyIterator<K> extends TMIterator<K,K> { private static final class KeyIterator<K> extends TMIterator<K,K> {
public KeyIterator(TransactionMap<K, ?> transactionMap, public KeyIterator(TransactionMap<K, ?> transactionMap, K from, K to, boolean includeUncommitted) {
K from, K to, boolean includeUncommitted) {
super(transactionMap, from, to, includeUncommitted); super(transactionMap, from, to, includeUncommitted);
} }
...@@ -714,8 +714,7 @@ public class TransactionMap<K, V> { ...@@ -714,8 +714,7 @@ public class TransactionMap<K, V> {
private final boolean includeAllUncommitted; private final boolean includeAllUncommitted;
private X current; private X current;
protected TMIterator(TransactionMap<K,?> transactionMap, K from, K to, boolean includeAllUncommitted) protected TMIterator(TransactionMap<K,?> transactionMap, K from, K to, boolean includeAllUncommitted) {
{
this.transactionMap = transactionMap; this.transactionMap = transactionMap;
TransactionStore store = transactionMap.transaction.store; TransactionStore store = transactionMap.transaction.store;
MVMap<K, VersionedValue> map = transactionMap.map; MVMap<K, VersionedValue> map = transactionMap.map;
...@@ -726,7 +725,8 @@ public class TransactionMap<K, V> { ...@@ -726,7 +725,8 @@ public class TransactionMap<K, V> {
committingTransactions = store.committingTransactions.get(); committingTransactions = store.committingTransactions.get();
undoRoot = store.undoLog.getRootPage(); undoRoot = store.undoLog.getRootPage();
mapRootReference = map.getRoot(); mapRootReference = map.getRoot();
} while(committingTransactions != store.committingTransactions.get() || undoRoot != store.undoLog.getRootPage()); } while (committingTransactions != store.committingTransactions.get()
|| undoRoot != store.undoLog.getRootPage());
this.root = mapRootReference.root; this.root = mapRootReference.root;
this.undoRoot = undoRoot; this.undoRoot = undoRoot;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论