merge schema 330 into 321 and change docs (#15582)

docs/docs/en/history-versions.md

@@ -4,6 +4,10 @@
 
 #### Setup instructions,  are available for each stable version of Apache DolphinScheduler below:
 
+### Versions: 3.2.1
+
+#### Links： [3.2.1 Document](../3.2.1/user_doc/about/introduction.md)
+
 ### Versions: 3.2.0
 
 #### Links： [3.2.0 Document](../3.2.0/user_doc/about/introduction.md)

docs/docs/zh/history-versions.md

@@ -4,6 +4,10 @@
 
 #### 以下是Apache DolphinScheduler每个稳定版本的设置说明。
 
+### Versions: 3.2.1
+
+#### Links： [3.2.1 Document](../3.2.1/user_doc/about/introduction.md)
+
 ### Versions: 3.2.0
 
 #### Links： [3.2.0 Document](../3.2.0/user_doc/about/introduction.md)

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.1_schema/mysql/dolphinscheduler_ddl.sql

@@ -15,6 +15,74 @@
  * limitations under the License.
 */
 
+-- Modify "t_ds_alertgroup" table
+ALTER TABLE `t_ds_alertgroup` AUTO_INCREMENT 3;
+-- Modify "t_ds_alert_plugin_instance" table
+ALTER TABLE `t_ds_alert_plugin_instance`
+    ADD COLUMN `instance_type` int NOT NULL DEFAULT 0, ADD COLUMN `warning_type` int NOT NULL DEFAULT 3;
+-- Create "t_ds_listener_event" table
+CREATE TABLE `t_ds_listener_event`
+(
+    `id`          int      NOT NULL AUTO_INCREMENT COMMENT "key",
+    `content`     text NULL COMMENT "listener event json content",
+    `sign`        char(64) NOT NULL DEFAULT "" COMMENT "sign=sha1(content)",
+    `post_status` tinyint NOT NULL DEFAULT 0 COMMENT "0:wait running,1:success,2:failed,3:partial success",
+    `event_type`  int NOT NULL COMMENT "listener event type",
+    `log`         text NULL COMMENT "log",
+    `create_time` datetime NULL COMMENT "create time",
+    `update_time` datetime NULL COMMENT "update time",
+    PRIMARY KEY (`id`),
+    INDEX         `idx_sign` (`sign`),
+    INDEX         `idx_status` (`post_status`)
+) CHARSET utf8 COLLATE utf8_bin;
+
+-- modify_data_t_ds_dq_rule_input_entry behavior change
+--DROP PROCEDURE if EXISTS modify_data_t_ds_dq_rule_input_entry;
+DROP PROCEDURE if EXISTS modify_data_t_ds_dq_rule_input_entry;
+delimiter d//
+CREATE PROCEDURE modify_data_t_ds_dq_rule_input_entry()
+BEGIN
+   IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+           WHERE TABLE_NAME='t_ds_dq_rule_input_entry'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
+           AND COLUMN_NAME ='value')
+   THEN
+ALTER TABLE `t_ds_dq_rule_input_entry`
+    CHANGE COLUMN `value` `data` varchar(255) DEFAULT NULL;
+END IF;
+END;
+d//
+delimiter ;
+CALL modify_data_t_ds_dq_rule_input_entry;
+DROP PROCEDURE modify_data_t_ds_dq_rule_input_entry;
+
+-- modify_data_value_t_ds_dq_rule_input_entry behavior change
+--DROP PROCEDURE if EXISTS modify_data_value_t_ds_dq_rule_input_entry;
+DROP PROCEDURE if EXISTS modify_data_value_t_ds_dq_rule_input_entry;
+delimiter d//
+CREATE PROCEDURE modify_data_value_t_ds_dq_rule_input_entry()
+BEGIN
+   IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+           WHERE TABLE_NAME='t_ds_dq_rule_input_entry'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
+           AND COLUMN_NAME ='value_type')
+   THEN
+ALTER TABLE `t_ds_dq_rule_input_entry`
+    CHANGE COLUMN `value_type` `data_type` int(11) DEFAULT NULL;
+END IF;
+END;
+d//
+delimiter ;
+CALL modify_data_value_t_ds_dq_rule_input_entry;
+DROP PROCEDURE modify_data_value_t_ds_dq_rule_input_entry;
+
+ALTER TABLE `t_ds_process_definition` MODIFY COLUMN `version` int NOT NULL DEFAULT 1 COMMENT "process definition version";
+ALTER TABLE `t_ds_process_definition_log` MODIFY COLUMN `version` int NOT NULL DEFAULT 1 COMMENT "process definition version";
+ALTER TABLE `t_ds_process_instance` MODIFY COLUMN `process_definition_version` int NOT NULL DEFAULT 1 COMMENT "process definition version";
+ALTER TABLE `t_ds_task_definition` MODIFY COLUMN `version` int NOT NULL DEFAULT 1 COMMENT "task definition version";
+ALTER TABLE `t_ds_task_definition_log` MODIFY COLUMN `version` int NOT NULL DEFAULT 1 COMMENT "task definition version";
+ALTER TABLE `t_ds_task_instance` MODIFY COLUMN `task_definition_version` int NOT NULL DEFAULT 1 COMMENT "task definition version";
+
 -- t_ds_k8s_namespace
 -- ALTER TABLE t_ds_k8s_namespace DROP COLUMN IF EXISTS limits_cpu;
 drop PROCEDURE if EXISTS drop_t_ds_k8s_namespace_col_limits_cpu;

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.1_schema/mysql/dolphinscheduler_dml.sql

