Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
d1808d72
提交
d1808d72
authored
6月 21, 2018
作者:
Andrei Tokar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
LockDecisionMakers adustments to match TxDecisionMaker logic for leftover map entry
上级
01977633
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
27 行增加
和
12 行删除
+27
-12
TxDecisionMaker.java
h2/src/main/org/h2/mvstore/tx/TxDecisionMaker.java
+27
-12
没有找到文件。
h2/src/main/org/h2/mvstore/tx/TxDecisionMaker.java
浏览文件 @
d1808d72
...
@@ -18,7 +18,7 @@ public abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue
...
@@ -18,7 +18,7 @@ public abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue
final
Object
value
;
final
Object
value
;
private
final
Transaction
transaction
;
private
final
Transaction
transaction
;
long
undoKey
;
long
undoKey
;
pr
ivate
long
lastOperationId
;
pr
otected
long
lastOperationId
;
private
Transaction
blockingTransaction
;
private
Transaction
blockingTransaction
;
private
MVMap
.
Decision
decision
;
private
MVMap
.
Decision
decision
;
...
@@ -54,16 +54,18 @@ public abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue
...
@@ -54,16 +54,18 @@ public abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue
// should wait on blockingTransaction that was determined earlier
// should wait on blockingTransaction that was determined earlier
decision
=
MVMap
.
Decision
.
ABORT
;
decision
=
MVMap
.
Decision
.
ABORT
;
}
else
if
(
id
==
lastOperationId
)
{
}
else
if
(
id
==
lastOperationId
)
{
// There is no transaction with that id,
so we've re
tried it just before,
// There is no transaction with that id,
and we've
tried it just before,
// but map root has not changed (which must be the case if we just missed a closed transaction),
// but map root has not changed (which must be the case if we just missed a closed transaction),
// therefore we came back here again.
// therefore we came back here again.
// Now we assume it's a leftover after unclean shutdown (map update was written but not undo log),
// Now we assume it's a leftover after unclean shutdown (map update was written but not undo log),
// and will effectively roll it back (just overwrite).
// and will effectively roll it back (just
assume committed value and
overwrite).
Object
committedValue
=
existingValue
.
getCommittedValue
();
Object
committedValue
=
existingValue
.
getCommittedValue
();
logIt
(
committedValue
==
null
?
null
:
VersionedValue
.
getInstance
(
committedValue
));
logIt
(
committedValue
==
null
?
null
:
VersionedValue
.
getInstance
(
committedValue
));
decision
=
MVMap
.
Decision
.
PUT
;
decision
=
MVMap
.
Decision
.
PUT
;
}
else
{
}
else
{
// condition above means transaction has been committed/rolled back and closed by now
// transaction has been committed/rolled back and is closed by now, so
// we can retry immediately and either that entry become committed
// or we'll hit case above
decision
=
MVMap
.
Decision
.
REPEAT
;
decision
=
MVMap
.
Decision
.
REPEAT
;
lastOperationId
=
id
;
lastOperationId
=
id
;
}
}
...
@@ -162,15 +164,28 @@ public abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue
...
@@ -162,15 +164,28 @@ public abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue
// and therefore will be committed soon
// and therefore will be committed soon
logIt
(
null
);
logIt
(
null
);
return
setDecision
(
MVMap
.
Decision
.
PUT
);
return
setDecision
(
MVMap
.
Decision
.
PUT
);
}
else
if
(
fetchTransaction
(
blockingId
)
==
null
)
{
}
else
if
(
fetchTransaction
(
blockingId
)
!=
null
)
{
// map already has specified key from uncommitted
// this entry comes from a different transaction, and this transaction is not committed yet
// at the time transaction, which is closed by now
// should wait on blockingTransaction that was determined earlier and then try again
// we can retry right away
return
setDecision
(
MVMap
.
Decision
.
REPEAT
);
}
else
{
// map already has specified key from uncommitted transaction
// we need to wait for it to close and then try again
return
setDecision
(
MVMap
.
Decision
.
ABORT
);
return
setDecision
(
MVMap
.
Decision
.
ABORT
);
}
else
if
(
id
==
lastOperationId
)
{
// There is no transaction with that id, and we've tried it just before,
// but map root has not changed (which must be the case if we just missed a closed transaction),
// therefore we came back here again.
// Now we assume it's a leftover after unclean shutdown (map update was written but not undo log),
// and will effectively roll it back (just assume committed value and overwrite).
Object
committedValue
=
existingValue
.
getCommittedValue
();
if
(
committedValue
!=
null
)
{
return
setDecision
(
MVMap
.
Decision
.
ABORT
);
}
logIt
(
null
);
return
setDecision
(
MVMap
.
Decision
.
PUT
);
}
else
{
// transaction has been committed/rolled back and is closed by now, so
// we can retry immediately and either that entry become committed
// or we'll hit case above
lastOperationId
=
id
;
return
setDecision
(
MVMap
.
Decision
.
REPEAT
);
}
}
}
}
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论