#4474: TaskGroupPriority only compare When TaskGroup is same (#15486)

commit.ref

@@ -1 +1 @@
-Subproject commit e1fcd4e485531677fbbe203e107873e00b8c63c6
+Subproject commit 44c356db4dda185e585de7727316e756002bb720

commit.yml

@@ -2,40 +2,102 @@
 branches: {
   }
 fileChange:
-  /dolphinscheduler-api:
+  /dolphinscheduler-master:
-    newFile: !uuid '40fb764deb621affd4e6555410add3dd948b11de'
+    newFile: !uuid '4e5e8e712dceb396ec5fd5bdc3cfaf32060fa23b'
-    oldFile: !uuid '294839460845366f0d37be6eead081890b37ef44'
+    oldFile: !uuid '8a01eec248fca0ba5992a98fd3cc9f511d3c4a02'
-  /dolphinscheduler-api/src:
+  /dolphinscheduler-master/src:
-    newFile: !uuid 'f7cacc8e7e1125336f1a8d3ec42309fd30af1cdf'
+    newFile: !uuid '7a42ebcd2a182bb9d6a3664ba6be9afaad85ae17'
-    oldFile: !uuid '81a4b62a9d1e65b0fbf909056dc4ec0822b3ede5'
+    oldFile: !uuid '8ca50e4e2288c8dd33ee53c670c3d5c1e8a269ef'
-  /dolphinscheduler-api/src/main:
+  /dolphinscheduler-master/src/main:
-    newFile: !uuid 'ef44d05a6ad5f4c27daa160882289a568be27b15'
+    newFile: !uuid '311c5200817f72815de6bbb7fe6e335b1fc8bb85'
-    oldFile: !uuid '69314c202792d8600ffdbbb1ce02b42b6b88d8db'
+    oldFile: !uuid '5b45c35c593e242bce55591620e915d29d3fbeb0'
-  /dolphinscheduler-api/src/main/java:
+  /dolphinscheduler-master/src/main/java:
-    newFile: !uuid '43cf1342bb9ce83b7e414d91fd577c14855bfab1'
+    newFile: !uuid '895c39e83851a580c557a8437f04a7937f8c08b9'
-    oldFile: !uuid 'd0c204138097efdb679c9ea2dc39e3c16f83f06e'
+    oldFile: !uuid '84fec19d6e1d10c59163f124a0c240ae65e95297'
-  /dolphinscheduler-api/src/main/java/org:
+  /dolphinscheduler-master/src/main/java/org:
-    newFile: !uuid '8143502915fb32411daaeff816b55ac9e30ba27d'
+    newFile: !uuid '6cf142ced594c5b8a100b2efed50f81bad3cf97f'
-    oldFile: !uuid '0350030ffa13f2555bde6a3b9eedae3e79cab0ce'
+    oldFile: !uuid '29ed714b3e49343446949381407f88e1194fc36c'
-  /dolphinscheduler-api/src/main/java/org/apache:
+  /dolphinscheduler-master/src/main/java/org/apache:
-    newFile: !uuid 'f6fb7c21265625b5290b113cd6fc8230524c57ba'
+    newFile: !uuid '82e5ecd6ba51718eef3fe12c0dc6b9dd8b94697d'
-    oldFile: !uuid 'b366ad2635eb6e2ba8c4e70ef46a66c6719800a0'
+    oldFile: !uuid '3931c4c50104de96e184bf0108e10a1c37ab3e98'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '3f012b3025474cb3996b47349f5aa28b02e0801f'
+    newFile: !uuid 'e1f3d349f255dc064552a7f2e97bd2a2b8f56d0c'
-    oldFile: !uuid 'ca8d470ecc21c4673a571ec7c03031e55345d82b'
+    oldFile: !uuid 'b622e687e6338700b565dfb8ae7654f29622b894'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
-    newFile: !uuid '805641501a13e19a22160864966d62bff53db4dd'
+    newFile: !uuid '7df58cea8a00335ff5f15f8340b83a48e2e9f24b'
-    oldFile: !uuid '08701ab28a8c10f225346d90ca088a2c05d669cb'
+    oldFile: !uuid '39e1ea7613f82e5352930cd16f8f759306faafe3'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
-    newFile: !uuid 'd9a4488297f9d0684b327abc34440ee14a373d57'
+    newFile: !uuid '79ba737d9e80f5143cdf21925048829d32f207c5'
-    oldFile: !uuid '0e4c1c500a621451e5a658ce37807e0047ec5952'
+    oldFile: !uuid '62b0cc6af13b51efd3a2cbcfd6ede34bcd17cfe6'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner:
-    newFile: !uuid '6171ff2f462b1226772d122fee747fc5e60d92e3'
+    newFile: !uuid 'ee4e8d14e3dd5548fbe2f091b85186854e2784c4'
-    oldFile: !uuid '0155e935cab321f6375dd0ba9a7be2bf0612edba'
+    oldFile: !uuid '2d7ed514707b320c72e6e6efb5b842292665b4e0'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java:
-    newFile: !uuid 'd3426dfa3e6c91d3228826333641a8514bf9f0b3'
+    newFile: !uuid '3759f2209c2bc989183d97ae21f352064fca5a9a'
-    oldFile: !uuid '330374779f62cf155039be0a57fd24407fca0076'
+    oldFile: !uuid 'b558d6cf374544b56dd6a88082972ab3cc87c813'
-gitCommitId: !uuid 'e1fcd4e485531677fbbe203e107873e00b8c63c6'
+  /dolphinscheduler-service:
-renames: {
+    newFile: !uuid '974bd646022d58157eeb09f644506ef3d6d57b4a'
-  }
+    oldFile: !uuid '955f34e43dc08c72209f009cc237b45c9f1a7400'
-revisionId: 4473
+  /dolphinscheduler-service/src:
+    newFile: !uuid '9faa0594f097d1dc73727e5e614505ea7b670dcb'
+    oldFile: !uuid 'f4a7a6c060e3a20944c1872c341ede03a87730f7'
+  /dolphinscheduler-service/src/main:
+    newFile: !uuid 'c1abdd0f6f900a8c5bc8b3610bf4efe24914e892'
+    oldFile: !uuid '31adf8b3b5641b695d6d8590ad592f521a23c603'
+  /dolphinscheduler-service/src/main/java:
+    newFile: !uuid 'b3c9151e623c6c735e40f9b0a43e9e8f4150879e'
+    oldFile: !uuid '384ce68df789c7d35a8feb34bf331ef23c9734a2'
+  /dolphinscheduler-service/src/main/java/org:
+    newFile: !uuid '16ec7a17c8de44cb3b1a4ece5895c5b3d0dd80b8'
+    oldFile: !uuid 'e9444e1971f8ba5eee93cbe97f3b219456237df6'
+  /dolphinscheduler-service/src/main/java/org/apache:
+    newFile: !uuid '4fa696e480602d247dbd5ba83a1280845c51d1c5'
+    oldFile: !uuid '05aa18aae0147e6589cf5fc078638eeb97a2e6d8'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '0ffa6ccca2ab63c295d59d6be985c1f9f0bf9fa4'
+    oldFile: !uuid '7735318642b0f9ec16132c0feabce3e51dcc5131'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service:
+    newFile: !uuid '0e976bb7d7da54f54b69bc30f24ed89a1c2042b6'
+    oldFile: !uuid '321d6daab549aa11a9feb8c4cda1ff852a1bb0a1'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue:
+    newFile: !uuid 'ed99b98d81fc81f90b154e3b6c467e9e2a91a55b'
+    oldFile: !uuid '61182b91396e5f02b213c96891825b6b0f80ab7b'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/PeerTaskInstancePriorityQueue.java:
+    newFile: null
+    oldFile: !uuid '5bd89ffad53964d5a19658c8e9d5a181d743ee05'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/StandByTaskInstancePriorityQueue.java:
+    newFile: !uuid 'c11c4fe5a9e3774731c624ae8488efec2162b638'
+    oldFile: null
+  /dolphinscheduler-service/src/test:
+    newFile: !uuid 'e1fcc67a58975d1c058e15ebd2cd14b5730022dc'
+    oldFile: !uuid '821ebb108d91f68dcc4d72d2d079925ae4a8af0d'
+  /dolphinscheduler-service/src/test/java:
+    newFile: !uuid 'f6b02e3211d1c845da1fe24a4220e8132e0f5b04'
+    oldFile: !uuid '5912e8ffbec7914b1f556d3c23da93737e9b9083'
+  /dolphinscheduler-service/src/test/java/org:
+    newFile: !uuid '86f5d9ffcf5a38d3c73ca27f2a5d420f9cb992f4'
+    oldFile: !uuid '837666d91c7a91d61d707b6d056672ffeaee7050'
+  /dolphinscheduler-service/src/test/java/org/apache:
+    newFile: !uuid 'bd7142c77e021180f8eccbde805f03c19ffc62a5'
+    oldFile: !uuid '9fb26255755b743fac32a5ec30e09776270c9148'
+  /dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler:
+    newFile: !uuid '43b4fa7907ce09430d953c40013a01c30b24be73'
+    oldFile: !uuid 'c5226e577a61a784dc67286fa7c43660a3dbc448'
+  /dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service:
+    newFile: !uuid '081b65fea9f57ad8c47f0f550f2cb9fb81f3a554'
+    oldFile: !uuid 'ed485d675a18dc79e99eef9558c6aedb1e5b6176'
+  /dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue:
+    newFile: !uuid '32b2338f1be7ab916625f009e514a6233f330c55'
+    oldFile: !uuid 'e21cca3f79fd0c9cf8c26541184f8c069168897d'
+  /dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/PeerTaskInstancePriorityQueueTest.java:
+    newFile: null
+    oldFile: !uuid 'a430ab3c950fb6985cea3c144cef794d609a746e'
+  ? /dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/StandByTaskInstancePriorityQueueTest.java
+  : newFile: !uuid '80a25139299bf0f28402e37f4992355fd12f3f68'
+    oldFile: null
+gitCommitId: !uuid '44c356db4dda185e585de7727316e756002bb720'
+renames:
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/StandByTaskInstancePriorityQueue.java: /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/PeerTaskInstancePriorityQueue.java
+  ? /dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/StandByTaskInstancePriorityQueueTest.java
+  : /dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/PeerTaskInstancePriorityQueueTest.java
+revisionId: 4474