@@ -14,3 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
+
+INSERT IGNORE INTO `t_ds_alertgroup`(alert_instance_ids, create_user_id, group_name, description, create_time, update_time)
+VALUES (NULL, 1, 'global alert group', 'global alert group', current_timestamp, current_timestamp);

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.1_schema/postgresql/dolphinscheduler_ddl.sql

@@ -14,6 +14,54 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
+-- Modify "t_ds_alert_plugin_instance" table
+ALTER TABLE "t_ds_alert_plugin_instance" ADD COLUMN "instance_type" integer NOT NULL DEFAULT 0, ADD COLUMN "warning_type" integer NOT NULL DEFAULT 3;
+-- Create "t_ds_listener_event" table
+CREATE TABLE "t_ds_listener_event" ("id" integer NOT NULL, "content" text NULL, "sign" character varying(64) NOT NULL DEFAULT '', "post_status" integer NOT NULL DEFAULT 0, "event_type" integer NOT NULL, "log" text NULL, "create_time" timestamp NULL, "update_time" timestamp NULL, PRIMARY KEY ("id"));
+-- Create index "idx_listener_event_post_status" to table: "t_ds_listener_event"
+CREATE INDEX "idx_listener_event_post_status" ON "t_ds_listener_event" ("post_status");
+-- Create index "idx_listener_event_sign" to table: "t_ds_listener_event"
+CREATE INDEX "idx_listener_event_sign" ON "t_ds_listener_event" ("sign");
+-- Set comment to column: "sign" on table: "t_ds_listener_event"
+COMMENT ON COLUMN "t_ds_listener_event" ."sign" IS 'sign=sha1(content)';
+-- modify_data_t_ds_dq_rule_input_entry
+
+delimiter d//
+CREATE OR REPLACE FUNCTION modify_data_t_ds_dq_rule_input_entry() RETURNS void AS $$
+BEGIN
+      IF EXISTS (SELECT 1
+                  FROM information_schema.columns
+                  WHERE table_name = 't_ds_dq_rule_input_entry'
+                  AND column_name = 'value')
+      THEN
+ALTER TABLE t_ds_dq_rule_input_entry
+    RENAME COLUMN "value" TO "data";
+END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+
+select modify_data_t_ds_dq_rule_input_entry();
+DROP FUNCTION IF EXISTS modify_data_t_ds_dq_rule_input_entry();
+
+-- modify_data_type_t_ds_dq_rule_input_entry
+delimiter d//
+CREATE OR REPLACE FUNCTION modify_data_type_t_ds_dq_rule_input_entry() RETURNS void AS $$
+BEGIN
+      IF EXISTS (SELECT 1
+                  FROM information_schema.columns
+                  WHERE table_name = 't_ds_dq_rule_input_entry'
+                  AND column_name = 'value_type')
+      THEN
+ALTER TABLE t_ds_dq_rule_input_entry
+    RENAME COLUMN "value_type" TO "data_type";
+END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+
+select modify_data_type_t_ds_dq_rule_input_entry();
+DROP FUNCTION IF EXISTS modify_data_type_t_ds_dq_rule_input_entry();
 
 -- t_ds_k8s_namespace
 ALTER TABLE "t_ds_k8s_namespace" DROP COLUMN IF EXISTS "limits_cpu";

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.1_schema/postgresql/dolphinscheduler_dml.sql

