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
commit dcf97920aa20fbfb6905677156b5210b7bfbd3d9 Merge: 0c2b065 5bfe3fc Author: lenboo <[email protected]> AuthorDate: Wed Mar 3 10:44:12 2021 +0800 merge from dev 2021-03-03 .../api/service/impl/ProjectServiceImpl.java | 3 +- .../dao/datasource/BaseDataSource.java | 26 ++ .../dao/datasource/HiveDataSource.java | 17 + .../dolphinscheduler/dao/entity/UdfFunc.java | 2 +- .../dao/datasource/BaseDataSourceTest.java | 34 ++ .../dao/datasource/HiveDataSourceTest.java | 2 +- .../server/master/MasterServer.java | 69 +++- .../dispatch/host/LowerWeightHostManager.java | 2 +- .../server/master/registry/MasterRegistry.java | 38 +- .../server/registry/HeartBeatTask.java | 33 +- .../server/registry/ZookeeperNodeManager.java | 4 +- .../server/registry/ZookeeperRegistryCenter.java | 92 ++++- .../server/worker/WorkerServer.java | 74 ++-- .../server/worker/registry/WorkerRegistry.java | 36 +- .../server/worker/task/sql/SqlTask.java | 3 + .../dolphinscheduler/server/zk/ZKMasterClient.java | 12 +- .../server/master/DependentTaskTest.java | 447 +++++++++++++++------ .../consumer/TaskPriorityQueueConsumerTest.java | 4 +- .../server/master/registry/MasterRegistryTest.java | 7 +- .../registry/ZookeeperRegistryCenterTest.java | 61 +++ .../worker/processor/TaskCallbackServiceTest.java | 4 +- .../server/worker/registry/WorkerRegistryTest.java | 44 +- .../service/zk/AbstractZKClient.java | 83 +--- .../service/zk/RegisterOperator.java | 155 +++++++ .../service/zk/ZookeeperCachedOperator.java | 3 + .../service/zk/RegisterOperatorTest.java | 116 ++++++ .../conf/home/pages/dag/_source/formModel/log.vue | 2 +- .../formModel/tasks/_source/dependItemList.vue | 34 +- .../_source/formModel/tasks/_source/nodeStatus.vue | 2 + .../dag/_source/formModel/tasks/conditions.vue | 1 - .../resource/pages/file/pages/details/index.vue | 2 +- pom.xml | 3 + 32 files changed, 1042 insertions(+), 373 deletions(-) diff --cc dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java index fcff602,c2e85cf..09d0a36 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java @@@ -99,13 -96,9 +100,13 @@@ public class ProjectServiceImpl extend .createTime(now) .updateTime(now) .build(); + } catch (SnowFlakeException e) { + putMsg(result, Status.CREATE_PROJECT_ERROR); + return result; + } if (projectMapper.insert(project) > 0) { - result.put(Constants.DATA_LIST, project); + result.put(Constants.DATA_LIST, project.getId()); putMsg(result, Status.SUCCESS); } else { putMsg(result, Status.CREATE_PROJECT_ERROR); diff --cc dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/DependentTaskTest.java index 52ed4a9,48a0750..7609c45 --- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/DependentTaskTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/DependentTaskTest.java @@@ -14,21 -14,30 +14,33 @@@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.server.master; + import org.apache.dolphinscheduler.common.Constants; + import org.apache.dolphinscheduler.common.enums.DependResult; + import org.apache.dolphinscheduler.common.enums.DependentRelation; import org.apache.dolphinscheduler.common.enums.ExecutionStatus; import org.apache.dolphinscheduler.common.enums.TaskType; - import org.apache.dolphinscheduler.common.model.DateInterval; + import org.apache.dolphinscheduler.common.model.DependentItem; + import org.apache.dolphinscheduler.common.model.DependentTaskModel; import org.apache.dolphinscheduler.common.model.TaskNode; - import org.apache.dolphinscheduler.common.utils.dependent.DependentDateUtils; - import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; + import org.apache.dolphinscheduler.common.task.dependent.DependentParameters; + import org.apache.dolphinscheduler.common.thread.Stopper; + import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.TaskDefinition; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.server.master.config.MasterConfig; import org.apache.dolphinscheduler.server.master.runner.DependentTaskExecThread; import org.apache.dolphinscheduler.service.bean.SpringApplicationContext; import org.apache.dolphinscheduler.service.process.ProcessService; + ++import java.util.ArrayList; ++import java.util.List; + import java.util.stream.Collectors; + import java.util.stream.Stream; + import org.junit.Assert; import org.junit.Before; import org.junit.Test;
