fix some config miss (#7133)

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/DaoConfiguration.java

+/*
+ * 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.
+ *
+ */
+
+package org.apache.dolphinscheduler.dao;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableAutoConfiguration
+@MapperScan("org.apache.dolphinscheduler.dao")
+public class DaoConfiguration {
+}

dolphinscheduler-dao/src/main/resources/application-h2.yaml

+# 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.
+#
+spring:
+  datasource:
+    driver-class-name: org.h2.Driver
+    url: jdbc:h2:mem:dolphinscheduler;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript from 'classpath:sql/dolphinscheduler_h2.sql'
+    username: sa
+    password: ""
+    hikari:
+      connection-test-query: select 1
+      minimum-idle: 5
+      auto-commit: true
+      validation-timeout: 3000
+      pool-name: DolphinScheduler
+      maximum-pool-size: 50
+      connection-timeout: 30000
+      idle-timeout: 600000
+      leak-detection-threshold: 0
+      initialization-fail-timeout: 1

dolphinscheduler-dao/src/main/resources/application-mysql.yaml

+# 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.
+#
+spring:
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
+    username: ds_user
+    password: dolphinscheduler
+    hikari:
+      connection-test-query: select 1
+      minimum-idle: 5
+      auto-commit: true
+      validation-timeout: 3000
+      pool-name: DolphinScheduler
+      maximum-pool-size: 50
+      connection-timeout: 30000
+      idle-timeout: 600000
+      leak-detection-threshold: 0
+      initialization-fail-timeout: 1

dolphinscheduler-dao/src/main/resources/application-postgresql.yaml

+# 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.
+#
+spring:
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
+    username: root
+    password: root
+    hikari:
+      connection-test-query: select 1
+      minimum-idle: 5
+      auto-commit: true
+      validation-timeout: 3000
+      pool-name: DolphinScheduler
+      maximum-pool-size: 50
+      connection-timeout: 30000
+      idle-timeout: 600000
+      leak-detection-threshold: 0
+      initialization-fail-timeout: 1

dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/PluginDefineMapper.xml

@@ -38,6 +38,7 @@
         select *
         from t_ds_plugin_define
         where plugin_name = #{pluginName} and plugin_type = #{pluginType}
+        limit 1
     </select>
 
     <select id="queryDetailById" resultType="org.apache.dolphinscheduler.dao.entity.PluginDefine">

dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql

@@ -15,13 +15,13 @@
  * limitations under the License.
 */
 
-SET
-FOREIGN_KEY_CHECKS=0;
+SET FOREIGN_KEY_CHECKS=0;
+SET REFERENTIAL_INTEGRITY FALSE;
 
 -- ----------------------------
 -- Table structure for QRTZ_JOB_DETAILS
 -- ----------------------------
-DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
+DROP TABLE IF EXISTS QRTZ_JOB_DETAILS CASCADE;
 CREATE TABLE QRTZ_JOB_DETAILS
 (
     SCHED_NAME        varchar(120) NOT NULL,
@@ -29,10 +29,10 @@ CREATE TABLE QRTZ_JOB_DETAILS
     JOB_GROUP         varchar(200) NOT NULL,
     DESCRIPTION       varchar(250) DEFAULT NULL,
     JOB_CLASS_NAME    varchar(250) NOT NULL,
-    IS_DURABLE        varchar(1)   NOT NULL,
-    IS_NONCONCURRENT  varchar(1)   NOT NULL,
-    IS_UPDATE_DATA    varchar(1)   NOT NULL,
-    REQUESTS_RECOVERY varchar(1)   NOT NULL,
+    IS_DURABLE        boolean      NOT NULL,
+    IS_NONCONCURRENT  boolean      NOT NULL,
+    IS_UPDATE_DATA    boolean      NOT NULL,
+    REQUESTS_RECOVERY boolean      NOT NULL,
     JOB_DATA          blob,
     PRIMARY KEY (SCHED_NAME, JOB_NAME, JOB_GROUP)
 );
@@ -40,7 +40,7 @@ CREATE TABLE QRTZ_JOB_DETAILS
 -- ----------------------------
 -- Table structure for QRTZ_TRIGGERS
 -- ----------------------------
-DROP TABLE IF EXISTS QRTZ_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_TRIGGERS CASCADE;
 CREATE TABLE QRTZ_TRIGGERS
 (
     SCHED_NAME     varchar(120) NOT NULL,
@@ -66,7 +66,7 @@ CREATE TABLE QRTZ_TRIGGERS
 -- ----------------------------
 -- Table structure for QRTZ_BLOB_TRIGGERS
 -- ----------------------------
-DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS CASCADE;
 CREATE TABLE QRTZ_BLOB_TRIGGERS
 (
     SCHED_NAME    varchar(120) NOT NULL,
@@ -84,7 +84,7 @@ CREATE TABLE QRTZ_BLOB_TRIGGERS
 -- ----------------------------
 -- Table structure for QRTZ_CALENDARS
 -- ----------------------------
-DROP TABLE IF EXISTS QRTZ_CALENDARS;
+DROP TABLE IF EXISTS QRTZ_CALENDARS CASCADE;
 CREATE TABLE QRTZ_CALENDARS
 (
     SCHED_NAME    varchar(120) NOT NULL,
@@ -100,7 +100,7 @@ CREATE TABLE QRTZ_CALENDARS
 -- ----------------------------
 -- Table structure for QRTZ_CRON_TRIGGERS
 -- ----------------------------
-DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS CASCADE;
 CREATE TABLE QRTZ_CRON_TRIGGERS
 (
     SCHED_NAME      varchar(120) NOT NULL,
@@ -119,7 +119,7 @@ CREATE TABLE QRTZ_CRON_TRIGGERS
 -- ----------------------------
 -- Table structure for QRTZ_FIRED_TRIGGERS
 -- ----------------------------
-DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS CASCADE;
 CREATE TABLE QRTZ_FIRED_TRIGGERS
 (
     SCHED_NAME        varchar(120) NOT NULL,
@@ -133,8 +133,8 @@ CREATE TABLE QRTZ_FIRED_TRIGGERS
     STATE             varchar(16)  NOT NULL,
     JOB_NAME          varchar(200) DEFAULT NULL,
     JOB_GROUP         varchar(200) DEFAULT NULL,
-    IS_NONCONCURRENT  varchar(1)   DEFAULT NULL,
-    REQUESTS_RECOVERY varchar(1)   DEFAULT NULL,
+    IS_NONCONCURRENT  boolean      DEFAULT NULL,
+    REQUESTS_RECOVERY boolean      DEFAULT NULL,
     PRIMARY KEY (SCHED_NAME, ENTRY_ID)
 );
 
@@ -149,7 +149,7 @@ CREATE TABLE QRTZ_FIRED_TRIGGERS
 -- ----------------------------
 -- Table structure for QRTZ_LOCKS
 -- ----------------------------
-DROP TABLE IF EXISTS QRTZ_LOCKS;
+DROP TABLE IF EXISTS QRTZ_LOCKS CASCADE;
 CREATE TABLE QRTZ_LOCKS
 (
     SCHED_NAME varchar(120) NOT NULL,
@@ -164,7 +164,7 @@ CREATE TABLE QRTZ_LOCKS
 -- ----------------------------
 -- Table structure for QRTZ_PAUSED_TRIGGER_GRPS
 -- ----------------------------
-DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
+DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS CASCADE;
 CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS
 (
     SCHED_NAME    varchar(120) NOT NULL,
@@ -179,7 +179,7 @@ CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS
 -- ----------------------------
 -- Table structure for QRTZ_SCHEDULER_STATE
 -- ----------------------------
-DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
+DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE CASCADE;
 CREATE TABLE QRTZ_SCHEDULER_STATE
 (
     SCHED_NAME        varchar(120) NOT NULL,
@@ -196,7 +196,7 @@ CREATE TABLE QRTZ_SCHEDULER_STATE
 -- ----------------------------
 -- Table structure for QRTZ_SIMPLE_TRIGGERS
 -- ----------------------------
-DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS CASCADE;
 CREATE TABLE QRTZ_SIMPLE_TRIGGERS
 (
     SCHED_NAME      varchar(120) NOT NULL,
@@ -216,7 +216,7 @@ CREATE TABLE QRTZ_SIMPLE_TRIGGERS
 -- ----------------------------
 -- Table structure for QRTZ_SIMPROP_TRIGGERS
 -- ----------------------------
-DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS;
+DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS CASCADE;
 CREATE TABLE QRTZ_SIMPROP_TRIGGERS
 (
     SCHED_NAME    varchar(120) NOT NULL,
@@ -231,8 +231,8 @@ CREATE TABLE QRTZ_SIMPROP_TRIGGERS
     LONG_PROP_2   bigint(20) DEFAULT NULL,
     DEC_PROP_1    decimal(13, 4) DEFAULT NULL,
     DEC_PROP_2    decimal(13, 4) DEFAULT NULL,
-    BOOL_PROP_1   varchar(1)     DEFAULT NULL,
-    BOOL_PROP_2   varchar(1)     DEFAULT NULL,
+    BOOL_PROP_1   boolean        DEFAULT NULL,
+    BOOL_PROP_2   boolean        DEFAULT NULL,
     PRIMARY KEY (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP),
     CONSTRAINT QRTZ_SIMPROP_TRIGGERS_ibfk_1 FOREIGN KEY (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP)
 );
@@ -248,7 +248,7 @@ CREATE TABLE QRTZ_SIMPROP_TRIGGERS
 -- ----------------------------
 -- Table structure for t_ds_access_token
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_access_token;
+DROP TABLE IF EXISTS t_ds_access_token CASCADE;
 CREATE TABLE t_ds_access_token
 (
     id          int(11) NOT NULL AUTO_INCREMENT,
@@ -267,7 +267,7 @@ CREATE TABLE t_ds_access_token
 -- ----------------------------
 -- Table structure for t_ds_alert
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_alert;
+DROP TABLE IF EXISTS t_ds_alert CASCADE;
 CREATE TABLE t_ds_alert
 (
     id            int(11) NOT NULL AUTO_INCREMENT,
@@ -288,7 +288,7 @@ CREATE TABLE t_ds_alert
 -- ----------------------------
 -- Table structure for t_ds_alertgroup
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_alertgroup;
+DROP TABLE IF EXISTS t_ds_alertgroup CASCADE;
 CREATE TABLE t_ds_alertgroup
 (
     id                 int(11) NOT NULL AUTO_INCREMENT,
@@ -309,7 +309,7 @@ CREATE TABLE t_ds_alertgroup
 -- ----------------------------
 -- Table structure for t_ds_command
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_command;
+DROP TABLE IF EXISTS t_ds_command CASCADE;
 CREATE TABLE t_ds_command
 (
     id                         int(11) NOT NULL AUTO_INCREMENT,
@@ -341,7 +341,7 @@ CREATE TABLE t_ds_command
 -- ----------------------------
 -- Table structure for t_ds_datasource
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_datasource;
+DROP TABLE IF EXISTS t_ds_datasource CASCADE;
 CREATE TABLE t_ds_datasource
 (
     id                int(11) NOT NULL AUTO_INCREMENT,
@@ -363,7 +363,7 @@ CREATE TABLE t_ds_datasource
 -- ----------------------------
 -- Table structure for t_ds_error_command
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_error_command;
+DROP TABLE IF EXISTS t_ds_error_command CASCADE;
 CREATE TABLE t_ds_error_command
 (
     id                         int(11) NOT NULL,
@@ -395,7 +395,7 @@ CREATE TABLE t_ds_error_command
 -- ----------------------------
 -- Table structure for t_ds_process_definition
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_process_definition;
+DROP TABLE IF EXISTS t_ds_process_definition CASCADE;
 CREATE TABLE t_ds_process_definition
 (
     id               int(11) NOT NULL AUTO_INCREMENT,
@@ -412,6 +412,7 @@ CREATE TABLE t_ds_process_definition
     warning_group_id int(11) DEFAULT NULL,
     timeout          int(11) DEFAULT '0',
     tenant_id        int(11) NOT NULL DEFAULT '-1',
+    execution_type   tinyint(4) DEFAULT '0',
     create_time      datetime NOT NULL,
     update_time      datetime     DEFAULT NULL,
     PRIMARY KEY (id),
@@ -426,7 +427,7 @@ CREATE TABLE t_ds_process_definition
 -- ----------------------------
 -- Table structure for t_ds_process_definition_log
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_process_definition_log;
+DROP TABLE IF EXISTS t_ds_process_definition_log CASCADE;
 CREATE TABLE t_ds_process_definition_log
 (
     id               int(11) NOT NULL AUTO_INCREMENT,
@@ -443,6 +444,7 @@ CREATE TABLE t_ds_process_definition_log
     warning_group_id int(11) DEFAULT NULL,
     timeout          int(11) DEFAULT '0',
     tenant_id        int(11) NOT NULL DEFAULT '-1',
+    execution_type   tinyint(4) DEFAULT '0',
     operator         int(11) DEFAULT NULL,
     operate_time     datetime     DEFAULT NULL,
     create_time      datetime NOT NULL,
@@ -453,7 +455,7 @@ CREATE TABLE t_ds_process_definition_log
 -- ----------------------------
 -- Table structure for t_ds_task_definition
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_task_definition;
+DROP TABLE IF EXISTS t_ds_task_definition CASCADE;
 CREATE TABLE t_ds_task_definition
 (
     id                      int(11) NOT NULL AUTO_INCREMENT,
@@ -484,7 +486,7 @@ CREATE TABLE t_ds_task_definition
 -- ----------------------------
 -- Table structure for t_ds_task_definition_log
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_task_definition_log;
+DROP TABLE IF EXISTS t_ds_task_definition_log CASCADE;
 CREATE TABLE t_ds_task_definition_log
 (
     id                      int(11) NOT NULL AUTO_INCREMENT,
@@ -517,7 +519,7 @@ CREATE TABLE t_ds_task_definition_log
 -- ----------------------------
 -- Table structure for t_ds_process_task_relation
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_process_task_relation;
+DROP TABLE IF EXISTS t_ds_process_task_relation CASCADE;
 CREATE TABLE t_ds_process_task_relation
 (
     id                         int(11) NOT NULL AUTO_INCREMENT,
@@ -539,7 +541,7 @@ 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;
+DROP TABLE IF EXISTS t_ds_process_task_relation_log CASCADE;
 CREATE TABLE t_ds_process_task_relation_log
 (
     id                         int(11) NOT NULL AUTO_INCREMENT,
@@ -563,7 +565,7 @@ CREATE TABLE t_ds_process_task_relation_log
 -- ----------------------------
 -- Table structure for t_ds_process_instance
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_process_instance;
+DROP TABLE IF EXISTS t_ds_process_instance CASCADE;
 CREATE TABLE t_ds_process_instance
 (
     id                         int(11) NOT NULL AUTO_INCREMENT,
@@ -595,6 +597,7 @@ CREATE TABLE t_ds_process_instance
     worker_group               varchar(64)  DEFAULT NULL,
     environment_code           bigint(20) DEFAULT '-1',
     timeout                    int(11) DEFAULT '0',
+    next_process_instance_id   int(11) DEFAULT '0',
     tenant_id                  int(11) NOT NULL DEFAULT '-1',
     var_pool                   longtext,
     dry_run                    int NULL DEFAULT 0,
@@ -608,7 +611,7 @@ CREATE TABLE t_ds_process_instance
 -- ----------------------------
 -- Table structure for t_ds_project
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_project;
+DROP TABLE IF EXISTS t_ds_project CASCADE;
 CREATE TABLE t_ds_project
 (
     id          int(11) NOT NULL AUTO_INCREMENT,
@@ -629,7 +632,7 @@ CREATE TABLE t_ds_project
 -- ----------------------------
 -- Table structure for t_ds_queue
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_queue;
+DROP TABLE IF EXISTS t_ds_queue CASCADE;
 CREATE TABLE t_ds_queue
 (
     id          int(11) NOT NULL AUTO_INCREMENT,
@@ -649,7 +652,7 @@ VALUES ('1', 'default', 'default', null, null);
 -- ----------------------------
 -- Table structure for t_ds_relation_datasource_user
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_relation_datasource_user;
+DROP TABLE IF EXISTS t_ds_relation_datasource_user CASCADE;
 CREATE TABLE t_ds_relation_datasource_user
 (
     id            int(11) NOT NULL AUTO_INCREMENT,
@@ -668,7 +671,7 @@ CREATE TABLE t_ds_relation_datasource_user
 -- ----------------------------
 -- Table structure for t_ds_relation_process_instance
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_relation_process_instance;
+DROP TABLE IF EXISTS t_ds_relation_process_instance CASCADE;
 CREATE TABLE t_ds_relation_process_instance
 (
     id                         int(11) NOT NULL AUTO_INCREMENT,
@@ -685,7 +688,7 @@ CREATE TABLE t_ds_relation_process_instance
 -- ----------------------------
 -- Table structure for t_ds_relation_project_user
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_relation_project_user;
+DROP TABLE IF EXISTS t_ds_relation_project_user CASCADE;
 CREATE TABLE t_ds_relation_project_user
 (
     id          int(11) NOT NULL AUTO_INCREMENT,
@@ -704,7 +707,7 @@ CREATE TABLE t_ds_relation_project_user
 -- ----------------------------
 -- Table structure for t_ds_relation_resources_user
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_relation_resources_user;
+DROP TABLE IF EXISTS t_ds_relation_resources_user CASCADE;
 CREATE TABLE t_ds_relation_resources_user
 (
     id           int(11) NOT NULL AUTO_INCREMENT,
@@ -723,7 +726,7 @@ CREATE TABLE t_ds_relation_resources_user
 -- ----------------------------
 -- Table structure for t_ds_relation_udfs_user
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_relation_udfs_user;
+DROP TABLE IF EXISTS t_ds_relation_udfs_user CASCADE;
 CREATE TABLE t_ds_relation_udfs_user
 (
     id          int(11) NOT NULL AUTO_INCREMENT,
@@ -738,7 +741,7 @@ CREATE TABLE t_ds_relation_udfs_user
 -- ----------------------------
 -- Table structure for t_ds_resources
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_resources;
+DROP TABLE IF EXISTS t_ds_resources CASCADE;
 CREATE TABLE t_ds_resources
 (
     id           int(11) NOT NULL AUTO_INCREMENT,
@@ -764,7 +767,7 @@ CREATE TABLE t_ds_resources
 -- ----------------------------
 -- Table structure for t_ds_schedules
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_schedules;
+DROP TABLE IF EXISTS t_ds_schedules CASCADE;
 CREATE TABLE t_ds_schedules
 (
     id                        int(11) NOT NULL AUTO_INCREMENT,
@@ -793,7 +796,7 @@ CREATE TABLE t_ds_schedules
 -- ----------------------------
 -- Table structure for t_ds_session
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_session;
+DROP TABLE IF EXISTS t_ds_session CASCADE;
 CREATE TABLE t_ds_session
 (
     id              varchar(64) NOT NULL,
@@ -810,7 +813,7 @@ CREATE TABLE t_ds_session
 -- ----------------------------
 -- Table structure for t_ds_task_instance
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_task_instance;
+DROP TABLE IF EXISTS t_ds_task_instance CASCADE;
 CREATE TABLE t_ds_task_instance
 (
     id                      int(11) NOT NULL AUTO_INCREMENT,
@@ -854,7 +857,7 @@ CREATE TABLE t_ds_task_instance
 -- ----------------------------
 -- Table structure for t_ds_tenant
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_tenant;
+DROP TABLE IF EXISTS t_ds_tenant CASCADE;
 CREATE TABLE t_ds_tenant
 (
     id          int(11) NOT NULL AUTO_INCREMENT,
@@ -873,7 +876,7 @@ CREATE TABLE t_ds_tenant
 -- ----------------------------
 -- Table structure for t_ds_udfs
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_udfs;
+DROP TABLE IF EXISTS t_ds_udfs CASCADE;
 CREATE TABLE t_ds_udfs
 (
     id            int(11) NOT NULL AUTO_INCREMENT,
@@ -898,7 +901,7 @@ CREATE TABLE t_ds_udfs
 -- ----------------------------
 -- Table structure for t_ds_user
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_user;
+DROP TABLE IF EXISTS t_ds_user CASCADE;
 CREATE TABLE t_ds_user
 (
     id            int(11) NOT NULL AUTO_INCREMENT,
@@ -923,7 +926,7 @@ CREATE TABLE t_ds_user
 -- ----------------------------
 -- Table structure for t_ds_worker_group
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_worker_group;
+DROP TABLE IF EXISTS t_ds_worker_group CASCADE;
 CREATE TABLE t_ds_worker_group
 (
     id          bigint(11) NOT NULL AUTO_INCREMENT,
@@ -942,7 +945,7 @@ CREATE TABLE t_ds_worker_group
 -- ----------------------------
 -- Table structure for t_ds_version
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_version;
+DROP TABLE IF EXISTS t_ds_version CASCADE;
 CREATE TABLE t_ds_version
 (
     id      int(11) NOT NULL AUTO_INCREMENT,
@@ -955,7 +958,7 @@ CREATE TABLE t_ds_version
 -- Records of t_ds_version
 -- ----------------------------
 INSERT INTO t_ds_version
-VALUES ('1', '2.0.0');
+VALUES ('1', '1.4.0');
 
 
 -- ----------------------------
@@ -975,7 +978,7 @@ VALUES ('1', 'admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', '',
 -- ----------------------------
 -- Table structure for t_ds_plugin_define
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_plugin_define;
+DROP TABLE IF EXISTS t_ds_plugin_define CASCADE;
 CREATE TABLE t_ds_plugin_define
 (
     id            int          NOT NULL AUTO_INCREMENT,
@@ -991,7 +994,7 @@ CREATE TABLE t_ds_plugin_define
 -- ----------------------------
 -- Table structure for t_ds_alert_plugin_instance
 -- ----------------------------
-DROP TABLE IF EXISTS t_ds_alert_plugin_instance;
+DROP TABLE IF EXISTS t_ds_alert_plugin_instance CASCADE;
 CREATE TABLE t_ds_alert_plugin_instance
 (
     id                     int NOT NULL AUTO_INCREMENT,
@@ -1006,7 +1009,7 @@ CREATE TABLE t_ds_alert_plugin_instance
 --
 -- Table structure for table t_ds_environment
 --
-DROP TABLE IF EXISTS t_ds_environment;
+DROP TABLE IF EXISTS t_ds_environment CASCADE;
 CREATE TABLE t_ds_environment
 (
     id          int       NOT NULL AUTO_INCREMENT,
@@ -1025,7 +1028,7 @@ CREATE TABLE t_ds_environment
 --
 -- Table structure for table t_ds_environment_worker_group_relation
 --
-DROP TABLE IF EXISTS t_ds_environment_worker_group_relation;
+DROP TABLE IF EXISTS t_ds_environment_worker_group_relation CASCADE;
 CREATE TABLE t_ds_environment_worker_group_relation
 (
     id               int          NOT NULL AUTO_INCREMENT,

dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql

@@ -414,6 +414,7 @@ CREATE TABLE `t_ds_process_definition` (
   `warning_group_id` int(11) DEFAULT NULL COMMENT 'alert group id',
   `timeout` int(11) DEFAULT '0' COMMENT 'time out, unit: minute',
   `tenant_id` int(11) NOT NULL DEFAULT '-1' COMMENT 'tenant id',
+  `execution_type` tinyint(4) DEFAULT '0' COMMENT 'execution_type 0:parallel,1:serial wait,2:serial discard,3:serial priority',
   `create_time` datetime NOT NULL COMMENT 'create time',
   `update_time` datetime NOT NULL COMMENT 'update time',
   PRIMARY KEY (`id`,`code`),
@@ -443,6 +444,7 @@ CREATE TABLE `t_ds_process_definition_log` (
   `warning_group_id` int(11) DEFAULT NULL COMMENT 'alert group id',
   `timeout` int(11) DEFAULT '0' COMMENT 'time out,unit: minute',
   `tenant_id` int(11) NOT NULL DEFAULT '-1' COMMENT 'tenant id',
+  `execution_type` tinyint(4) DEFAULT '0' COMMENT 'execution_type 0:parallel,1:serial wait,2:serial discard,3:serial priority',
   `operator` int(11) DEFAULT NULL COMMENT 'operator user id',
   `operate_time` datetime DEFAULT NULL COMMENT 'operate time',
   `create_time` datetime NOT NULL COMMENT 'create time',
@@ -493,7 +495,7 @@ CREATE TABLE `t_ds_task_definition_log` (
   `project_code` bigint(20) NOT NULL COMMENT 'project code',
   `user_id` int(11) DEFAULT NULL COMMENT 'task definition creator id',
   `task_type` varchar(50) NOT NULL COMMENT 'task type',
-  `task_params` text COMMENT 'job custom parameters',
+  `task_params` longtext COMMENT 'job custom parameters',
   `flag` tinyint(2) DEFAULT NULL COMMENT '0 not available, 1 available',
   `task_priority` tinyint(4) DEFAULT NULL COMMENT 'job priority',
   `worker_group` varchar(200) DEFAULT NULL COMMENT 'worker grouping',
@@ -593,6 +595,7 @@ CREATE TABLE `t_ds_process_instance` (
   `tenant_id` int(11) NOT NULL DEFAULT '-1' COMMENT 'tenant id',
   `var_pool` longtext COMMENT 'var_pool',
   `dry_run` tinyint(4) DEFAULT '0' COMMENT 'dry run flag：0 normal, 1 dry run',
+  `next_process_instance_id` int(11) DEFAULT '0' COMMENT 'serial queue next processInstanceId',
   PRIMARY KEY (`id`),
   KEY `process_instance_index` (`process_definition_code`,`id`) USING BTREE,
   KEY `start_time_index` (`start_time`) USING BTREE
@@ -937,7 +940,7 @@ CREATE TABLE `t_ds_version` (
 -- ----------------------------
 -- Records of t_ds_version
 -- ----------------------------
-INSERT INTO `t_ds_version` VALUES ('1', '2.0.0');
+INSERT INTO `t_ds_version` VALUES ('1', '2.0.2');
 
 
 -- ----------------------------

dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgre.sql

@@ -331,6 +331,7 @@ CREATE TABLE t_ds_process_definition (
   flag int DEFAULT NULL ,
   timeout int DEFAULT '0' ,
   tenant_id int DEFAULT '-1' ,
+  execution_type int DEFAULT '0',
   create_time timestamp DEFAULT NULL ,
   update_time timestamp DEFAULT NULL ,
   PRIMARY KEY (id) ,
@@ -355,6 +356,7 @@ CREATE TABLE t_ds_process_definition_log (
   flag int DEFAULT NULL ,
   timeout int DEFAULT '0' ,
   tenant_id int DEFAULT '-1' ,
+  execution_type int DEFAULT '0',
   operator int DEFAULT NULL ,
   operate_time timestamp DEFAULT NULL ,
   create_time timestamp DEFAULT NULL ,
@@ -498,6 +500,7 @@ CREATE TABLE t_ds_process_instance (
   tenant_id int NOT NULL DEFAULT '-1' ,
   var_pool text ,
   dry_run int DEFAULT '0' ,
+  next_process_instance_id int DEFAULT '0',
   PRIMARY KEY (id)
 ) ;
 
@@ -923,7 +926,7 @@ INSERT INTO t_ds_queue(queue_name, queue, create_time, update_time)
 VALUES ('default', 'default', '2018-11-29 10:22:33', '2018-11-29 10:22:33');
 
 -- Records of t_ds_queue,default queue name : default
-INSERT INTO t_ds_version(version) VALUES ('2.0.0');
+INSERT INTO t_ds_version(version) VALUES ('1.4.0');
 
 --
 -- Table structure for table t_ds_plugin_define

dolphinscheduler-standalone-server/src/main/resources/application-h2.properties → dolphinscheduler-standalone-server/src/main/resources/application-standalone.yaml

@@ -14,3 +14,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+spring:
+  application:
+    name: standalone-server
+
+server:
+  port: 12345
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  server:
+    port: 8080
+  metrics:
+    tags:
+      application: ${spring.application.name}