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/01/13 06:31:26 UTC

[incubator-dolphinscheduler] branch json_split updated (4cdf970 -> 95bbdfe)

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 4cdf970  [Feature][JsonSplit] Table Structure Design (#4431)
     add 3dc4bdc  [DS-4396][feat] Add project information to email alert message (#4413)
     new d1a0d58  Merge remote-tracking branch 'upstream/dev' into json-split
     new 95bbdfe  Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into json-split

The 2 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:
 .../dao/entity/ProcessAlertContent.java            | 28 +++++++++++++++++++++-
 .../dolphinscheduler/dao/mapper/ProjectMapper.java | 15 ++++++++++--
 .../dolphinscheduler/dao/mapper/ProjectMapper.xml  | 12 ++++++++++
 .../server/master/runner/MasterExecThread.java     |  4 +++-
 .../server/utils/AlertManager.java                 | 17 +++++++++----
 .../server/master/AlertManagerTest.java            | 10 ++++++--
 .../service/process/ProcessService.java            | 10 ++++++++
 7 files changed, 86 insertions(+), 10 deletions(-)


[incubator-dolphinscheduler] 01/02: Merge remote-tracking branch 'upstream/dev' into json-split

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 d1a0d585ccc30886731d8552aab8522dcc966c6d
Merge: d67b335 3dc4bdc
Author: lenboo <ba...@gmail.com>
AuthorDate: Wed Jan 13 14:30:04 2021 +0800

    Merge remote-tracking branch 'upstream/dev' into json-split

 .../dao/entity/ProcessAlertContent.java            | 28 +++++++++++++++++++++-
 .../dolphinscheduler/dao/mapper/ProjectMapper.java | 15 ++++++++++--
 .../dolphinscheduler/dao/mapper/ProjectMapper.xml  | 12 ++++++++++
 .../server/master/runner/MasterExecThread.java     |  4 +++-
 .../server/utils/AlertManager.java                 | 17 +++++++++----
 .../server/master/AlertManagerTest.java            | 10 ++++++--
 .../service/process/ProcessService.java            | 10 ++++++++
 7 files changed, 86 insertions(+), 10 deletions(-)


[incubator-dolphinscheduler] 02/02: Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into json-split

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 95bbdfedfeaca8f929ad076ad1b161d82f896cb7
Merge: d1a0d58 4cdf970
Author: lenboo <ba...@gmail.com>
AuthorDate: Wed Jan 13 14:30:59 2021 +0800

    Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into json-split

 dolphinscheduler-api/pom.xml                       |   5 +
 .../apache/dolphinscheduler/common/Constants.java  |   5 +
 .../common/utils/SnowFlakeUtils.java               | 103 +++++++++++++
 .../src/main/resources/common.properties           |   2 +
 .../common/utils/SnowFlakeUtilsTest.java           |  33 ++++
 sql/dolphinscheduler_mysql.sql                     | 166 +++++++++++++++++----
 6 files changed, 288 insertions(+), 26 deletions(-)