Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
c46eaa3f
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,发现更多精彩内容 >>
提交
c46eaa3f
编写于
1月 05, 2018
作者:
A
Alexander Fedorov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#2556 reuse DBRResult for PostgreDebugSession
Former-commit-id:
7ad9be85
上级
45a22ca3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
50 deletion
+16
-50
plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF
plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF
+3
-1
plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/impl/PostgreDebugSession.java
...t/postgresql/debug/internal/impl/PostgreDebugSession.java
+5
-4
plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/impl/PostgreDebugSessionResult.java
...gresql/debug/internal/impl/PostgreDebugSessionResult.java
+0
-41
plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/impl/PostgreDebugSessionWorker.java
...gresql/debug/internal/impl/PostgreDebugSessionWorker.java
+8
-4
未找到文件。
plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF
浏览文件 @
c46eaa3f
...
...
@@ -12,4 +12,6 @@ Require-Bundle: org.eclipse.core.runtime,
Export-Package: org.jkiss.dbeaver.debug,
org.jkiss.dbeaver.debug.core,
org.jkiss.dbeaver.debug.core.breakpoints,
org.jkiss.dbeaver.debug.core.model
org.jkiss.dbeaver.debug.core.model,
org.jkiss.dbeaver.runtime,
org.jkiss.dbeaver.runtime.core
plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/impl/PostgreDebugSession.java
浏览文件 @
c46eaa3f
...
...
@@ -30,6 +30,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import
org.jkiss.dbeaver.debug.*
;
import
org.jkiss.dbeaver.debug.DBGBreakpoint
;
import
org.jkiss.dbeaver.runtime.DBRResult
;
@SuppressWarnings
(
"nls"
)
public
class
PostgreDebugSession
implements
DBGSession
<
PostgreDebugSessionInfo
,
PostgreDebugObject
,
Integer
>
{
...
...
@@ -68,7 +69,7 @@ public class PostgreDebugSession implements DBGSession<PostgreDebugSessionInfo,
private
PostgreDebugSessionWorker
worker
;
private
FutureTask
<
PostgreDebugSession
Result
>
task
;
private
FutureTask
<
DBR
Result
>
task
;
private
Thread
workerThread
=
null
;
...
...
@@ -348,7 +349,7 @@ public class PostgreDebugSession implements DBGSession<PostgreDebugSessionInfo,
if
(
task
.
isDone
())
{
PostgreDebugSession
Result
res
;
DBR
Result
res
;
try
{
res
=
task
.
get
();
...
...
@@ -360,7 +361,7 @@ public class PostgreDebugSession implements DBGSession<PostgreDebugSessionInfo,
System
.
out
.
println
(
"WARNING "
+
res
.
getException
().
getMessage
());
}
return
res
.
is
Result
();
return
res
.
is
OK
();
}
...
...
@@ -376,7 +377,7 @@ public class PostgreDebugSession implements DBGSession<PostgreDebugSessionInfo,
worker
.
execSQL
(
commandSQL
);
task
=
new
FutureTask
<
PostgreDebugSession
Result
>(
worker
);
task
=
new
FutureTask
<
DBR
Result
>(
worker
);
workerThread
=
new
Thread
(
task
);
...
...
plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/impl/PostgreDebugSessionResult.java
已删除
100644 → 0
浏览文件 @
45a22ca3
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
* Copyright (C) 2017 Andrew Khitrin (ahitrin@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.jkiss.dbeaver.ext.postgresql.debug.internal.impl
;
public
class
PostgreDebugSessionResult
{
private
final
boolean
result
;
private
final
Exception
exception
;
public
PostgreDebugSessionResult
(
boolean
result
,
Exception
exception
)
{
super
();
this
.
result
=
result
;
this
.
exception
=
exception
;
}
public
boolean
isResult
()
{
return
result
;
}
public
Exception
getException
()
{
return
exception
;
}
}
plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/impl/PostgreDebugSessionWorker.java
浏览文件 @
c46eaa3f
...
...
@@ -23,7 +23,10 @@ import java.sql.SQLException;
import
java.sql.Statement
;
import
java.util.concurrent.Callable
;
public
class
PostgreDebugSessionWorker
implements
Callable
<
PostgreDebugSessionResult
>
{
import
org.jkiss.dbeaver.runtime.DBRResult
;
import
org.jkiss.dbeaver.runtime.DefaultResult
;
public
class
PostgreDebugSessionWorker
implements
Callable
<
DBRResult
>
{
private
final
Connection
conn
;
private
String
sql
=
""
;
...
...
@@ -39,15 +42,16 @@ public class PostgreDebugSessionWorker implements Callable<PostgreDebugSessionRe
}
@Override
public
PostgreDebugSession
Result
call
()
throws
Exception
public
DBR
Result
call
()
throws
Exception
{
try
(
Statement
stmt
=
conn
.
createStatement
())
{
stmt
.
executeQuery
(
sql
);
return
new
PostgreDebugSessionResult
(
true
,
null
);
return
DefaultResult
.
ok
(
);
}
catch
(
SQLException
e
)
{
return
new
PostgreDebugSessionResult
(
false
,
e
);
String
message
=
String
.
format
(
"Failed to execute %s"
,
sql
);
return
DefaultResult
.
error
(
message
,
e
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录