Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
d7efb172
提交
d7efb172
authored
10月 04, 2018
作者:
Andrei Tokar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
better determination of a blocking transaction deadlock detection
上级
7a296ebb
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
21 行增加
和
11 行删除
+21
-11
Transaction.java
h2/src/main/org/h2/mvstore/tx/Transaction.java
+8
-4
TxDecisionMaker.java
h2/src/main/org/h2/mvstore/tx/TxDecisionMaker.java
+13
-7
没有找到文件。
h2/src/main/org/h2/mvstore/tx/Transaction.java
浏览文件 @
d7efb172
...
@@ -175,7 +175,7 @@ public class Transaction {
...
@@ -175,7 +175,7 @@ public class Transaction {
* @param status to be set
* @param status to be set
* @return transaction state as it was before status change
* @return transaction state as it was before status change
*/
*/
long
setStatus
(
int
status
)
{
private
long
setStatus
(
int
status
)
{
while
(
true
)
{
while
(
true
)
{
long
currentState
=
statusAndLogId
.
get
();
long
currentState
=
statusAndLogId
.
get
();
long
logId
=
getLogId
(
currentState
);
long
logId
=
getLogId
(
currentState
);
...
@@ -486,11 +486,13 @@ public class Transaction {
...
@@ -486,11 +486,13 @@ public class Transaction {
"Transaction %d attempts to update map <%s> entry with key <%s>"
"Transaction %d attempts to update map <%s> entry with key <%s>"
+
" modified by transaction %s%n"
,
+
" modified by transaction %s%n"
,
transactionId
,
blockingMap
.
getName
(),
blockingKey
,
toWaitFor
));
transactionId
,
blockingMap
.
getName
(),
blockingKey
,
toWaitFor
));
if
(
isDeadlocked
(
toWaitFor
))
{
throw
DataUtils
.
newIllegalStateException
(
DataUtils
.
ERROR_TRANSACTIONS_DEADLOCK
,
throw
DataUtils
.
newIllegalStateException
(
DataUtils
.
ERROR_TRANSACTIONS_DEADLOCK
,
details
.
toString
());
details
.
toString
());
}
}
}
}
}
}
}
blockingTransaction
=
toWaitFor
;
blockingTransaction
=
toWaitFor
;
try
{
try
{
...
@@ -515,8 +517,10 @@ public class Transaction {
...
@@ -515,8 +517,10 @@ public class Transaction {
private
synchronized
boolean
waitForThisToEnd
(
int
millis
)
{
private
synchronized
boolean
waitForThisToEnd
(
int
millis
)
{
long
until
=
System
.
currentTimeMillis
()
+
millis
;
long
until
=
System
.
currentTimeMillis
()
+
millis
;
long
state
;
int
status
;
int
status
;
while
((
status
=
getStatus
())
!=
STATUS_CLOSED
&&
status
!=
STATUS_ROLLING_BACK
)
{
while
((
status
=
getStatus
(
state
=
statusAndLogId
.
get
()))
!=
STATUS_CLOSED
&&
status
!=
STATUS_ROLLED_BACK
&&
!
hasRollback
(
state
))
{
long
dur
=
until
-
System
.
currentTimeMillis
();
long
dur
=
until
-
System
.
currentTimeMillis
();
if
(
dur
<=
0
)
{
if
(
dur
<=
0
)
{
return
false
;
return
false
;
...
...
h2/src/main/org/h2/mvstore/tx/TxDecisionMaker.java
浏览文件 @
d7efb172
...
@@ -49,7 +49,7 @@ abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue> {
...
@@ -49,7 +49,7 @@ abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue> {
// because a tree root has definitely been changed.
// because a tree root has definitely been changed.
logIt
(
existingValue
.
value
==
null
?
null
:
VersionedValue
.
getInstance
(
existingValue
.
value
));
logIt
(
existingValue
.
value
==
null
?
null
:
VersionedValue
.
getInstance
(
existingValue
.
value
));
decision
=
MVMap
.
Decision
.
PUT
;
decision
=
MVMap
.
Decision
.
PUT
;
}
else
if
(
fetchTransaction
(
blockingId
)
!=
null
)
{
}
else
if
(
getBlockingTransaction
(
)
!=
null
)
{
// this entry comes from a different transaction, and this
// this entry comes from a different transaction, and this
// transaction is not committed yet
// transaction is not committed yet
// should wait on blockingTransaction that was determined earlier
// should wait on blockingTransaction that was determined earlier
...
@@ -106,11 +106,17 @@ abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue> {
...
@@ -106,11 +106,17 @@ abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue> {
}
}
final
boolean
isCommitted
(
int
transactionId
)
{
final
boolean
isCommitted
(
int
transactionId
)
{
return
transaction
.
store
.
committingTransactions
.
get
().
get
(
transactionId
);
Transaction
blockingTx
;
}
boolean
result
;
do
{
blockingTx
=
transaction
.
store
.
getTransaction
(
transactionId
);
result
=
transaction
.
store
.
committingTransactions
.
get
().
get
(
transactionId
);
}
while
(
blockingTx
!=
transaction
.
store
.
getTransaction
(
transactionId
));
final
Transaction
fetchTransaction
(
int
transactionId
)
{
if
(!
result
)
{
return
(
blockingTransaction
=
transaction
.
store
.
getTransaction
(
transactionId
));
blockingTransaction
=
blockingTx
;
}
return
result
;
}
}
final
MVMap
.
Decision
setDecision
(
MVMap
.
Decision
d
)
{
final
MVMap
.
Decision
setDecision
(
MVMap
.
Decision
d
)
{
...
@@ -167,7 +173,7 @@ abstract class TxDecisionMaker extends MVMap.DecisionMaker<VersionedValue> {
...
@@ -167,7 +173,7 @@ 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
(
getBlockingTransaction
(
)
!=
null
)
{
// this entry comes from a different transaction, and this
// this entry comes from a different transaction, and this
// transaction is not committed yet
// transaction is not committed yet
// should wait on blockingTransaction that was determined
// should wait on blockingTransaction that was determined
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论