[incubator-dolphinscheduler] branch dev updated (6925f8f -> 2b384c1)

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lidongdai pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.


    from 6925f8f  [Fix-4850][Alert] fix the port number indicates a ServerPort is not number when the mail alert plug-in is edited  (#4860)
     new 52b1c74  Merge remote-tracking branch 'upstream/dev' into dev
     new 46b8b15  [Improvement-#4503][dolphinscheduler-dist]Jackson version upgraded to 2.10.5
     new 6fc124e  Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
     new 2cfe755  Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
     new 7d7809a  Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
     new 91e563d  Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
     new 8ec345c  [Improvement][TaskExecuteProcessor]Delete redundant code in method of setTaskCache
     new 11c22cc  Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev_wuxiaofei_server
     new b352c52  [Improvement][master] Replace sleep&task with poll in TaskPriorityQueueConsumer#4137
     new f2e41c2  [Checkstyle][TaskPriorityQueueConsumer]import check
     new 354b1cd  [Checkstyle][common]delete unknown soft_version
     new 5faa5d1  [BUG][PeerTaskInstancePriorityQueue]poll implemented in PriorityQueue
     new bc2a8fb  [Test][PeerTaskInstancePriorityQueueTest]testPoll added
     new 9da30dd  [Test][TaskPriorityQueueImplTest]Test with coverity
     new 1838c81  [CodeStyle][QueueTest]import style
     new d118967  [CodeStyle][QueueTest]code style
     new 28975d7  [CodeStyle][QueueTest]empty line more than one line of impor style
     new 179507b  Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev_wuxiaofei_server
     new 450c84b  [CodeStyle][PeerQueueTest]TimeUnit seperated from previous import
     new 8d00386  [CodeStyle][QueueTest]import style
     new 9d8b35a  [Test][TaskPQImplTest]license header appended
     new 6e0093c  [Test][service]Adjust test of queue
     new a349ed8  Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev_wuxiaofei_server
     new 757c116  [BUG][TaskExecuteProcessor]setTaskCache is first preTaskCache
     new 3a215cb  [Performance][PeerTaskInstancePriorityQueue]Nearly realization of poll with timeout
     new 911cf06  Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev_wuxiaofei_server
     new 4887261  [Performance][PeerTaskInstancePriorityQueue]code style formatter
     new 8986c84  [BUG][PeerTaskInstancePriorityQueue]poll with timeout is not currently supported
     new b2a871b  [BUG][PeerTaskInstancePriorityQueue]string formatter
     new 6ce876a  Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev_wuxiaofei_server
     new 2b384c1  Merge pull request #4832 from woshiwuxiaofei/dev_wuxiaofei_server

The 4546 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:
 .../master/consumer/TaskPriorityQueueConsumer.java |  8 +-
 .../worker/processor/TaskExecuteProcessor.java     |  2 +-
 .../queue/PeerTaskInstancePriorityQueue.java       | 24 ++++++
 .../service/queue/TaskPriorityQueue.java           | 13 ++++
 .../service/queue/TaskPriorityQueueImpl.java       | 15 ++++
 .../queue/PeerTaskInstancePriorityQueueTest.java   | 65 +++++++++++-----
 .../service/queue/TaskPriorityQueueImplTest.java}  | 87 ++++++++++++++++++----
 .../src/test/java/queue/TaskUpdateQueueTest.java   | 57 --------------
 8 files changed, 177 insertions(+), 94 deletions(-)
 rename dolphinscheduler-service/src/test/java/{ => org/apache/dolphinscheduler/service}/queue/PeerTaskInstancePriorityQueueTest.java (60%)
 rename dolphinscheduler-service/src/test/java/{queue/TaskPriorityTest.java => org/apache/dolphinscheduler/service/queue/TaskPriorityQueueImplTest.java} (52%)
 delete mode 100644 dolphinscheduler-service/src/test/java/queue/TaskUpdateQueueTest.java