@@ -14,3 +14,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
+INSERT INTO t_ds_alertgroup(alert_instance_ids, create_user_id, group_name, description, create_time, update_time)
+VALUES (NULL, 1, 'global alert group', 'global alert group', '2018-11-29 10:20:39', '2018-11-29 10:20:39');

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.3.0_schema/mysql/dolphinscheduler_ddl.sql

@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
-*/
--- Modify "t_ds_alertgroup" table
-ALTER TABLE `t_ds_alertgroup` AUTO_INCREMENT 3;
--- Modify "t_ds_alert_plugin_instance" table
-ALTER TABLE `t_ds_alert_plugin_instance`
-    ADD COLUMN `instance_type` int NOT NULL DEFAULT 0, ADD COLUMN `warning_type` int NOT NULL DEFAULT 3;
--- Create "t_ds_listener_event" table
-CREATE TABLE `t_ds_listener_event`
-(
-    `id`          int      NOT NULL AUTO_INCREMENT COMMENT "key",
-    `content`     text NULL COMMENT "listener event json content",
-    `sign`        char(64) NOT NULL DEFAULT "" COMMENT "sign=sha1(content)",
-    `post_status` tinyint NOT NULL DEFAULT 0 COMMENT "0:wait running,1:success,2:failed,3:partial success",
-    `event_type`  int NOT NULL COMMENT "listener event type",
-    `log`         text NULL COMMENT "log",
-    `create_time` datetime NULL COMMENT "create time",
-    `update_time` datetime NULL COMMENT "update time",
-    PRIMARY KEY (`id`),
-    INDEX         `idx_sign` (`sign`),
-    INDEX         `idx_status` (`post_status`)
-) CHARSET utf8 COLLATE utf8_bin;
-
--- modify_data_t_ds_dq_rule_input_entry behavior change
---DROP PROCEDURE if EXISTS modify_data_t_ds_dq_rule_input_entry;
-DROP PROCEDURE if EXISTS modify_data_t_ds_dq_rule_input_entry;
-delimiter d//
-CREATE PROCEDURE modify_data_t_ds_dq_rule_input_entry()
-BEGIN
-   IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
-           WHERE TABLE_NAME='t_ds_dq_rule_input_entry'
-           AND TABLE_SCHEMA=(SELECT DATABASE())
-           AND COLUMN_NAME ='value')
-   THEN
-       ALTER TABLE `t_ds_dq_rule_input_entry`
-       CHANGE COLUMN `value` `data` varchar(255) DEFAULT NULL;
-   END IF;
-END;
-d//
-delimiter ;
-CALL modify_data_t_ds_dq_rule_input_entry;
-DROP PROCEDURE modify_data_t_ds_dq_rule_input_entry;
-
--- modify_data_value_t_ds_dq_rule_input_entry behavior change
---DROP PROCEDURE if EXISTS modify_data_value_t_ds_dq_rule_input_entry;
-DROP PROCEDURE if EXISTS modify_data_value_t_ds_dq_rule_input_entry;
-delimiter d//
-CREATE PROCEDURE modify_data_value_t_ds_dq_rule_input_entry()
-BEGIN
-   IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
-           WHERE TABLE_NAME='t_ds_dq_rule_input_entry'
-           AND TABLE_SCHEMA=(SELECT DATABASE())
-           AND COLUMN_NAME ='value_type')
-   THEN
-       ALTER TABLE `t_ds_dq_rule_input_entry`
-       CHANGE COLUMN `value_type` `data_type` int(11) DEFAULT NULL;
-   END IF;
-END;
-d//
-delimiter ;
-CALL modify_data_value_t_ds_dq_rule_input_entry;
-DROP PROCEDURE modify_data_value_t_ds_dq_rule_input_entry;
-
-ALTER TABLE `t_ds_process_definition` MODIFY COLUMN `version` int NOT NULL DEFAULT 1 COMMENT "process definition version";
-ALTER TABLE `t_ds_process_definition_log` MODIFY COLUMN `version` int NOT NULL DEFAULT 1 COMMENT "process definition version";
-ALTER TABLE `t_ds_process_instance` MODIFY COLUMN `process_definition_version` int NOT NULL DEFAULT 1 COMMENT "process definition version";
-ALTER TABLE `t_ds_task_definition` MODIFY COLUMN `version` int NOT NULL DEFAULT 1 COMMENT "task definition version";
-ALTER TABLE `t_ds_task_definition_log` MODIFY COLUMN `version` int NOT NULL DEFAULT 1 COMMENT "task definition version";
-ALTER TABLE `t_ds_task_instance` MODIFY COLUMN `task_definition_version` int NOT NULL DEFAULT 1 COMMENT "task definition version";
-
--- create idx_t_ds_task_group_queue_in_queue on t_ds_task_group_queue
-DROP PROCEDURE IF EXISTS create_idx_t_ds_task_group_queue_in_queue;
-delimiter d//
-CREATE PROCEDURE create_idx_t_ds_task_group_queue_in_queue()
-BEGIN
-    DECLARE index_exists INT DEFAULT 0;
-    SELECT COUNT(*) INTO index_exists FROM information_schema.statistics WHERE table_schema = (SELECT DATABASE()) AND  table_name = 't_ds_task_group_queue' AND index_name = 'idx_t_ds_task_group_queue_in_queue';
-    IF index_exists = 0 THEN CREATE INDEX idx_t_ds_task_group_queue_in_queue ON t_ds_task_group_queue(in_queue);
-END IF;
-END;
-d//
-delimiter ;
-CALL create_idx_t_ds_task_group_queue_in_queue;
-DROP PROCEDURE create_idx_t_ds_task_group_queue_in_queue;

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.3.0_schema/mysql/dolphinscheduler_ddl_post.sql

