You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/11/08 11:07:25 UTC
[dolphinscheduler] branch 2.0.0-release-prepare updated (61d3fec ->
4e812e9)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch 2.0.0-release-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git.
from 61d3fec [DS-6653][Server] fix netty create too many channels (#6654)
add 858ec26 [Feature][Install] add upgrade 2.0 ddl (#6648)
add 2a62356 [Fix][DAS] Specify the catalog and schema when check table or column exists (#6646)
add e806bd2 [Upgrade][Install] add upgrade 2.0 code (#6672)
add 855c4b7 [DS-6660][Improvement] Change the registry default timeout (#6663)
add 7684a2e improve install_config.conf description (#6681)
add 7b9abf8 [DS-6694][Master] Reduce the refresh resource interval of LowerWeight (#6695)
add 275443f [FIX 6701] [API] Fix paging error when worker group number more than 10 (#6704)
add a007595 add convert dependent/conditions (#6710)
add 93ad282 [Fix-6649][UI] Get project according to code (#6649) (#6650)
add f375be7 [FIX:201106]fix issue#6657 (#6717)
add e93a08e Replace taskName with taskCode (#6719)
add cb4b6f1 [Fix-#6641]fix npe when the LowerWeightHostManager can not get the workNodeInfo (#6656)
add 98b8d54 [Feature][Install] add upgrade 2.0 ddl (#6648)
add 98465b1 [Upgrade][Install] fix upgrade 2.0 bug (#6734)
add 523357f [DS-6737][MasterServer] fix event handle twice (#6738)
new 4e812e9 unused import
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../api/service/impl/ExecutorServiceImpl.java | 6 +-
.../api/service/impl/WorkerGroupServiceImpl.java | 5 +-
.../apache/dolphinscheduler/common/Constants.java | 4 +
.../common/model/DependentItem.java | 14 +-
.../dolphinscheduler/common/utils/HeartBeat.java | 1 +
.../dao/upgrade/DolphinSchedulerManager.java | 6 +-
.../dolphinscheduler/dao/upgrade/JsonSplitDao.java | 248 +++++++++++
.../dao/upgrade/MysqlUpgradeDao.java | 4 +-
.../dao/upgrade/PostgresqlUpgradeDao.java | 4 +-
.../dao/upgrade/ProcessDefinitionDao.java | 79 +++-
.../{ProcessDefinitionDao.java => ProjectDao.java} | 45 +-
...{ProcessDefinitionDao.java => ScheduleDao.java} | 55 +--
.../dolphinscheduler/dao/upgrade/UpgradeDao.java | 329 +++++++++++++-
.../dao/entity/TaskInstanceTest.java | 2 +-
.../registry/zookeeper/ZookeeperConfiguration.java | 5 +-
.../registry/zookeeper/ZookeeperRegistry.java | 4 +-
.../registry/zookeeper/ZookeeperRegistryTest.java | 2 +-
.../dispatch/host/LowerWeightHostManager.java | 28 +-
.../registry/MasterRegistryDataListener.java | 3 +-
.../server/master/registry/ServerNodeManager.java | 35 +-
.../master/runner/WorkflowExecuteThread.java | 27 +-
.../master/runner/task/ConditionTaskProcessor.java | 14 +-
.../server/utils/DependentExecute.java | 10 +-
.../src/main/resources/config/install_config.conf | 30 +-
.../server/master/ConditionsTaskTest.java | 2 +-
.../server/master/DependentTaskTest.java | 44 +-
.../server/master/WorkflowExecuteThreadTest.java | 4 +-
.../host/RefreshResourceTaskTest.java} | 32 +-
.../service/process/ProcessService.java | 4 +-
.../src/main/resources/registry.properties | 5 +
.../spi/register/ListenerManager.java | 4 +-
.../spi/register/SubscribeListener.java | 2 +-
.../home/pages/dag/_source/canvas/contextMenu.vue | 2 +-
.../home/pages/dag/_source/formModel/formModel.vue | 11 +-
.../formModel/tasks/_source/dependItemList.vue | 44 +-
.../_source/formModel/tasks/_source/nodeStatus.vue | 8 +-
.../dag/_source/formModel/tasks/conditions.vue | 2 +-
.../dag/_source/formModel/tasks/dependent.vue | 2 +-
.../pages/dag/_source/formModel/tasks/switch.vue | 4 +-
.../src/js/conf/home/router/index.js | 7 +-
.../src/js/conf/home/store/projects/actions.js | 4 +-
pom.xml | 1 +
sql/dolphinscheduler_mysql.sql | 4 +-
sql/soft_version | 2 +-
.../1.4.0_schema/mysql/dolphinscheduler_ddl.sql | 480 ---------------------
.../2.0.0_schema/mysql/dolphinscheduler_ddl.sql | 408 ++++++++++++++++++
.../mysql/dolphinscheduler_ddl_post.sql} | 10 +-
.../mysql}/dolphinscheduler_dml.sql | 0
.../postgresql/dolphinscheduler_ddl.sql | 0
.../postgresql/dolphinscheduler_ddl_post.sql} | 3 +-
.../postgresql}/dolphinscheduler_dml.sql | 0
51 files changed, 1334 insertions(+), 715 deletions(-)
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/JsonSplitDao.java
copy dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/{ProcessDefinitionDao.java => ProjectDao.java} (68%)
copy dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/{ProcessDefinitionDao.java => ScheduleDao.java} (56%)
copy dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/{config/MasterConfigTest.java => dispatch/host/RefreshResourceTaskTest.java} (56%)
delete mode 100644 sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql
create mode 100644 sql/upgrade/2.0.0_schema/mysql/dolphinscheduler_ddl.sql
copy sql/upgrade/{1.0.2_schema/mysql/dolphinscheduler_dml.sql => 2.0.0_schema/mysql/dolphinscheduler_ddl_post.sql} (58%)
rename sql/upgrade/{1.4.0_schema/postgresql => 2.0.0_schema/mysql}/dolphinscheduler_dml.sql (100%)
rename sql/upgrade/{1.4.0_schema => 2.0.0_schema}/postgresql/dolphinscheduler_ddl.sql (100%)
copy sql/upgrade/{1.2.0_schema/postgresql/dolphinscheduler_dml.sql => 2.0.0_schema/postgresql/dolphinscheduler_ddl_post.sql} (99%)
rename sql/upgrade/{1.4.0_schema/mysql => 2.0.0_schema/postgresql}/dolphinscheduler_dml.sql (100%)
[dolphinscheduler] 01/01: unused import
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 2.0.0-release-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 4e812e97c37ccf9cb63a377b54cdd310c87807f6
Author: lenboo <ba...@gmail.com>
AuthorDate: Mon Nov 8 18:29:56 2021 +0800
unused import
---
.../dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
index b9a2082..d6b266f 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
@@ -20,7 +20,6 @@ package org.apache.dolphinscheduler.server.master.runner;
import static org.apache.dolphinscheduler.common.Constants.CMDPARAM_COMPLEMENT_DATA_END_DATE;
import static org.apache.dolphinscheduler.common.Constants.CMDPARAM_COMPLEMENT_DATA_START_DATE;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_RECOVERY_START_NODE_STRING;
-import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_START_NODES;
import static org.apache.dolphinscheduler.common.Constants.DEFAULT_WORKER_GROUP;
@@ -42,7 +41,6 @@ import org.apache.dolphinscheduler.common.model.TaskNode;
import org.apache.dolphinscheduler.common.model.TaskNodeRelation;
import org.apache.dolphinscheduler.common.process.ProcessDag;
import org.apache.dolphinscheduler.common.process.Property;
-import org.apache.dolphinscheduler.common.thread.ThreadUtils;
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils;