Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
2ff76c7e
DolphinScheduler
项目概览
yanghaoyuan.sh
/
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,发现更多精彩内容 >>
未验证
提交
2ff76c7e
编写于
12月 10, 2021
作者:
K
kezhenxu94
提交者:
GitHub
12月 10, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix some SQL issues and make docker-compose runnable (#7329)
上级
ac67a11d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
10 addition
and
8 deletion
+10
-8
dolphinscheduler-dao/src/main/resources/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_ddl.sql
.../release-1.2.0_schema/postgresql/dolphinscheduler_ddl.sql
+2
-1
dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.0_schema/mysql/dolphinscheduler_ddl.sql
...s/sql/upgrade/2.0.0_schema/mysql/dolphinscheduler_ddl.sql
+1
-0
dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.1_schema/postgresql/dolphinscheduler_ddl.sql
.../upgrade/2.0.1_schema/postgresql/dolphinscheduler_ddl.sql
+1
-1
dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/UpgradeDao.java
...che/dolphinscheduler/tools/datasource/dao/UpgradeDao.java
+1
-1
dolphinscheduler-worker/src/main/docker/Dockerfile
dolphinscheduler-worker/src/main/docker/Dockerfile
+1
-1
script/env/dolphinscheduler_env.sh
script/env/dolphinscheduler_env.sh
+4
-4
未找到文件。
dolphinscheduler-dao/src/main/resources/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_ddl.sql
浏览文件 @
2ff76c7e
...
...
@@ -375,6 +375,7 @@ DROP TABLE IF EXISTS t_ds_project;
CREATE
TABLE
t_ds_project
(
id
int
NOT
NULL
,
name
varchar
(
100
)
DEFAULT
NULL
,
code
bigint
NOT
NULL
,
description
varchar
(
200
)
DEFAULT
NULL
,
user_id
int
DEFAULT
NULL
,
flag
int
DEFAULT
'1'
,
...
...
@@ -754,4 +755,4 @@ CREATE SEQUENCE t_ds_worker_group_id_sequence;
ALTER
TABLE
t_ds_worker_group
ALTER
COLUMN
id
SET
DEFAULT
NEXTVAL
(
't_ds_worker_group_id_sequence'
);
DROP
SEQUENCE
IF
EXISTS
t_ds_worker_server_id_sequence
;
CREATE
SEQUENCE
t_ds_worker_server_id_sequence
;
ALTER
TABLE
t_ds_worker_server
ALTER
COLUMN
id
SET
DEFAULT
NEXTVAL
(
't_ds_worker_server_id_sequence'
);
\ No newline at end of file
ALTER
TABLE
t_ds_worker_server
ALTER
COLUMN
id
SET
DEFAULT
NEXTVAL
(
't_ds_worker_server_id_sequence'
);
dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.0_schema/mysql/dolphinscheduler_ddl.sql
浏览文件 @
2ff76c7e
...
...
@@ -302,6 +302,7 @@ CREATE TABLE `t_ds_task_definition_log` (
`delay_time`
int
(
11
)
DEFAULT
'0'
COMMENT
'delay execution time,unit: minute'
,
`resource_ids`
text
DEFAULT
NULL
COMMENT
'resource id, separated by comma'
,
`operator`
int
(
11
)
DEFAULT
NULL
COMMENT
'operator user id'
,
`task_group_id`
int
(
11
)
DEFAULT
NULL
COMMENT
'task group id'
,
`operate_time`
datetime
DEFAULT
NULL
COMMENT
'operate time'
,
`create_time`
datetime
NOT
NULL
COMMENT
'create time'
,
`update_time`
datetime
NOT
NULL
COMMENT
'update time'
,
...
...
dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.1_schema/postgresql/dolphinscheduler_ddl.sql
浏览文件 @
2ff76c7e
...
...
@@ -40,4 +40,4 @@ $BODY$;
select
dolphin_update_metadata
();
d
//
\ No newline at end of file
d
//
dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/UpgradeDao.java
浏览文件 @
2ff76c7e
...
...
@@ -307,7 +307,7 @@ public abstract class UpgradeDao {
private
void
upgradeDolphinSchedulerDML
(
String
schemaDir
)
{
String
schemaVersion
=
schemaDir
.
split
(
"_"
)[
0
];
Resource
sqlFilePath
=
new
ClassPathResource
(
String
.
format
(
"sql/upgrade/%s/%s/dolphinscheduler_dml.sql"
,
schemaDir
,
getDbType
().
name
().
toLowerCase
()));
logger
.
info
(
"sqlSQLFilePath
"
+
sqlFilePath
);
logger
.
info
(
"sqlSQLFilePath
: {}"
,
sqlFilePath
);
Connection
conn
=
null
;
PreparedStatement
pstmt
=
null
;
try
{
...
...
dolphinscheduler-worker/src/main/docker/Dockerfile
浏览文件 @
2ff76c7e
...
...
@@ -22,7 +22,7 @@ ENV TZ Asia/Shanghai
ENV
DOLPHINSCHEDULER_HOME /opt/dolphinscheduler
RUN
apt update
;
\
apt
install
-y
curl
;
\
apt
install
-y
curl
sudo
;
\
rm
-rf
/var/lib/apt/lists/
*
WORKDIR
$DOLPHINSCHEDULER_HOME
...
...
script/env/dolphinscheduler_env.sh
浏览文件 @
2ff76c7e
...
...
@@ -32,9 +32,9 @@ export SPRING_PROFILES_ACTIVE=${DATABASE}
export
SPRING_DATASOURCE_URL
export
SPRING_DATASOURCE_USERNAME
export
SPRING_DATASOURCE_PASSWORD
export
SPRING_CACHE_TYPE
=
none
export
SPRING_CACHE_TYPE
=
${
SPRING_CACHE_TYPE
:-
none
}
export
MASTER_FETCH_COMMAND_NUM
=
10
export
MASTER_FETCH_COMMAND_NUM
=
${
MASTER_FETCH_COMMAND_NUM
:-
10
}
export
REGISTRY_TYPE
=
zookeeper
export
REGISTRY_ZOOKEEPER_CONNECT_STRING
=
localhost:2181
export
REGISTRY_TYPE
=
${
REGISTRY_TYPE
:-
zookeeper
}
export
REGISTRY_ZOOKEEPER_CONNECT_STRING
=
${
REGISTRY_ZOOKEEPER_CONNECT_STRING
:-
localhost
:2181
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录