Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
22d6afa4
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
707
Star
9572
Fork
3514
代码
文件
提交
分支
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,发现更多精彩内容 >>
未验证
提交
22d6afa4
编写于
8月 22, 2022
作者:
W
Wenjun Ruan
提交者:
GitHub
8月 22, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #65 from WhaleOps/whaleops/leak
Fix some resource leak (#11576)
上级
307151cf
2fd43b07
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
28 addition
and
24 deletion
+28
-24
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FileUtils.java
...java/org/apache/dolphinscheduler/api/utils/FileUtils.java
+3
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/SchemaUtils.java
.../org/apache/dolphinscheduler/dao/upgrade/SchemaUtils.java
+3
-2
dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/UpgradeDao.java
...che/dolphinscheduler/tools/datasource/dao/UpgradeDao.java
+22
-20
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FileUtils.java
浏览文件 @
22d6afa4
...
...
@@ -20,6 +20,7 @@ import org.apache.commons.io.IOUtils;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.net.MalformedURLException
;
import
java.nio.charset.StandardCharsets
;
import
java.nio.file.Path
;
...
...
@@ -76,8 +77,8 @@ public class FileUtils {
* @return file content string
*/
public
static
String
file2String
(
MultipartFile
file
)
{
try
{
return
IOUtils
.
toString
(
file
.
getInputStream
()
,
StandardCharsets
.
UTF_8
);
try
(
InputStream
inputStream
=
file
.
getInputStream
())
{
return
IOUtils
.
toString
(
inputStream
,
StandardCharsets
.
UTF_8
);
}
catch
(
IOException
e
)
{
logger
.
error
(
"file convert to string failed: {}"
,
file
.
getName
());
}
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/SchemaUtils.java
浏览文件 @
22d6afa4
...
...
@@ -24,6 +24,7 @@ import org.apache.commons.lang.StringUtils;
import
java.io.File
;
import
java.io.FileNotFoundException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.List
;
...
...
@@ -108,8 +109,8 @@ public class SchemaUtils {
public
static
String
getSoftVersion
()
throws
IOException
{
final
ClassPathResource
softVersionFile
=
new
ClassPathResource
(
"sql/soft_version"
);
String
softVersion
;
try
{
softVersion
=
FileUtils
.
readFile2Str
(
softVersionFile
.
getInputStream
()
);
try
(
InputStream
inputStream
=
softVersionFile
.
getInputStream
())
{
softVersion
=
FileUtils
.
readFile2Str
(
inputStream
);
softVersion
=
Strings
.
nullToEmpty
(
softVersion
).
replaceAll
(
"\\s+|\r|\n"
,
""
);
}
catch
(
FileNotFoundException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
...
...
dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/UpgradeDao.java
浏览文件 @
22d6afa4
...
...
@@ -106,8 +106,9 @@ public abstract class UpgradeDao {
try
(
Connection
conn
=
dataSource
.
getConnection
())
{
// Execute the dolphinscheduler_ddl.sql script to create the table structure of dolphinscheduler
ScriptRunner
initScriptRunner
=
new
ScriptRunner
(
conn
,
true
,
true
);
Reader
initSqlReader
=
new
InputStreamReader
(
mysqlSQLFilePath
.
getInputStream
());
try
(
Reader
initSqlReader
=
new
InputStreamReader
(
mysqlSQLFilePath
.
getInputStream
()))
{
initScriptRunner
.
runScript
(
initSqlReader
);
}
}
catch
(
Exception
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
throw
new
RuntimeException
(
e
.
getMessage
(),
e
);
...
...
@@ -298,7 +299,7 @@ public abstract class UpgradeDao {
conn
.
setAutoCommit
(
false
);
// Execute the upgraded dolphinscheduler dml
ScriptRunner
scriptRunner
=
new
ScriptRunner
(
conn
,
false
,
true
);
Reader
sqlReader
=
new
InputStreamReader
(
sqlFilePath
.
getInputStream
());
try
(
Reader
sqlReader
=
new
InputStreamReader
(
sqlFilePath
.
getInputStream
()))
{
scriptRunner
.
runScript
(
sqlReader
);
if
(
isExistsTable
(
T_VERSION_NAME
))
{
// Change version in the version table to the new version
...
...
@@ -314,6 +315,7 @@ public abstract class UpgradeDao {
pstmt
.
executeUpdate
();
}
conn
.
commit
();
}
}
catch
(
FileNotFoundException
e
)
{
try
{
conn
.
rollback
();
...
...
@@ -362,9 +364,9 @@ public abstract class UpgradeDao {
conn
.
setAutoCommit
(
true
);
// Execute the dolphinscheduler ddl.sql for the upgrade
ScriptRunner
scriptRunner
=
new
ScriptRunner
(
conn
,
true
,
true
);
Reader
sqlReader
=
new
InputStreamReader
(
sqlFilePath
.
getInputStream
());
try
(
Reader
sqlReader
=
new
InputStreamReader
(
sqlFilePath
.
getInputStream
()))
{
scriptRunner
.
runScript
(
sqlReader
);
}
}
catch
(
FileNotFoundException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录