This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/json_split by this push:
new fc6461c [Feature][JsonSplit]modify mysql.sql. remove dumplicate
locations (#4582)
fc6461c is described below
commit fc6461c054e8d77da08e7a56cd8706681eb7e9c7
Author: bao liang <[email protected]>
AuthorDate: Sun Jan 31 15:39:30 2021 +0800
[Feature][JsonSplit]modify mysql.sql. remove dumplicate locations (#4582)
* modify mysql.sql. remove dumplicate locations
* remove mysql fields
* remove mysql fields
---
sql/dolphinscheduler_mysql.sql | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index 30ffba8..bdc5dd8 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -297,14 +297,14 @@ CREATE TABLE `t_ds_alert` (
-- ----------------------------
DROP TABLE IF EXISTS `t_ds_alertgroup`;
CREATE TABLE `t_ds_alertgroup`(
- `id` int(11) NOT NULL
AUTO_INCREMENT COMMENT 'key',
- `alert_instance_ids` varchar (255) DEFAULT
NULL COMMENT 'alert instance ids',
- `create_user_id` int(11) DEFAULT NULL
COMMENT 'create user id',
- `group_name` varchar(255) DEFAULT NULL
COMMENT 'group name',
- `description` varchar(255) DEFAULT NULL,
- `create_time` datetime DEFAULT NULL
COMMENT 'create time',
- `update_time` datetime DEFAULT NULL
COMMENT 'update time',
- PRIMARY KEY (`id`)
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'key',
+ `alert_instance_ids` varchar (255) DEFAULT NULL COMMENT 'alert instance ids',
+ `create_user_id` int(11) DEFAULT NULL COMMENT 'create user id',
+ `group_name` varchar(255) DEFAULT NULL COMMENT 'group name',
+ `description` varchar(255) DEFAULT NULL,
+ `create_time` datetime DEFAULT NULL COMMENT 'create time',
+ `update_time` datetime DEFAULT NULL COMMENT 'update time',
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
-- ----------------------------
@@ -400,7 +400,6 @@ CREATE TABLE `t_ds_process_definition` (
`release_state` tinyint(4) DEFAULT NULL COMMENT 'process definition release
stateļ¼0:offline,1:online',
`user_id` int(11) DEFAULT NULL COMMENT 'process definition creator id',
`global_params` text COMMENT 'global parameters',
- `locations` text COMMENT 'node location information',
`flag` tinyint(4) DEFAULT NULL COMMENT '0 not available, 1 available',
`locations` text COMMENT 'Node location information',
`connects` text COMMENT 'Node connection information',
@@ -420,6 +419,7 @@ CREATE TABLE `t_ds_process_definition` (
-- ----------------------------
-- Table structure for t_ds_process_definition_log
-- ----------------------------
+DROP TABLE IF EXISTS `t_ds_process_definition_log`;
CREATE TABLE `t_ds_process_definition_log` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'self-increasing id',
`code` bigint(20) NOT NULL COMMENT 'encoding',
@@ -446,6 +446,7 @@ CREATE TABLE `t_ds_process_definition_log` (
-- ----------------------------
-- Table structure for t_ds_task_definition
-- ----------------------------
+DROP TABLE IF EXISTS `t_ds_task_definition`;
CREATE TABLE `t_ds_task_definition` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'self-increasing id',
`code` bigint(20) NOT NULL COMMENT 'encoding',
@@ -474,6 +475,7 @@ CREATE TABLE `t_ds_task_definition` (
-- ----------------------------
-- Table structure for t_ds_task_definition_log
-- ----------------------------
+DROP TABLE IF EXISTS `t_ds_task_definition_log`;
CREATE TABLE `t_ds_task_definition_log` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'self-increasing id',
`code` bigint(20) NOT NULL COMMENT 'encoding',
@@ -503,15 +505,14 @@ CREATE TABLE `t_ds_task_definition_log` (
-- ----------------------------
-- Table structure for t_ds_process_task_relation
-- ----------------------------
+DROP TABLE IF EXISTS `t_ds_process_task_relation`;
CREATE TABLE `t_ds_process_task_relation` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'self-increasing id',
`name` varchar(200) DEFAULT NULL COMMENT 'relation name',
`version` int(11) DEFAULT NULL COMMENT 'relation version',
`project_code` bigint(20) NOT NULL COMMENT 'project code',
`process_definition_code` bigint(20) NOT NULL COMMENT 'process code',
- `pre_project_code` bigint(20) NOT NULL COMMENT 'pre process code',
`pre_task_code` bigint(20) NOT NULL COMMENT 'pre task code',
- `post_project_code` bigint(20) NOT NULL COMMENT 'post process code',
`post_task_code` bigint(20) NOT NULL COMMENT 'post task code',
`condition_type` tinyint(2) DEFAULT NULL COMMENT 'condition type : 0 none, 1
judge 2 delay',
`condition_params` text COMMENT 'condition params(json)',
@@ -523,15 +524,14 @@ CREATE TABLE `t_ds_process_task_relation` (
-- ----------------------------
-- Table structure for t_ds_process_task_relation_log
-- ----------------------------
+DROP TABLE IF EXISTS `t_ds_process_task_relation_log`;
CREATE TABLE `t_ds_process_task_relation_log` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'self-increasing id',
`name` varchar(200) DEFAULT NULL COMMENT 'relation name',
`version` int(11) DEFAULT NULL COMMENT 'relation version',
`project_code` bigint(20) NOT NULL COMMENT 'project code',
`process_definition_code` bigint(20) NOT NULL COMMENT 'process code',
- `pre_project_code` bigint(20) NOT NULL COMMENT 'pre process code',
`pre_task_code` bigint(20) NOT NULL COMMENT 'pre task code',
- `post_project_code` bigint(20) NOT NULL COMMENT 'post process code',
`post_task_code` bigint(20) NOT NULL COMMENT 'post task code',
`condition_type` tinyint(2) DEFAULT NULL COMMENT 'condition type : 0 none, 1
judge 2 delay',
`condition_params` text COMMENT 'condition params(json)',
@@ -837,7 +837,7 @@ CREATE TABLE `t_ds_task_instance` (
`var_pool` longtext COMMENT 'var_pool',
PRIMARY KEY (`id`),
KEY `process_instance_id` (`process_instance_id`) USING BTREE,
- KEY `task_instance_index` (`process_definition_id`,`process_instance_id`)
USING BTREE,
+ KEY `task_instance_index` (`process_definition_code`,`process_instance_id`)
USING BTREE,
CONSTRAINT `foreign_key_instance_id` FOREIGN KEY (`process_instance_id`)
REFERENCES `t_ds_process_instance` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
