Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
17486ff6
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,发现更多精彩内容 >>
提交
17486ff6
编写于
12月 01, 2016
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Object refresh redesign (use deep copy instead of replace)
上级
ef21d658
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
57 addition
and
8 deletion
+57
-8
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java
...d/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java
+1
-1
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTable.java
...sql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTable.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java
...src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java
+42
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCObjectLookupCache.java
.../dbeaver/model/impl/jdbc/cache/JDBCObjectLookupCache.java
+5
-3
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCStructLookupCache.java
.../dbeaver/model/impl/jdbc/cache/JDBCStructLookupCache.java
+8
-3
未找到文件。
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java
浏览文件 @
17486ff6
...
...
@@ -636,7 +636,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
@Override
public
void
refreshPart
(
Object
source
,
boolean
force
)
{
refreshDiagram
(
f
orc
e
);
refreshDiagram
(
f
als
e
);
}
public
void
saveDiagramAs
()
...
...
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLTable.java
浏览文件 @
17486ff6
...
...
@@ -91,7 +91,7 @@ public class MySQLTable extends MySQLTableBase
}
}
private
SimpleObjectCache
<
MySQLTable
,
MySQLTableForeignKey
>
foreignKeys
=
new
SimpleObjectCache
<>();
private
final
SimpleObjectCache
<
MySQLTable
,
MySQLTableForeignKey
>
foreignKeys
=
new
SimpleObjectCache
<>();
private
final
PartitionCache
partitionCache
=
new
PartitionCache
();
private
final
AdditionalInfo
additionalInfo
=
new
AdditionalInfo
();
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java
浏览文件 @
17486ff6
...
...
@@ -26,6 +26,8 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import
org.jkiss.dbeaver.model.sql.SQLDataSource
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.Modifier
;
import
java.util.*
;
/**
...
...
@@ -246,6 +248,46 @@ public abstract class AbstractObjectCache<OWNER extends DBSObject, OBJECT extend
return
name
;
}
/**
* Performs a deep copy of srcObject into dstObject.
* Copies all fields (recursively) and clears all nested caches
*/
protected
void
deepCopyCachedObject
(
@NotNull
Object
srcObject
,
@NotNull
Object
dstObject
)
{
if
(
srcObject
.
getClass
()
!=
dstObject
.
getClass
())
{
log
.
error
(
"Can't make object opy: src class "
+
srcObject
.
getClass
().
getName
()
+
"' != dest class '"
+
dstObject
.
getClass
().
getName
()
+
"'"
);
return
;
}
try
{
for
(
Class
theClass
=
srcObject
.
getClass
();
theClass
!=
Object
.
class
;
theClass
=
theClass
.
getSuperclass
())
{
final
Field
[]
fields
=
theClass
.
getDeclaredFields
();
for
(
Field
field
:
fields
)
{
final
int
modifiers
=
field
.
getModifiers
();
if
(
Modifier
.
isStatic
(
modifiers
))
{
continue
;
}
field
.
setAccessible
(
true
);
final
Object
srcValue
=
field
.
get
(
srcObject
);
final
Object
dstValue
=
field
.
get
(
dstObject
);
if
(
DBSObjectCache
.
class
.
isAssignableFrom
(
field
.
getType
()))
{
((
DBSObjectCache
)
dstValue
).
clearCache
();
}
else
{
if
(
Modifier
.
isFinal
(
modifiers
))
{
// Can't copy final. Let's try to make recursive copy
// Just in case check that values not null and have the same type
if
(
dstValue
!=
null
&&
srcValue
!=
null
&&
dstValue
.
getClass
()
==
srcValue
.
getClass
())
{
deepCopyCachedObject
(
srcValue
,
dstValue
);
}
}
else
{
field
.
set
(
dstObject
,
srcValue
);
}
}
}
}
}
catch
(
Throwable
e
)
{
log
.
error
(
"Error copying object state"
,
e
);
}
}
protected
class
CacheIterator
implements
Iterator
<
OBJECT
>
{
private
Iterator
<
OBJECT
>
listIterator
=
objectList
.
iterator
();
private
OBJECT
curObject
;
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCObjectLookupCache.java
浏览文件 @
17486ff6
...
...
@@ -74,11 +74,13 @@ public abstract class JDBCObjectLookupCache<OWNER extends DBSObject, OBJECT exte
this
.
loadObjects
(
monitor
,
owner
);
}
else
{
OBJECT
newObject
=
this
.
reloadObject
(
monitor
,
owner
,
oldObject
,
null
);
removeObject
(
oldObject
,
false
);
if
(
newObject
!=
null
)
{
cacheObject
(
newObject
);
deepCopyCachedObject
(
newObject
,
oldObject
);
//cacheObject(newObject);
}
else
{
removeObject
(
oldObject
,
false
);
}
return
new
Object
;
return
old
Object
;
}
return
getCachedObject
(
objectName
);
}
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCStructLookupCache.java
浏览文件 @
17486ff6
...
...
@@ -79,11 +79,16 @@ public abstract class JDBCStructLookupCache<OWNER extends DBSObject, OBJECT exte
if
(
isChildrenCached
(
oldObject
))
{
clearChildrenCache
(
oldObject
);
}
removeObject
(
oldObject
,
false
);
if
(
newObject
!=
null
)
{
cacheObject
(
newObject
);
deepCopyCachedObject
(
newObject
,
oldObject
);
}
else
{
removeObject
(
oldObject
,
false
);
}
return
newObject
;
// removeObject(oldObject, false);
// if (newObject != null) {
// cacheObject(newObject);
// }
return
oldObject
;
}
return
getCachedObject
(
objectName
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录