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/02/07 06:52:08 UTC
[incubator-dolphinscheduler] branch json_split updated (5073510 ->
9141840)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 5073510 Merge remote-tracking branch 'upstream/dev' into spilit
add 03a2c6b [Improvement-4450][datasource] Hive/Spark data sources do not support multi-tenancy when Kerberos authentication is enabled (#4593)
add 7c07900 [Improvement][install] alert-server properties make adjustments in the Install script (#4709)
add a5443f1 [fix-4128][worker] Dolphin executes the command using sudo to specify the -u parameter (#4217)
new 9141840 merge from dev
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:
.../src/main/resources/alert.properties | 2 +-
.../api/controller/DataSourceController.java | 42 +++-
.../api/service/DataSourceService.java | 9 +-
.../src/main/resources/i18n/messages.properties | 4 +
.../main/resources/i18n/messages_en_US.properties | 4 +
.../main/resources/i18n/messages_zh_CN.properties | 4 +
.../api/service/DataSourceServiceTest.java | 26 +-
.../apache/dolphinscheduler/common/Constants.java | 4 +-
.../dolphinscheduler/common/utils/CommonUtils.java | 19 +-
.../dolphinscheduler/common/utils/OSUtils.java | 10 +
.../dolphinscheduler/common/utils/StringUtils.java | 4 +
.../dolphinscheduler/common/utils/OSUtilsTest.java | 7 +
.../common/utils/StringUtilsTest.java | 18 ++
.../dao/datasource/BaseDataSource.java | 38 +++
.../dao/datasource/HiveDataSource.java | 2 +-
.../dao/datasource/SparkDataSource.java | 2 +-
.../dao/datasource/BaseDataSourceTest.java | 269 ++++++++++-----------
.../server/utils/ProcessUtils.java | 9 +-
.../server/worker/processor/TaskKillProcessor.java | 4 +-
.../worker/task/AbstractCommandExecutor.java | 9 +-
.../server/worker/task/sql/SqlTask.java | 43 +---
.../src/main/resources/config/install_config.conf | 31 +--
.../server/utils/ProcessUtilsTest.java | 3 +-
.../pages/list/_source/createDataSource.vue | 56 ++++-
.../src/js/module/i18n/locale/en_US.js | 3 +
.../src/js/module/i18n/locale/zh_CN.js | 3 +
install.sh | 10 +-
27 files changed, 378 insertions(+), 257 deletions(-)
[incubator-dolphinscheduler] 01/01: merge from dev
Posted by le...@apache.org.
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 9141840bbed0a4b8348f9c9330be004e589f6bac
Merge: 5073510 a5443f1
Author: lenboo <ba...@gmail.com>
AuthorDate: Sun Feb 7 14:51:48 2021 +0800
merge from dev
.../src/main/resources/alert.properties | 2 +-
.../api/controller/DataSourceController.java | 42 +++-
.../api/service/DataSourceService.java | 9 +-
.../src/main/resources/i18n/messages.properties | 4 +
.../main/resources/i18n/messages_en_US.properties | 4 +
.../main/resources/i18n/messages_zh_CN.properties | 4 +
.../api/service/DataSourceServiceTest.java | 26 +-
.../apache/dolphinscheduler/common/Constants.java | 4 +-
.../dolphinscheduler/common/utils/CommonUtils.java | 19 +-
.../dolphinscheduler/common/utils/OSUtils.java | 10 +
.../dolphinscheduler/common/utils/StringUtils.java | 4 +
.../dolphinscheduler/common/utils/OSUtilsTest.java | 7 +
.../common/utils/StringUtilsTest.java | 18 ++
.../dao/datasource/BaseDataSource.java | 38 +++
.../dao/datasource/HiveDataSource.java | 2 +-
.../dao/datasource/SparkDataSource.java | 2 +-
.../dao/datasource/BaseDataSourceTest.java | 269 ++++++++++-----------
.../server/utils/ProcessUtils.java | 9 +-
.../server/worker/processor/TaskKillProcessor.java | 4 +-
.../worker/task/AbstractCommandExecutor.java | 9 +-
.../server/worker/task/sql/SqlTask.java | 43 +---
.../src/main/resources/config/install_config.conf | 31 +--
.../server/utils/ProcessUtilsTest.java | 3 +-
.../pages/list/_source/createDataSource.vue | 56 ++++-
.../src/js/module/i18n/locale/en_US.js | 3 +
.../src/js/module/i18n/locale/zh_CN.js | 3 +
install.sh | 10 +-
27 files changed, 378 insertions(+), 257 deletions(-)
diff --cc dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java
index 47c709c,6bed928..6ed3b00
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java
@@@ -64,32 -62,10 +64,36 @@@ public class StringUtils
return str == null ? null : str.trim();
}
+ public static String join(final Iterable<?> iterable, final String separator) {
+ if (iterable == null) {
+ return null;
+ }
+ Iterator<?> iterator = iterable.iterator();
+ if (!iterator.hasNext()) {
+ return EMPTY;
+ }
+ final Object first = iterator.next();
+ if (!iterator.hasNext()) {
+ return String.valueOf(first);
+ }
+ // two or more elements
+ final StringBuilder buf = new StringBuilder(256);
+ while (iterator.hasNext()) {
+ if (separator != null) {
+ buf.append(separator);
+ }
+ final Object obj = iterator.next();
+ if (obj != null) {
+ buf.append(obj);
+ }
+ }
+ return buf.toString();
+ }
+
+ public static String defaultIfBlank(String str, String defaultStr) {
+ return isBlank(str) ? defaultStr : str;
+ }
+
public static boolean equalsIgnoreCase(String str1, String str2) {
return str1 == null ? str2 == null : str1.equalsIgnoreCase(str2);
}