Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
0d81945f
提交
0d81945f
authored
10 年前
作者:
noelgrandin@gmail.com
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add exclusive/shared mode of attempted lock to deadlock details message for improved debugging
上级
670bf2bc
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
6 行增加
和
4 行删除
+6
-4
MVTable.java
h2/src/main/org/h2/mvstore/db/MVTable.java
+3
-2
RegularTable.java
h2/src/main/org/h2/table/RegularTable.java
+3
-2
没有找到文件。
h2/src/main/org/h2/mvstore/db/MVTable.java
浏览文件 @
0d81945f
...
...
@@ -160,7 +160,7 @@ public class MVTable extends TableBase {
ArrayList
<
Session
>
sessions
=
checkDeadlock
(
session
,
null
,
null
);
if
(
sessions
!=
null
)
{
throw
DbException
.
get
(
ErrorCode
.
DEADLOCK_1
,
getDeadlockDetails
(
sessions
));
getDeadlockDetails
(
sessions
,
exclusive
));
}
}
else
{
// check for deadlocks from now on
...
...
@@ -239,7 +239,7 @@ public class MVTable extends TableBase {
return
false
;
}
private
static
String
getDeadlockDetails
(
ArrayList
<
Session
>
sessions
)
{
private
static
String
getDeadlockDetails
(
ArrayList
<
Session
>
sessions
,
boolean
exclusive
)
{
// We add the thread details here to make it easier for customers to
// match up these error messages with their own logs.
StringBuilder
buff
=
new
StringBuilder
();
...
...
@@ -249,6 +249,7 @@ public class MVTable extends TableBase {
buff
.
append
(
"\nSession "
).
append
(
s
.
toString
())
.
append
(
" on thread "
).
append
(
thread
.
getName
())
.
append
(
" is waiting to lock "
).
append
(
lock
.
toString
())
.
append
(
exclusive
?
" (exclusive)"
:
" (shared)"
)
.
append
(
" while locking "
);
int
i
=
0
;
for
(
Table
t
:
s
.
getLocks
())
{
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/table/RegularTable.java
浏览文件 @
0d81945f
...
...
@@ -490,7 +490,7 @@ public class RegularTable extends TableBase {
if
(
checkDeadlock
)
{
ArrayList
<
Session
>
sessions
=
checkDeadlock
(
session
,
null
,
null
);
if
(
sessions
!=
null
)
{
throw
DbException
.
get
(
ErrorCode
.
DEADLOCK_1
,
getDeadlockDetails
(
sessions
));
throw
DbException
.
get
(
ErrorCode
.
DEADLOCK_1
,
getDeadlockDetails
(
sessions
,
exclusive
));
}
}
else
{
// check for deadlocks from now on
...
...
@@ -566,7 +566,7 @@ public class RegularTable extends TableBase {
}
return
false
;
}
private
static
String
getDeadlockDetails
(
ArrayList
<
Session
>
sessions
)
{
private
static
String
getDeadlockDetails
(
ArrayList
<
Session
>
sessions
,
boolean
exclusive
)
{
// We add the thread details here to make it easier for customers to
// match up these error messages with their own logs.
StringBuilder
buff
=
new
StringBuilder
();
...
...
@@ -579,6 +579,7 @@ public class RegularTable extends TableBase {
append
(
thread
.
getName
()).
append
(
" is waiting to lock "
).
append
(
lock
.
toString
()).
append
(
exclusive
?
" (exclusive)"
:
" (shared)"
).
append
(
" while locking "
);
int
i
=
0
;
for
(
Table
t
:
s
.
getLocks
())
{
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论