Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
146d1d26
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,发现更多精彩内容 >>
提交
146d1d26
编写于
5月 21, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3470 QM event browser: local session mode added
上级
5c20bc8f
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
16 addition
and
10 deletion
+16
-10
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMControllerImpl.java
...re/src/org/jkiss/dbeaver/runtime/qm/QMControllerImpl.java
+6
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/querylog/QueryLogViewer.java
...rg/jkiss/dbeaver/ui/controls/querylog/QueryLogViewer.java
+4
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/TransactionInfoDialog.java
.../jkiss/dbeaver/ui/controls/txn/TransactionInfoDialog.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/log/SQLLogPanel.java
...src/org/jkiss/dbeaver/ui/editors/sql/log/SQLLogPanel.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/qm/QueryManagerView.java
...e/src/org/jkiss/dbeaver/ui/views/qm/QueryManagerView.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/qm/QMController.java
...er.model/src/org/jkiss/dbeaver/model/qm/QMController.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/qm/QMUtils.java
...dbeaver.model/src/org/jkiss/dbeaver/model/qm/QMUtils.java
+2
-2
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMControllerImpl.java
浏览文件 @
146d1d26
...
...
@@ -45,6 +45,7 @@ public class QMControllerImpl implements QMController {
private
QMMCollectorImpl
metaHandler
;
private
final
List
<
QMExecutionHandler
>
handlers
=
new
ArrayList
<>();
private
QMEventBrowser
eventBrowser
;
private
DefaultEventBrowser
defaultEventBrowser
=
new
DefaultEventBrowser
();
public
QMControllerImpl
()
{
defaultHandler
=
(
QMExecutionHandler
)
Proxy
.
newProxyInstance
(
...
...
@@ -85,12 +86,15 @@ public class QMControllerImpl implements QMController {
}
@Override
public
synchronized
QMEventBrowser
getEventBrowser
()
{
public
synchronized
QMEventBrowser
getEventBrowser
(
boolean
currentSessionOnly
)
{
if
(
currentSessionOnly
)
{
return
defaultEventBrowser
;
}
if
(
eventBrowser
==
null
)
{
eventBrowser
=
Adapters
.
adapt
(
this
,
QMEventBrowser
.
class
);
if
(
eventBrowser
==
null
)
{
// Default browser
eventBrowser
=
new
DefaultEventBrowser
()
;
this
.
eventBrowser
=
defaultEventBrowser
;
}
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/querylog/QueryLogViewer.java
浏览文件 @
146d1d26
...
...
@@ -316,6 +316,7 @@ public class QueryLogViewer extends Viewer implements QMMetaListener, DBPPrefere
private
QMEventFilter
defaultFilter
=
new
DefaultEventFilter
();
private
QMEventFilter
filter
;
private
boolean
useDefaultFilter
=
true
;
private
boolean
currentSessionOnly
;
private
final
Color
colorLightGreen
;
private
final
Color
colorLightRed
;
...
...
@@ -329,11 +330,12 @@ public class QueryLogViewer extends Viewer implements QMMetaListener, DBPPrefere
private
int
entriesPerPage
=
MIN_ENTRIES_PER_PAGE
;
public
QueryLogViewer
(
Composite
parent
,
IWorkbenchPartSite
site
,
QMEventFilter
filter
,
boolean
showConnection
)
public
QueryLogViewer
(
Composite
parent
,
IWorkbenchPartSite
site
,
QMEventFilter
filter
,
boolean
showConnection
,
boolean
currentSessionOnly
)
{
super
();
this
.
site
=
site
;
this
.
currentSessionOnly
=
currentSessionOnly
;
// Prepare colors
...
...
@@ -1140,7 +1142,7 @@ public class QueryLogViewer extends Viewer implements QMMetaListener, DBPPrefere
@Override
public
List
<
QMMetaEvent
>
evaluate
(
DBRProgressMonitor
monitor
)
throws
InvocationTargetException
,
InterruptedException
{
final
List
<
QMMetaEvent
>
events
=
new
ArrayList
<>();
QMEventBrowser
eventBrowser
=
QMUtils
.
getEventBrowser
();
QMEventBrowser
eventBrowser
=
QMUtils
.
getEventBrowser
(
currentSessionOnly
);
if
(
eventBrowser
!=
null
)
{
QMEventCriteria
criteria
=
QMUtils
.
createDefaultCriteria
(
DBeaverCore
.
getGlobalPreferenceStore
());
criteria
.
setSearchString
(
CommonUtils
.
isEmptyTrimmed
(
searchString
)
?
null
:
searchString
.
trim
());
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/TransactionInfoDialog.java
浏览文件 @
146d1d26
...
...
@@ -62,7 +62,7 @@ public abstract class TransactionInfoDialog extends Dialog {
protected
void
createTransactionLogPanel
(
Composite
composite
)
{
DBCExecutionContext
context
=
getCurrentContext
();
QMEventFilter
filter
=
context
==
null
?
VOID_FILTER
:
createContextFilter
(
context
);
logViewer
=
new
QueryLogViewer
(
composite
,
activeEditor
.
getSite
(),
filter
,
false
);
logViewer
=
new
QueryLogViewer
(
composite
,
activeEditor
.
getSite
(),
filter
,
false
,
true
);
logViewer
.
setUseDefaultFilter
(
false
);
final
Object
gd
=
logViewer
.
getControl
().
getLayoutData
();
if
(
gd
instanceof
GridData
)
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/log/SQLLogPanel.java
浏览文件 @
146d1d26
...
...
@@ -40,7 +40,7 @@ public class SQLLogPanel extends Composite
gl
.
horizontalSpacing
=
0
;
setLayout
(
gl
);
queryLogViewer
=
new
QueryLogViewer
(
this
,
editor
.
getSite
(),
new
SQLLogFilter
(
editor
),
false
);
queryLogViewer
=
new
QueryLogViewer
(
this
,
editor
.
getSite
(),
new
SQLLogFilter
(
editor
),
false
,
true
);
}
public
QueryLogViewer
getQueryLogViewer
()
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/qm/QueryManagerView.java
浏览文件 @
146d1d26
...
...
@@ -41,7 +41,7 @@ public class QueryManagerView extends ViewPart
{
Composite
group
=
UIUtils
.
createPlaceholder
(
parent
,
1
);
queryLogViewer
=
new
QueryLogViewer
(
group
,
getSite
(),
null
,
true
);
queryLogViewer
=
new
QueryLogViewer
(
group
,
getSite
(),
null
,
true
,
false
);
UIUtils
.
setHelp
(
group
,
IHelpContextIds
.
CTX_QUERY_MANAGER
);
}
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/qm/QMController.java
浏览文件 @
146d1d26
...
...
@@ -26,7 +26,7 @@ public interface QMController {
QMExecutionHandler
getDefaultHandler
();
QMEventBrowser
getEventBrowser
();
QMEventBrowser
getEventBrowser
(
boolean
currentSessionOnly
);
void
registerHandler
(
QMExecutionHandler
handler
);
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/qm/QMUtils.java
浏览文件 @
146d1d26
...
...
@@ -71,11 +71,11 @@ public class QMUtils {
}
@Nullable
public
static
QMEventBrowser
getEventBrowser
()
{
public
static
QMEventBrowser
getEventBrowser
(
boolean
currentSessionOnly
)
{
if
(
application
==
null
)
{
return
null
;
}
return
application
.
getQueryManager
().
getEventBrowser
();
return
application
.
getQueryManager
().
getEventBrowser
(
currentSessionOnly
);
}
public
static
boolean
isTransactionActive
(
DBCExecutionContext
executionContext
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录