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 db5c3bb7f812664bba4e882a399e615e7058f6ff Merge: c4b84e2 91dfe09 Author: lenboo <[email protected]> AuthorDate: Mon Jan 18 16:50:42 2021 +0800 Merge remote-tracking branch 'upstream/dev' into json-split .../api/controller/DataSourceController.java | 63 ++-- .../apache/dolphinscheduler/api/enums/Status.java | 2 +- .../api/service/DataSourceService.java | 192 ++++------- .../api/service/BaseServiceTest.java | 2 + .../api/service/DataSourceServiceTest.java | 108 +++++-- .../dolphinscheduler/common/utils/StringUtils.java | 14 +- .../dao/datasource/BaseDataSource.java | 351 ++++++++++----------- .../dao/datasource/HiveDataSource.java | 124 ++++---- .../dao/datasource/SQLServerDataSource.java | 52 +-- .../dao/datasource/SparkDataSource.java | 45 ++- 10 files changed, 460 insertions(+), 493 deletions(-)
