Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
61e4bdb7
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
61e4bdb7
编写于
8月 09, 2020
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#9284 PG partition stats read fix
Former-commit-id:
ba614fd7
上级
60d794d4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
10 deletion
+17
-10
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTable.java
.../org/jkiss/dbeaver/ext/postgresql/model/PostgreTable.java
+3
-3
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/StatisticsNavigatorNodeRenderer.java
...i/navigator/database/StatisticsNavigatorNodeRenderer.java
+14
-7
未找到文件。
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTable.java
浏览文件 @
61e4bdb7
...
...
@@ -169,11 +169,11 @@ public abstract class PostgreTable extends PostgreTableReal implements PostgreTa
@Override
public
long
getStatObjectSize
()
{
if
(
diskSpace
!=
null
&&
diskSpace
==
0
&&
subTables
!=
null
)
{
long
partSizeSum
=
0
;
if
(
diskSpace
!=
null
&&
subTables
!=
null
)
{
long
partSizeSum
=
diskSpace
;
for
(
PostgreTableInheritance
ti
:
subTables
)
{
PostgreTableBase
partTable
=
ti
.
getParentObject
();
if
(
partTable
instanceof
PostgreTableReal
)
{
if
(
partTable
.
isPartition
()
&&
partTable
instanceof
PostgreTableReal
)
{
partSizeSum
+=
((
PostgreTableReal
)
partTable
).
getStatObjectSize
();
}
}
...
...
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/StatisticsNavigatorNodeRenderer.java
浏览文件 @
61e4bdb7
...
...
@@ -313,11 +313,14 @@ public class StatisticsNavigatorNodeRenderer extends DefaultNavigatorNodeRendere
String
sizeText
;
int
percentFull
;
boolean
statsWasRead
=
false
;
DBSObject
parentObject
=
DBUtils
.
getPublicObject
(
object
.
getParentObject
());
DBNNode
parentNode
=
getParentItem
(
element
);
DBSObject
parentObject
=
parentNode
instanceof
DBNDatabaseNode
?
DBUtils
.
getPublicObject
(((
DBNDatabaseNode
)
parentNode
).
getObject
())
:
null
;
if
(
parentObject
instanceof
DBPObjectStatisticsCollector
)
{
// && !((DBPObjectStatisticsCollector) parentObject).isStatisticsCollected()
statsWasRead
=
((
DBPObjectStatisticsCollector
)
parentObject
).
isStatisticsCollected
();
}
else
{
statsWasRead
=
((
DBPObjectStatistics
)
object
).
hasStatistics
();
// If there is no stats collector then do not check for stats presence
// Because it will trigger stats read job which won't read any statistics (as there is no way to load it for individual object).
statsWasRead
=
true
;
//((DBPObjectStatistics) object).hasStatistics();
}
long
maxObjectSize
=
statsWasRead
?
getMaxObjectSize
((
TreeItem
)
event
.
item
)
:
-
1
;
...
...
@@ -358,10 +361,6 @@ public class StatisticsNavigatorNodeRenderer extends DefaultNavigatorNodeRendere
}
else
{
sizeText
=
"..."
;
percentFull
=
0
;
DBNNode
parentNode
=
element
.
getParentNode
();
while
(
parentNode
instanceof
DBNDatabaseFolder
)
{
parentNode
=
parentNode
.
getParentNode
();
}
if
(
parentNode
instanceof
DBNDatabaseNode
)
{
DBSObject
realParentObject
=
DBUtils
.
getPublicObject
(((
DBNDatabaseNode
)
parentNode
).
getObject
());
if
(!
readObjectStatistics
(
...
...
@@ -396,6 +395,14 @@ public class StatisticsNavigatorNodeRenderer extends DefaultNavigatorNodeRendere
}
}
private
DBNNode
getParentItem
(
DBNDatabaseNode
element
)
{
DBNNode
parentNode
=
element
.
getParentNode
();
while
(
parentNode
instanceof
DBNDatabaseFolder
)
{
parentNode
=
parentNode
.
getParentNode
();
}
return
parentNode
;
}
private
long
getMaxObjectSize
(
TreeItem
item
)
{
TreeItem
parentItem
=
item
.
getParentItem
();
Object
maxSize
=
parentItem
.
getData
(
DatabaseNavigatorTree
.
TREE_DATA_STAT_MAX_SIZE
);
...
...
@@ -461,7 +468,7 @@ public class StatisticsNavigatorNodeRenderer extends DefaultNavigatorNodeRendere
UIUtils
.
asyncExec
(()
->
{
try
{
if
(!
treeItem
.
isDisposed
())
{
treeItem
.
setData
(
"nav.stat.maxSize"
,
finalMaxStatSize
);
treeItem
.
setData
(
DatabaseNavigatorTree
.
TREE_DATA_STAT_MAX_SIZE
,
finalMaxStatSize
);
treeItem
.
getParent
().
redraw
();
}
}
finally
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录