@@ -1,16 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
-*/

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.3.0_schema/mysql/dolphinscheduler_dml.sql

@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
-*/
-INSERT IGNORE INTO `t_ds_alertgroup`(alert_instance_ids, create_user_id, group_name, description, create_time, update_time)
-VALUES (NULL, 1, 'global alert group', 'global alert group', current_timestamp, current_timestamp);

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.3.0_schema/postgresql/dolphinscheduler_ddl.sql

@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
-*/
--- Modify "t_ds_alert_plugin_instance" table
-ALTER TABLE "t_ds_alert_plugin_instance" ADD COLUMN "instance_type" integer NOT NULL DEFAULT 0, ADD COLUMN "warning_type" integer NOT NULL DEFAULT 3;
--- Create "t_ds_listener_event" table
-CREATE TABLE "t_ds_listener_event" ("id" integer NOT NULL, "content" text NULL, "sign" character varying(64) NOT NULL DEFAULT '', "post_status" integer NOT NULL DEFAULT 0, "event_type" integer NOT NULL, "log" text NULL, "create_time" timestamp NULL, "update_time" timestamp NULL, PRIMARY KEY ("id"));
--- Create index "idx_listener_event_post_status" to table: "t_ds_listener_event"
-CREATE INDEX "idx_listener_event_post_status" ON "t_ds_listener_event" ("post_status");
--- Create index "idx_listener_event_sign" to table: "t_ds_listener_event"
-CREATE INDEX "idx_listener_event_sign" ON "t_ds_listener_event" ("sign");
--- Set comment to column: "sign" on table: "t_ds_listener_event"
-COMMENT ON COLUMN "t_ds_listener_event" ."sign" IS 'sign=sha1(content)';
--- modify_data_t_ds_dq_rule_input_entry
-
-delimiter d//
-CREATE OR REPLACE FUNCTION modify_data_t_ds_dq_rule_input_entry() RETURNS void AS $$
-BEGIN
-      IF EXISTS (SELECT 1
-                  FROM information_schema.columns
-                  WHERE table_name = 't_ds_dq_rule_input_entry'
-                  AND column_name = 'value')
-      THEN
-         ALTER TABLE t_ds_dq_rule_input_entry
-                 RENAME COLUMN "value" TO "data";
-      END IF;
-END;
-$$ LANGUAGE plpgsql;
-d//
-
-select modify_data_t_ds_dq_rule_input_entry();
-DROP FUNCTION IF EXISTS modify_data_t_ds_dq_rule_input_entry();
-
--- modify_data_type_t_ds_dq_rule_input_entry
-delimiter d//
-CREATE OR REPLACE FUNCTION modify_data_type_t_ds_dq_rule_input_entry() RETURNS void AS $$
-BEGIN
-      IF EXISTS (SELECT 1
-                  FROM information_schema.columns
-                  WHERE table_name = 't_ds_dq_rule_input_entry'
-                  AND column_name = 'value_type')
-      THEN
-         ALTER TABLE t_ds_dq_rule_input_entry
-                 RENAME COLUMN "value_type" TO "data_type";
-      END IF;
-END;
-$$ LANGUAGE plpgsql;
-d//
-
-select modify_data_type_t_ds_dq_rule_input_entry();
-DROP FUNCTION IF EXISTS modify_data_type_t_ds_dq_rule_input_entry();
-
-ALTER TABLE "t_ds_process_definition" ALTER COLUMN "version" SET DEFAULT 1;
-ALTER TABLE "t_ds_process_definition_log" ALTER COLUMN "version" SET DEFAULT 1;
-ALTER TABLE "t_ds_task_definition" ALTER COLUMN "version" SET DEFAULT 1;
-ALTER TABLE "t_ds_task_definition_log" ALTER COLUMN "version" SET DEFAULT 1;
-ALTER TABLE "t_ds_process_instance" ALTER COLUMN "process_definition_version" SET NOT NULL, ALTER COLUMN "process_definition_version" SET DEFAULT 1;
-ALTER TABLE "t_ds_task_instance" ALTER COLUMN "task_definition_version" SET NOT NULL, ALTER COLUMN "task_definition_version" SET DEFAULT 1;
-
-CREATE INDEX IF NOT EXISTS idx_t_ds_task_group_queue_in_queue ON t_ds_task_group_queue(in_queue);

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.3.0_schema/postgresql/dolphinscheduler_ddl_post.sql

@@ -1,16 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
-*/

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.3.0_schema/postgresql/dolphinscheduler_dml.sql

@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
-*/
-INSERT INTO t_ds_alertgroup(alert_instance_ids, create_user_id, group_name, description, create_time, update_time)
-VALUES (NULL, 1, 'global alert group', 'global alert group', '2018-11-29 10:20:39', '2018-11-29 10:20:39');