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 2603d52044e8e83a2e44e31b072d96dd90ecb269 Merge: df0e3e9 a25c397 Author: lenboo <[email protected]> AuthorDate: Mon Mar 1 15:20:34 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit .github/ISSUE_TEMPLATE/feature_request.md | 2 +- .github/ISSUE_TEMPLATE/improvement_suggestion.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- README.md | 37 +- README_zh_CN.md | 55 +-- docker/build/Dockerfile | 3 +- docker/build/README.md | 191 ++++++++- docker/build/README_zh_CN.md | 192 ++++++++- .../conf/dolphinscheduler/common.properties.tpl | 2 +- .../dolphinscheduler/env/dolphinscheduler_env.sh | 28 -- .../env/dolphinscheduler_env.sh.tpl} | 18 +- .../conf/dolphinscheduler/worker.properties.tpl | 2 +- docker/build/startup-init-conf.sh | 19 +- docker/docker-swarm/docker-compose.yml | 29 +- docker/docker-swarm/docker-stack.yml | 37 +- docker/kubernetes/dolphinscheduler/README.md | 290 +++++++++---- .../api/controller/BaseController.java | 4 +- .../api/service/impl/ProjectServiceImpl.java | 3 +- .../common/utils/CollectionUtils.java | 9 +- dolphinscheduler-dist/release-docs/LICENSE | 13 +- dolphinscheduler-dist/release-docs/NOTICE | 28 ++ .../release-docs/licenses/LICENSE-javassist.txt | 469 +++++++++++++++++++++ .../licenses/LICENSE-protostuff-api.txt | 202 +++++++++ .../licenses/LICENSE-protostuff-core.txt | 202 +++++++++ .../licenses/LICENSE-protostuff-runtime.txt | 202 +++++++++ .../LICENSE-protostuff.collectionschema.txt | 202 +++++++++ .../release-docs/licenses/LICENSE-reflections.txt | 13 + dolphinscheduler-microbench/pom.xml | 4 + .../microbench/common/IUserService.java | 31 ++ .../microbench/common/RpcTest.java | 77 ++++ .../microbench/common/UserCallback.java | 30 ++ .../microbench/common/UserService.java | 37 ++ dolphinscheduler-remote/pom.xml | 26 ++ .../remote/codec/NettyDecoder.java | 36 +- .../dolphinscheduler/remote/utils/Constants.java | 2 +- .../org/apache/dolphinscheduler/rpc/base/Rpc.java | 57 +++ .../dolphinscheduler/rpc/base/RpcService.java | 29 ++ .../rpc/client/ConsumerConfig.java | 87 ++++ .../rpc/client/ConsumerConfigCache.java | 40 ++ .../rpc/client/ConsumerInterceptor.java | 124 ++++++ .../dolphinscheduler/rpc/client/IRpcClient.java | 29 ++ .../dolphinscheduler/rpc/client/RpcClient.java | 42 ++ .../rpc/client/RpcRequestCache.java | 46 ++ .../rpc/client/RpcRequestTable.java | 52 +++ .../dolphinscheduler/rpc/codec/NettyDecoder.java | 82 ++++ .../dolphinscheduler/rpc/codec/NettyEncoder.java | 52 +++ .../rpc/common/AbstractRpcCallBack.java | 32 ++ .../rpc/common/ConsumerConfigConstants.java | 34 ++ .../rpc/common/RequestEventType.java | 42 ++ .../rpc/common/ResponseEventType.java | 40 ++ .../dolphinscheduler/rpc/common/RpcRequest.java | 84 ++++ .../dolphinscheduler/rpc/common/RpcResponse.java | 66 +++ .../rpc/common/ThreadPoolManager.java | 44 ++ .../dolphinscheduler/rpc/config/ServiceBean.java | 71 ++++ .../dolphinscheduler/rpc/future/RpcFuture.java | 87 ++++ .../dolphinscheduler/rpc/protocol/EventType.java | 42 ++ .../rpc/protocol/MessageHeader.java | 77 ++++ .../dolphinscheduler/rpc/protocol/RpcProtocol.java | 41 ++ .../rpc/protocol/RpcProtocolConstants.java | 30 ++ .../dolphinscheduler/rpc/remote/NettyClient.java | 253 +++++++++++ .../rpc/remote/NettyClientHandler.java | 120 ++++++ .../dolphinscheduler/rpc/remote/NettyServer.java | 196 +++++++++ .../rpc/remote/NettyServerHandler.java | 114 +++++ .../rpc/serializer/ProtoStuffSerializer.java | 60 +++ .../rpc/serializer/ProtoStuffUtils.java | 68 +++ .../rpc/serializer/RpcSerializer.java | 49 +++ .../rpc/serializer/Serializer.java | 28 ++ .../apache/dolphinscheduler/rpc/IUserService.java | 34 ++ .../org/apache/dolphinscheduler/rpc/RpcTest.java | 64 +++ .../apache/dolphinscheduler/rpc/UserCallback.java | 37 ++ .../apache/dolphinscheduler/rpc/UserService.java | 52 +++ .../src/main/resources/worker.properties | 2 +- .../service/quartz/QuartzExecutors.java | 2 +- .../dolphinscheduler/common/BrowserCommon.java | 2 +- pom.xml | 30 ++ tools/dependencies/check-LICENSE.sh | 2 +- tools/dependencies/known-dependencies.txt | 6 + 77 files changed, 4718 insertions(+), 230 deletions(-) diff --cc dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java index 671b63a,50bee6f..953f721 --- 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,14 -95,9 +99,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) { - Project insertedProject = projectMapper.queryByName(name); - result.put(Constants.DATA_LIST, insertedProject); + result.put(Constants.DATA_LIST, project); putMsg(result, Status.SUCCESS); } else { putMsg(result, Status.CREATE_PROJECT_ERROR);
