Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
127c1275
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
127c1275
编写于
9月 25, 2020
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#9705 Lock data read during row refresh
Former-commit-id:
68c8898b
上级
c11987b9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
12 deletion
+28
-12
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetPersister.java
...iss/dbeaver/ui/controls/resultset/ResultSetPersister.java
+4
-0
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
.../jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+24
-12
未找到文件。
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetPersister.java
浏览文件 @
127c1275
...
@@ -1022,6 +1022,9 @@ class ResultSetPersister {
...
@@ -1022,6 +1022,9 @@ class ResultSetPersister {
@Override
@Override
protected
IStatus
run
(
DBRProgressMonitor
monitor
)
{
protected
IStatus
run
(
DBRProgressMonitor
monitor
)
{
if
(!
viewer
.
acquireDataReadLock
())
{
return
Status
.
CANCEL_STATUS
;
}
monitor
.
beginTask
(
"Refresh updated rows"
,
1
);
monitor
.
beginTask
(
"Refresh updated rows"
,
1
);
try
{
try
{
final
Object
[][]
refreshValues
=
new
Object
[
rows
.
size
()][];
final
Object
[][]
refreshValues
=
new
Object
[
rows
.
size
()][];
...
@@ -1090,6 +1093,7 @@ class ResultSetPersister {
...
@@ -1090,6 +1093,7 @@ class ResultSetPersister {
}
}
}
finally
{
}
finally
{
monitor
.
done
();
monitor
.
done
();
viewer
.
releaseDataReadLock
();
}
}
return
Status
.
OK_STATUS
;
return
Status
.
OK_STATUS
;
}
}
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @
127c1275
...
@@ -3695,6 +3695,26 @@ public class ResultSetViewer extends Viewer
...
@@ -3695,6 +3695,26 @@ public class ResultSetViewer extends Viewer
}
}
}
}
void
releaseDataReadLock
()
{
synchronized
(
dataPumpJobQueue
)
{
if
(!
dataPumpRunning
.
get
())
{
log
.
debug
(
"Internal error: data read status is empty"
);
}
dataPumpRunning
.
set
(
false
);
}
}
boolean
acquireDataReadLock
()
{
synchronized
(
dataPumpJobQueue
)
{
if
(
dataPumpRunning
.
get
())
{
log
.
debug
(
"Internal error: multiple data reads started ("
+
dataPumpJobQueue
+
")"
);
return
false
;
}
dataPumpRunning
.
set
(
true
);
}
return
true
;
}
public
void
clearData
()
public
void
clearData
()
{
{
this
.
model
.
releaseAllData
();
this
.
model
.
releaseAllData
();
...
@@ -4413,12 +4433,8 @@ public class ResultSetViewer extends Viewer
...
@@ -4413,12 +4433,8 @@ public class ResultSetViewer extends Viewer
@Override
@Override
protected
IStatus
run
(
DBRProgressMonitor
monitor
)
{
protected
IStatus
run
(
DBRProgressMonitor
monitor
)
{
synchronized
(
dataPumpJobQueue
)
{
if
(!
acquireDataReadLock
())
{
if
(
dataPumpRunning
.
get
())
{
return
Status
.
CANCEL_STATUS
;
log
.
debug
(
"Internal error: multiple data reads started ("
+
dataPumpJobQueue
+
")"
);
return
Status
.
CANCEL_STATUS
;
}
dataPumpRunning
.
set
(
true
);
}
}
beforeDataRead
();
beforeDataRead
();
try
{
try
{
...
@@ -4426,12 +4442,7 @@ public class ResultSetViewer extends Viewer
...
@@ -4426,12 +4442,7 @@ public class ResultSetViewer extends Viewer
afterDataRead
();
afterDataRead
();
return
status
;
return
status
;
}
finally
{
}
finally
{
synchronized
(
dataPumpJobQueue
)
{
releaseDataReadLock
();
if
(!
dataPumpRunning
.
get
())
{
log
.
debug
(
"Internal error: data read status is empty"
);
}
dataPumpRunning
.
set
(
false
);
}
}
}
}
}
...
@@ -4559,4 +4570,5 @@ public class ResultSetViewer extends Viewer
...
@@ -4559,4 +4570,5 @@ public class ResultSetViewer extends Viewer
});
});
}
}
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录