Browse Source

#4432: [Fix #15129] [Dependent] The date rules of the dependent node are ambiguous. (#15289)

* [Fix-15129][Dependent] Fix the ambiguity in date rules for dependent node.

* [fix #15129] Revert ddl

* restore findLastProcessInterval

* update: mvn spotless:apply

---------

Co-authored-by: 李乐 <lile@boimc.com>
Co-authored-by: xiangzihao <460888207@qq.com>
git-as-svn/v1/dev
ll 11 months ago committed by GitHub
parent
commit
32f648f96c
  1. 2
      commit.ref
  2. 139
      commit.yml

2
commit.ref

@ -1 +1 @@
Subproject commit 0bb48f342973663b3466934701eea79aabcec6b3 Subproject commit 0c470ffe66312085d47d5f55ad5717647aa44360

139
commit.yml

@ -2,46 +2,103 @@
branches: { branches: {
} }
fileChange: fileChange:
/dolphinscheduler-task-plugin: /dolphinscheduler-dao:
newFile: !uuid '83e234b8ccb6c5d9573e4c79ed75a4cf05452504' newFile: !uuid 'f9f47b2885c65a14f7cbf8f93b662e068d9ff743'
oldFile: !uuid '70334a0661101cb759cdd740eb316ec67e008050' oldFile: !uuid '9392c8abf1cbc23c10417f7318e9dcd7da01d2d5'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api: /dolphinscheduler-dao/src:
newFile: !uuid '5afa7e8f14382857980249c52cd6269169444624' newFile: !uuid '365ed41dad12d959a8d0fc2aad1c7b57e2b57eb2'
oldFile: !uuid 'aadf1d3cb1fc115f46db3f6bfc258aa93c394fda' oldFile: !uuid '42ad3d83ce7c79a7aad82ba2e4643cd38c099d80'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src: /dolphinscheduler-dao/src/main:
newFile: !uuid 'c4a38910dd518300eed4f4529ca70b74f63793da' newFile: !uuid 'c67d0667e8384c52f57b06377365a4621d978375'
oldFile: !uuid 'f942c922b1358a21bcb9751c5cbedd915254a510' oldFile: !uuid '2ba89a03ed4df56740d8e749b9e46692b9c2d374'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main: /dolphinscheduler-dao/src/main/java:
newFile: !uuid '69c9719985104ed34fa67277014376de49a16ad8' newFile: !uuid '3f25fad70d0ea13aaf0a94ce14423e49eec2135f'
oldFile: !uuid 'b8c473ed87d3fbaad7353778f48aec4e8a0fc6ea' oldFile: !uuid 'e75e41c31e2affe583f7abf139572cb3914bc54f'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java: /dolphinscheduler-dao/src/main/java/org:
newFile: !uuid '79bd682a0b4d75db29a84f72b5e470dcb9988ca3' newFile: !uuid '7654131534ec943cfd4dc9199729b36c03d9960c'
oldFile: !uuid 'e24b5f8aece5cfef7b37faadf6b1c3b3a223e1d0' oldFile: !uuid '77d46a5e778a570f3a658c89bb27f82e2fdb7743'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org: /dolphinscheduler-dao/src/main/java/org/apache:
newFile: !uuid 'fe567824b4c8bcd28b59cfbe59f739e6ddf3f49b' newFile: !uuid 'e3513acb08276b5653281566de6016e2da809c2d'
oldFile: !uuid '7459acc17c09ae28ffc41a5b60e2873a6becf293' oldFile: !uuid '2a1a4dbd675602bd45b1bda971be69acacf10c80'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache: /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid 'bba8c685d1157c04db8715d8bb37dfdeda7565bc' newFile: !uuid '427d3a2ebb045e093624534705769867d87c6f5b'
oldFile: !uuid '397905215032923f02b72deb2ea6ca4dcf731e9c' oldFile: !uuid '818056e26fccf71217e978a4bf55dff95697019b'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler: /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
newFile: !uuid '5e2af954c03481526f1534712ea0b22b0bca7b73' newFile: !uuid '0b4d17b0ef1a018d213981e1282a9bcbcf44750d'
oldFile: !uuid '0a7bd6ec69a6b91994c45f9b4f2cb716518717af' oldFile: !uuid 'a27022f274343aa33c923d3e940fe33d7bb9ec7b'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin: /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper:
newFile: !uuid '204ea9ecdc928b373d88301dce7d92df6355ecc8' newFile: !uuid 'c4ca49b8f38f957b47bfd9302a7ec1182abf30fa'
oldFile: !uuid '2aba856d3df2945f715adabe91501a448eb84fc0' oldFile: !uuid '144c12851ee024c7b7117ae84b411bfa548312a4'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task: /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java:
newFile: !uuid 'f6b25ed35f0dfc0192fbd958873ac16721c7a356' newFile: !uuid '04e818f5c3ae099b83900d4e2505dd488fb71928'
oldFile: !uuid '2c6b835b488b3a10e725c296ff035b9946941af2' oldFile: !uuid 'bc28c1d5e68fdbb67b06231baf306b1cea4a33b3'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api: /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository:
newFile: !uuid '61c5985011115d305854c95f5788a803ebb45296' newFile: !uuid '75b7fbee1f432cf77577aeb3411c10029c42423e'
oldFile: !uuid 'c58ee47fd573e13b7d2058b09a72051aeca10855' oldFile: !uuid '7d87f81fc77d0a9ec81d2fb468ddb047d40bd7e8'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils: /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/TaskInstanceDao.java:
newFile: !uuid 'c123600c4d543c6e1365dc28a371ee54e2a2718c' newFile: !uuid '0156416fd33b644ca24cdb1a588cddc2a695cb47'
oldFile: !uuid 'cc97297a4fbf3506fcc6d8ce13fc6b402d862d67' oldFile: !uuid 'b5d41f8783829db582276b51080ced8d5f3f27e3'
? /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/DependentUtils.java /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl:
: newFile: !uuid '78db575ab90c9494679c30bf1728eb90f9afa003' newFile: !uuid '16d3c2e415ef71f653c472f27ca532d3170cf9f2'
oldFile: !uuid 'ab2b25b65333e390294056d4aaed8de4c2bc0fad' oldFile: !uuid 'd48233ab2f85f7f45506d3d46de3b59cdc8d5099'
gitCommitId: !uuid '0bb48f342973663b3466934701eea79aabcec6b3' /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/TaskInstanceDaoImpl.java:
newFile: !uuid '7e96bcd68b508658a963df8cac81eaec7f270122'
oldFile: !uuid '9cbb92286c4ce46e8b46d320b5a209ea08a15a58'
/dolphinscheduler-dao/src/main/resources:
newFile: !uuid '50445b613fe439757716b139e7aca61742a859ba'
oldFile: !uuid 'fe724ba92ad94da9ea254e0d2dc65fbeae599762'
/dolphinscheduler-dao/src/main/resources/org:
newFile: !uuid '5b56912deea9bc7e4ac08c25985b2897fc40ce89'
oldFile: !uuid '07e9a0e277455dbc63adc35af368b40350a6a804'
/dolphinscheduler-dao/src/main/resources/org/apache:
newFile: !uuid '4c25bd7fd91670f533ec48f477ade33c080956ba'
oldFile: !uuid 'ec92d045c9ff34c9687852d34b1f6076f818b16d'
/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler:
newFile: !uuid '8354b6baea19f85b65a67b427edf6ae096a48b6e'
oldFile: !uuid '18f0deffe310a4facf2f966171b8e21aebc0f1ea'
/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao:
newFile: !uuid '6bee84b14b61d46610bf5b403e684ca52fa0cfae'
oldFile: !uuid 'fe5d9f487ff947bed5586a5f72a7ea4b35215b06'
/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper:
newFile: !uuid '9c6d74f3d722aaad592e849ad1310f10280ec186'
oldFile: !uuid 'bbf229b04e11c402f7c874daea782840c2b3e064'
/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml:
newFile: !uuid '1544d0ed8fb61bae963c535c474d16d8445866de'
oldFile: !uuid '8e3674e523533c3f14ee405c41d83fb6b0bb6728'
/dolphinscheduler-master:
newFile: !uuid 'c0a78cd7c2ac8858da3ca2f06f4cf300c8203a9c'
oldFile: !uuid '09d75d2e22a10a98fdd96f3416a55a4d36ead0fa'
/dolphinscheduler-master/src:
newFile: !uuid 'f83caf06ef1a1dbf078a2c32cdf976f957391e05'
oldFile: !uuid '531b4fdb4cb3766fff8ac4e5647e16a8090b3b7e'
/dolphinscheduler-master/src/main:
newFile: !uuid 'c394310c509e1ee6c37a70c6bded63b135cab486'
oldFile: !uuid 'e134c2e86d216e77cd238070347ce816bc5c6440'
/dolphinscheduler-master/src/main/java:
newFile: !uuid 'a714ad762adb644c7691dc84dd5affb454519ed1'
oldFile: !uuid '4f164aabb1ba063870e0dac96a136dcf6c88bcf9'
/dolphinscheduler-master/src/main/java/org:
newFile: !uuid '6c88c0606fea8059d8faa44ef3e1a8a0f0c1a03c'
oldFile: !uuid '289be9401a659a47d48f86a6b712d05c557b40b0'
/dolphinscheduler-master/src/main/java/org/apache:
newFile: !uuid '5b40f5a2e577e081c8e014cd147b134715f0e770'
oldFile: !uuid '740f3372778a918712ca6d10e9c56d8b9b1fe814'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid '80a68468a651e9b8810dc18adc1093c42bc7a88d'
oldFile: !uuid 'ebc53c7817f8d0231ce8867a314dca6d0be78087'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
newFile: !uuid 'd854c85773b9ba86d7282654c31a794ae0f2172a'
oldFile: !uuid '684f5c72933d03ad72708b5a6e1315048ab5923f'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
newFile: !uuid 'a1279f494d12196345ad709a9800850a8112a431'
oldFile: !uuid 'c449af483ac71ac75d7e0982e57e63ad1b6d13f9'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils:
newFile: !uuid 'cdbcf76ef3fe0e651a43009c76b9738509599835'
oldFile: !uuid 'b2253f85b7f4316d8a89dfc926148094c34dee8a'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DependentExecute.java:
newFile: !uuid '0d343a709f71d8260b5eea62658b8cdc8631bd64'
oldFile: !uuid '195212ef34acd10afa4b9e34569d10217a855de1'
gitCommitId: !uuid '0c470ffe66312085d47d5f55ad5717647aa44360'
renames: { renames: {
} }
revisionId: 4431 revisionId: 4432

Loading…
Cancel
Save