#2870: [Fix-10049] Conditions Task branch flow failed (#10077)

commit.ref

@@ -1 +1 @@
-Subproject commit 701b535ae6a9fdd7c67797528fb9ff8f650db514
+Subproject commit 225cb332d18e2fef58bf653d644f415dfcce2e99

commit.yml

@@ -2,88 +2,127 @@
 branches: {
   }
 fileChange:
-  /dolphinscheduler-dao:
+  /docs:
-    newFile: !uuid '1759bac27bbd4bbe4dd784ddfa2b97609730f4f4'
+    newFile: !uuid '63ec7ca7e92a7f1614e2aa041778a69fbf145e30'
-    oldFile: !uuid '8aef859ec9b7df92e8c6739a28a6b0c365d00891'
+    oldFile: !uuid '1350d1c6043bf6ecbaa331af959c3dae05c7aba4'
-  /dolphinscheduler-dao/src:
+  /docs/docs:
-    newFile: !uuid 'a0d0679635a02110d705223808b7ffa93653ad98'
+    newFile: !uuid '8de630149dd974a5e68ebbe789110fa178174ec7'
-    oldFile: !uuid '885589e2ef2d8180f8677b4af25ea483e9d3fd22'
+    oldFile: !uuid 'a548663f425957ff07a83270b543fe6522918e11'
-  /dolphinscheduler-dao/src/main:
+  /docs/docs/en:
-    newFile: !uuid '9288e86922a848cca58a115eb9f8a52d5566bd9a'
+    newFile: !uuid 'c1d725ea1b0b5ece558e5bded2268c4c2c9592bb'
-    oldFile: !uuid '49ffd1069c19f980783dbd2748c83bcaf66e60f4'
+    oldFile: !uuid '04c04c0c0ffb610ef59decd8b57f702ba419435d'
-  /dolphinscheduler-dao/src/main/java:
+  /docs/docs/en/guide:
-    newFile: !uuid '86d4d2fdaf4d6670ad149b4b435dee297829d6f8'
+    newFile: !uuid '7f8d691083443776dc241ef73e6e5487aeae2421'
-    oldFile: !uuid '2a50ef9697476098f0d3f8ffeaec5f3c1d896772'
+    oldFile: !uuid 'fc7d10464cfc1628007390a5c60458e009faf6ea'
-  /dolphinscheduler-dao/src/main/java/org:
+  /docs/docs/en/guide/task:
-    newFile: !uuid 'b644de059660a574d3b3c0ef0bb7b7cb9e147a40'
+    newFile: !uuid 'dea798ffe1bf08a0c85fbda8633e75e88139b0a1'
-    oldFile: !uuid '823059b5c6368f1d6e4cb3ebd397bb5b81dd5fe4'
+    oldFile: !uuid '77947edbdf06a67cdce92a3650a7515e0fc08563'
-  /dolphinscheduler-dao/src/main/java/org/apache:
+  /docs/docs/en/guide/task/conditions.md:
-    newFile: !uuid '6f9c89efab52ad86f7c2747e0a9e92965de53627'
+    newFile: !uuid 'df723b355baf18a9bd37b03a9fefeaddb21c8503'
-    oldFile: !uuid '4ce2cbcb5cfd95410a2e7137c20ec742bd28ecc6'
+    oldFile: !uuid '4bd80946488bd3dc7e2baab7d64ac0f015df6aa5'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
+  /docs/docs/zh:
-    newFile: !uuid 'eca3cb620326c20cf0a0f513d799080dd56e5295'
+    newFile: !uuid 'e19fe2ecedf754cdc6014b8f51004ba6423bee45'
-    oldFile: !uuid '1e362fbe2906119177db3b04b9c4aa76cf398fcb'
+    oldFile: !uuid 'd6541b8e61d2d541856fa474757d58440dd44407'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
+  /docs/docs/zh/guide:
-    newFile: !uuid '2922e323e25d8b45a88dcc6409bb2b01f8acec53'
+    newFile: !uuid '74f2e7e49755417a1c07ad9a6dad918ef14ae9f7'
-    oldFile: !uuid 'ed263e0961a7dfd9d4bb32146adeb0c349330f21'
+    oldFile: !uuid '51aad4b51e5815275fe44e25340283209faf8301'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity:
+  /docs/docs/zh/guide/task:
-    newFile: !uuid '63957d2edd2a2f5c88d35d7a6a8044a0a498efda'
+    newFile: !uuid 'cff09490ba0f9bdb4070f4ec8bfef07497d9ee17'
-    oldFile: !uuid '29976aee3a2d6680ad266869a40ee41d96986212'
+    oldFile: !uuid '612f0996f500591bb18fe27fa2058cdfc8da3daf'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java:
+  /docs/docs/zh/guide/task/conditions.md:
-    newFile: !uuid '1cafe0929101f99cf09e57ca9c3a84acb1c9a5fc'
+    newFile: !uuid 'c7fef6d6f1fbe1c727d46d7df69d94893822bdca'
-    oldFile: !uuid '750fbb4e0565f197e8eadf02dce8d1bad0aebbeb'
+    oldFile: !uuid '66f11fa3eddcfd4efc7ef0fd5baf8c0103c7a3ce'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java:
+  /docs/img:
-    newFile: !uuid 'fb6e23b678fd9787e5834f985f7b33da5ec8a524'
+    newFile: !uuid 'c38612bb06f095cc6f7ca9222082c4f03dfaa9cb'
-    oldFile: !uuid '949499d1e8058fba41e9c1f5cefc0be226265d34'
+    oldFile: !uuid '952534dcb626c61c35a6db2b9f7061ab4b676920'
-  /dolphinscheduler-dao/src/main/resources:
+  /docs/img/tasks:
-    newFile: !uuid '0d411a3259352916e0ad87ab2534efdb1ba5fd56'
+    newFile: !uuid '6f2856f282560667b8e1f8edac167ee60c1a96dd'
-    oldFile: !uuid '18f1ff12a0e23f48dbd045f928e8dcffc6d00dea'
+    oldFile: !uuid 'b279c65e1311c40fd60d7e484d87f53ca3cf8ba7'
-  /dolphinscheduler-dao/src/main/resources/org:
+  /docs/img/tasks/demo:
-    newFile: !uuid 'cd34306441b3ae52268e6ea6d68122947a764ba6'
+    newFile: !uuid '08680cc1edaf7cfeaaf1fca9dcedb17864894f04'
-    oldFile: !uuid 'df05be2cd633b2a8c52ae2bdd0832165c7412e3f'
+    oldFile: !uuid 'fffe642f7b66221f2e068bafdff1675bd80acb28'
-  /dolphinscheduler-dao/src/main/resources/org/apache:
+  /docs/img/tasks/demo/condition_task04.png:
-    newFile: !uuid '074bf208e94d978b5671ad9984f253ab17ab6321'
+    newFile: !uuid '9da10be464885edd66cf029c88a4c2f0207ebdf1'
-    oldFile: !uuid '6dcfa2bb054ce6b44d4ca3d60a93902d929d7566'
+    oldFile: null
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler:
+  /dolphinscheduler-master:
-    newFile: !uuid '3abd308a060c70d0f0817a39df56b236021e7c21'
+    newFile: !uuid '8a64c399a29e3056622511820ffaa9e0e1317cae'
-    oldFile: !uuid '6e5138191589fbe17dcedc5afbbf292ff9898db4'
+    oldFile: !uuid '84fe74247723ee4123a37827a4836cbc9339d928'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao:
+  /dolphinscheduler-master/src:
-    newFile: !uuid '02f21c095092fba8dcabe32831c2a2b0a2bad42f'
+    newFile: !uuid 'e5f2884c9425c4187e5d8d5e458ad4d0455c69aa'
-    oldFile: !uuid 'cd893130b3b79945008f13caa367bd4392f1c07d'
+    oldFile: !uuid '88f078b8530cd87c22f5aafbf1687eab981eec07'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper:
+  /dolphinscheduler-master/src/main:
-    newFile: !uuid '52e6d0bfff651cd0ddd4e36dbe44135eb0b1e164'
+    newFile: !uuid '1d5ef2542a9820798e706433868a8d85192ad0c9'
-    oldFile: !uuid 'abb4badcfef2d54a37987a9f4f2c1e390dfb4466'
+    oldFile: !uuid 'eef47938c905c69654fd7d9ffbd396f725f17ba2'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml:
+  /dolphinscheduler-master/src/main/java:
-    newFile: !uuid '95620abb720a5678f5ff93e0d17d30ac65a75e92'
+    newFile: !uuid '916cec396477f16e900996d757ac42f9b28ab5ad'
-    oldFile: !uuid '79e5d4cdb88599960ba4ab0fb5950c542be263b5'
+    oldFile: !uuid '4f6c8b3999164327ee799dea6f9e6d7264ec71ec'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml:
+  /dolphinscheduler-master/src/main/java/org:
-    newFile: !uuid '1f9e09e4d0a1bf6d8ae5c22a5920d4402764e6d3'
+    newFile: !uuid 'f820ad6d9a7c5ed62b87ecb89f083753c21d614e'
-    oldFile: !uuid '25cdfdd6424d08a7d0cdec0ca2a52062f45c6edd'
+    oldFile: !uuid 'a3893b2b84a0523d3043461ef1a85be7472f7046'
-  /dolphinscheduler-dao/src/test:
+  /dolphinscheduler-master/src/main/java/org/apache:
-    newFile: !uuid '57dacb09c16e0b0d9e2c02596d3fc520adda0f25'
+    newFile: !uuid 'b46c7d4180ed71fa6a0fb26b7639f2b093152569'
-    oldFile: !uuid '4acc72247d46bfdeaeed24b571969af0e5cde3a5'
+    oldFile: !uuid '9d57f10f4e9e741187d0bd4d0bf17d71f1187054'
-  /dolphinscheduler-dao/src/test/java:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '24c4afd7fb3fab79b6015e04c005656e58b3933f'
+    newFile: !uuid 'a0066a9c7c5dafcbc0ff9afd082bdb96d0d3164b'
-    oldFile: !uuid 'a8a910d12819459a01558845b9cf80888b9a3b7c'
+    oldFile: !uuid '72bab2fb44690c07243f3987b6b38f640b99e305'
-  /dolphinscheduler-dao/src/test/java/org:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
-    newFile: !uuid 'f1b10a9479486d732727060f7751b5b029c245d5'
+    newFile: !uuid '427d6a96c60eaa8deaf48f78638b560839203454'
-    oldFile: !uuid '032a416bb0d48a438bb839de5481a813a69c5997'
+    oldFile: !uuid '5b8cbec55ed10711f0628504ad9a2972cd56d858'
-  /dolphinscheduler-dao/src/test/java/org/apache:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
-    newFile: !uuid 'e0dd62de596c5c81ef3667f282c9428baa21431b'
+    newFile: !uuid '9b27b0e10864550c70bbc116e70e4af90a7f260b'
-    oldFile: !uuid 'b75f23bda0063bfa6b473ea385b3afa0fdbdc0a9'
+    oldFile: !uuid 'e2d1af04b6475305f758f7ddb8de2ea6746bc8bb'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner:
-    newFile: !uuid '22b5e46fa65d2118c37db3d6c51144831d40c5cc'
+    newFile: !uuid 'e70be2b25e35dafea6cfd66dc91f56365dcdb7a5'
-    oldFile: !uuid 'f4ce42354fe095e75284548894a69d546dd9931f'
+    oldFile: !uuid '770c556b02959045b848e4c41bf4b884d2a30fbf'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java:
-    newFile: !uuid '54852d0147bf252d4c7b296024ce636a9627e07a'
+    newFile: !uuid 'a40b7e5b278f62bc7f5df0f28358fd4997988665'
-    oldFile: !uuid '2d1acf1456e7b9f944d0cf4527febd81ef0ac2dd'
+    oldFile: !uuid '3b7b5511aee24f46228acf66631ec7bb9bf87a6c'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/entity:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task:
-    newFile: !uuid 'd595a26780a848eb0ab28861b7ac29a3d98ce2e3'
+    newFile: !uuid '46a73c9c3d948b11ecf61a0a96ee048306684fb7'
-    oldFile: !uuid '8e11eb46a924470c3d99c81137848204ea1af13e'
+    oldFile: !uuid '269ca968f3765b54765ec44c6aa837a79a63f33b'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/entity/UdfFuncTest.java:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java:
-    newFile: !uuid '38479e9849d791bc95738df7aac1560418a0281a'
+    newFile: !uuid '4749e20f0fc382c9505e5745c3a6b9be055fb9aa'
-    oldFile: !uuid '4231ba35f6f5f5006da28fe2a8d1569a6eb9e5e1'
+    oldFile: !uuid '0928d122bad096199ca506d41fe112190677c6f0'
-gitCommitId: !uuid '701b535ae6a9fdd7c67797528fb9ff8f650db514'
+  /dolphinscheduler-ui:
+    newFile: !uuid '10bb99227f05baf0e4bbd0ae3262c16c13740a66'
+    oldFile: !uuid '47177177ff6ca6c8e060a149b2bb692ba47b8840'
+  /dolphinscheduler-ui/src:
+    newFile: !uuid '92ca2875ccfc45835efda5e65dedf68317cb5b47'
+    oldFile: !uuid '735756e1d15ed881955ade0b842d71590f3039c3'
+  /dolphinscheduler-ui/src/locales:
+    newFile: !uuid '196043d8329c01a2244aed6842d902c39b822285'
+    oldFile: !uuid 'bbeefef0e8df2a31cefcf2cad209485d5f046931'
+  /dolphinscheduler-ui/src/locales/modules:
+    newFile: !uuid '6792fa1382f9cefa6619ccf9eaad41928d5cc4af'
+    oldFile: !uuid '916a0b053cef89af8aab76ef0883ae7d6e1aad9d'
+  /dolphinscheduler-ui/src/locales/modules/en_US.ts:
+    newFile: !uuid 'daf142b35af3b2e097afd4df2e249cf877d16fce'
+    oldFile: !uuid '1f19d64e0ddb1c91ac930b7103596704bbb5c762'
+  /dolphinscheduler-ui/src/locales/modules/zh_CN.ts:
+    newFile: !uuid 'e9c4133907407c0b7e8456025708b95fcd288ded'
+    oldFile: !uuid '108256fec52b0fbe54da132bdc45f81cf91bc3c3'
+  /dolphinscheduler-ui/src/views:
+    newFile: !uuid '1a924b381008a494b9d588587ecfa3c8b7ede37d'
+    oldFile: !uuid '91ebf6d6db4b38c249c4df2c0db0334fd7db29b1'
+  /dolphinscheduler-ui/src/views/projects:
+    newFile: !uuid '142dbd46274d75a768143854fcb0daed6c1d7d1a'
+    oldFile: !uuid '215cd3fd84b640563598e6c7c916a19fc252dd6e'
+  /dolphinscheduler-ui/src/views/projects/task:
+    newFile: !uuid 'e3236b2fffc0a24ffca2aca3471b1aa343dbe23b'
+    oldFile: !uuid '06bf3bb3c52836546c182112380d912061830785'
+  /dolphinscheduler-ui/src/views/projects/task/components:
+    newFile: !uuid '948c6ee447ae4f7547e6a66a37d9bac0bdb26c62'
+    oldFile: !uuid '10cc40940d792383310e7878b301578573d7e336'
+  /dolphinscheduler-ui/src/views/projects/task/components/node:
+    newFile: !uuid '3a5695a62e137a3393fd32a7d09155df05f6475c'
+    oldFile: !uuid 'aed347e319a660877d20abb3b60bfe105278404f'
+  /dolphinscheduler-ui/src/views/projects/task/components/node/fields:
+    newFile: !uuid '778f4a11e96f4a827077f4b065f5b3178903f807'
+    oldFile: !uuid '7481eb6702031752a45b82e08267abaab41953a8'
+  /dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-conditions.ts:
+    newFile: !uuid '53df0bba75bfd4a7e6b4dfd1c944a41f90204eb4'
+    oldFile: !uuid '356e6e0dd370134e500d1ccaec6c0d22c7be866c'
+gitCommitId: !uuid '225cb332d18e2fef58bf653d644f415dfcce2e99'
 renames: {
   }
-revisionId: 2869
+revisionId: 2870