Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yiicenne
DolphinScheduler
提交
df04c4ae
DolphinScheduler
项目概览
yiicenne
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
df04c4ae
编写于
5月 15, 2022
作者:
a9236229028
提交者:
GitHub
5月 15, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[fix-9991][worker]fix statement is closed before resultSet.getMetaData() (#10014)
上级
baf654cb
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
6 addition
and
16 deletion
+6
-16
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
.../org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
+6
-16
未找到文件。
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
浏览文件 @
df04c4ae
...
...
@@ -179,7 +179,6 @@ public class SqlTask extends AbstractTaskExecutor {
List
<
SqlBinds
>
postStatementsBinds
,
List
<
String
>
createFuncs
)
throws
Exception
{
Connection
connection
=
null
;
ResultSet
resultSet
=
null
;
try
{
// create connection
...
...
@@ -197,8 +196,7 @@ public class SqlTask extends AbstractTaskExecutor {
// decide whether to executeQuery or executeUpdate based on sqlType
if
(
sqlParameters
.
getSqlType
()
==
SqlType
.
QUERY
.
ordinal
())
{
// query statements need to be convert to JsonArray and inserted into Alert to send
resultSet
=
executeQuery
(
connection
,
mainStatementsBinds
.
get
(
0
),
"main"
);
result
=
resultProcess
(
resultSet
);
result
=
executeQuery
(
connection
,
mainStatementsBinds
.
get
(
0
),
"main"
);
}
else
if
(
sqlParameters
.
getSqlType
()
==
SqlType
.
NON_QUERY
.
ordinal
())
{
// non query statement
String
updateResult
=
executeUpdate
(
connection
,
mainStatementsBinds
,
"main"
);
...
...
@@ -213,7 +211,7 @@ public class SqlTask extends AbstractTaskExecutor {
logger
.
error
(
"execute sql error: {}"
,
e
.
getMessage
());
throw
e
;
}
finally
{
close
(
resultSet
,
connection
);
close
(
connection
);
}
}
...
...
@@ -292,10 +290,11 @@ public class SqlTask extends AbstractTaskExecutor {
setTaskAlertInfo
(
taskAlertInfo
);
}
private
ResultSet
executeQuery
(
Connection
connection
,
SqlBinds
sqlBinds
,
String
handlerType
)
throws
Exception
{
private
String
executeQuery
(
Connection
connection
,
SqlBinds
sqlBinds
,
String
handlerType
)
throws
Exception
{
try
(
PreparedStatement
statement
=
prepareStatementAndBind
(
connection
,
sqlBinds
))
{
logger
.
info
(
"{} statement execute query, for sql: {}"
,
handlerType
,
sqlBinds
.
getSql
());
return
statement
.
executeQuery
();
ResultSet
resultSet
=
statement
.
executeQuery
();
return
resultProcess
(
resultSet
);
}
}
...
...
@@ -329,18 +328,9 @@ public class SqlTask extends AbstractTaskExecutor {
/**
* close jdbc resource
*
* @param resultSet resultSet
* @param connection connection
*/
private
void
close
(
ResultSet
resultSet
,
Connection
connection
)
{
if
(
resultSet
!=
null
)
{
try
{
resultSet
.
close
();
}
catch
(
SQLException
e
)
{
logger
.
error
(
"close result set error : {}"
,
e
.
getMessage
(),
e
);
}
}
private
void
close
(
Connection
connection
)
{
if
(
connection
!=
null
)
{
try
{
connection
.
close
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录