#3490: Fix insertOrUpdate plugin may failed due to concurrent operation (#11471)

commit.ref

@@ -1 +1 @@
-Subproject commit d833a28b2e312c9becd3d356f71f124317bad7f9
+Subproject commit 864a90820de8b8470714574dd506f757a73db874

commit.yml

@@ -3,183 +3,60 @@ branches: {
   }
 fileChange:
   /dolphinscheduler-api:
-    newFile: !uuid 'ad8121919fd62f60350c3767189ea9889a4e4d72'
+    newFile: !uuid 'ba995c6d9608a806c68645c58d39e1a98e381bfb'
-    oldFile: !uuid '518df4fa426e5502330101d54f420bc36ba03fa7'
+    oldFile: !uuid 'ad8121919fd62f60350c3767189ea9889a4e4d72'
   /dolphinscheduler-api/src:
-    newFile: !uuid '7d67d4daa1f08fe21e68c1cb5a74600737ef77ad'
+    newFile: !uuid '949c23a3fb48ea75158da180185b958bbe428c8f'
-    oldFile: !uuid 'bf080427835f1d869dbadf60bd8ae05c7874ef57'
+    oldFile: !uuid '7d67d4daa1f08fe21e68c1cb5a74600737ef77ad'
   /dolphinscheduler-api/src/main:
-    newFile: !uuid 'fef68d22d523c251a51c694cb5e36e9d29c8bf61'
+    newFile: !uuid '3b8ecf3cb23c72d04d06f6b8ad0120f1dfb6c2d6'
-    oldFile: !uuid 'ece926d18c4d39c9920bfafe9c2711f119958d9d'
+    oldFile: !uuid 'fef68d22d523c251a51c694cb5e36e9d29c8bf61'
   /dolphinscheduler-api/src/main/java:
-    newFile: !uuid '8cdbe23275d00e20f0c5aa4a787eedf25c51a6cf'
+    newFile: !uuid '231c9b30492c44c3fb5567c6294dc6d6ad3d2bd0'
-    oldFile: !uuid '1f27fec703195ac044ad85ef80d735c73dbfb57d'
+    oldFile: !uuid '8cdbe23275d00e20f0c5aa4a787eedf25c51a6cf'
   /dolphinscheduler-api/src/main/java/org:
-    newFile: !uuid 'ec722a0d022b48b126eab13a33ba089cbd2d2b8f'
+    newFile: !uuid 'fd9edba516c0b2b2c59e184140bfcc46d6941170'
-    oldFile: !uuid '7d1210cdd89dcf98a093b40d4d675bd0eab87ef4'
+    oldFile: !uuid 'ec722a0d022b48b126eab13a33ba089cbd2d2b8f'
   /dolphinscheduler-api/src/main/java/org/apache:
-    newFile: !uuid '1327320c5e8fc36b1831d7092f33c03ebfad6419'
+    newFile: !uuid 'd4b43f0d2c22e4f22b7618679caa3f4ada698508'
-    oldFile: !uuid '52643ab2628fb0c1fdce466341e6159838430e29'
+    oldFile: !uuid '1327320c5e8fc36b1831d7092f33c03ebfad6419'
   /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '97b6e5bb74417053bfc26e17dcbd19f370108f70'
+    newFile: !uuid '1d73a27bed31fe1fdafaf62c6570bbe1f9eedf12'
-    oldFile: !uuid '43568de01d15afe6b08e18d819217770102161f1'
+    oldFile: !uuid '97b6e5bb74417053bfc26e17dcbd19f370108f70'
   /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid '17ad936b597853843c87c6e7b1c241adb89511fe'
+    newFile: !uuid '03e274a60677488e2ce7248bc032f349b6a66c53'
-    oldFile: !uuid 'c043787c7337a9bf17b2001112d4f4c9cb8d20e2'
+    oldFile: !uuid '17ad936b597853843c87c6e7b1c241adb89511fe'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java:
-    newFile: !uuid '9040f1305785faaa946a6a72cd0dbd124781324a'
+    newFile: !uuid '08a73e69e3ab7843dca9c9f944a9ccf94e6e5f49'
-    oldFile: !uuid 'f37e1ed6d3a2731cab251c46d9b16a2daec3d796'
+    oldFile: !uuid '078506898a973ff41bb2c355ace17b736c5cc7b6'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
-    newFile: !uuid '79915a87103557e81cdeacbb353418b8d6650564'
-    oldFile: !uuid 'c80804b5a78e3f06e9c845b5fd5db1311e64b47b'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java:
-    newFile: !uuid 'd2e957bd5865dec7c2c05404fc6b97932e679c74'
-    oldFile: !uuid 'ef0a16a8166c116f352573757b6820eac624dfd9'
-  /dolphinscheduler-api/src/test:
-    newFile: !uuid '84bcbf6e1c41139a9ed2b01c526ec232520179af'
-    oldFile: !uuid 'c2e6cec578c6d11c690a23fe78b3da44c06e6281'
-  /dolphinscheduler-api/src/test/java:
-    newFile: !uuid '12400e044451db73f448f13734ec15e41a0ccf1a'
-    oldFile: !uuid 'd2344460f59707c38947b416ad3ac501ba53b276'
-  /dolphinscheduler-api/src/test/java/org:
-    newFile: !uuid 'dc84f4ddc1e5227dad78e72455fc32127f55baec'
-    oldFile: !uuid 'e750613f542fcc03e993bda3a17d9ecda7dcbd42'
-  /dolphinscheduler-api/src/test/java/org/apache:
-    newFile: !uuid 'aae2576d7f158e8da7415ec25a3902c30e4e0055'
-    oldFile: !uuid 'd5f787bc83dce3576eb55c661b3fe4dd312d9cf3'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler:
-    newFile: !uuid '14ab776d06582a7f6a5ea5e06abc1b7bc50c7de4'
-    oldFile: !uuid 'fabab907548ed33c81f37e38cc48e782a8b6005f'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid 'cd8e7d0ca0b4beb997c4a8f725ec9eda9f6a8f95'
-    oldFile: !uuid '925208e87724e6db76d4457955f365dd41bd0eb0'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid 'a5da7334c6b227c61830dca3ce95b997f96c600d'
-    oldFile: !uuid '9f3d91d68bfe5e5c28cf478310d66062d2accf67'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java:
-    newFile: !uuid 'e4401cd71d64b4e59db46f9636662fa3368604a9'
-    oldFile: !uuid '05c63ab5370e12196150250c2effab1f4d93ac30'
-  /dolphinscheduler-common:
-    newFile: !uuid '92e674faa8871f00a8454e9603c9d5ba6bb8d667'
-    oldFile: !uuid '6db10416f8e9d66745455c1b97429a9a02cb6f80'
-  /dolphinscheduler-common/src:
-    newFile: !uuid '0f030625decdb259df718c3113d9659eca55fcf4'
-    oldFile: !uuid '6899a9b05deecb734f059611a9a69f52230f4dba'
-  /dolphinscheduler-common/src/main:
-    newFile: !uuid 'f6c7a97eaf71506b05c87a052ac5ba26c14bc5b7'
-    oldFile: !uuid 'df04e9dbcd237bcef6c12154c49f684570c6f926'
-  /dolphinscheduler-common/src/main/java:
-    newFile: !uuid '4750cfa919a7a8a03b2ffb4f95fa126536e50ba4'
-    oldFile: !uuid 'd9113f723ba96a3a09243d04c7f2d957dc6c0e74'
-  /dolphinscheduler-common/src/main/java/org:
-    newFile: !uuid 'a04e59dac05b67221cd9ab001d0a0a563da63e33'
-    oldFile: !uuid '193382a7421fd964bb25bde25d342b087deed178'
-  /dolphinscheduler-common/src/main/java/org/apache:
-    newFile: !uuid '62794b775082b0f0035506b41e10a732e0d58280'
-    oldFile: !uuid '3a2d667dfc5c9af0705440c41d616da7a9dcadbf'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '19bcb99e9c38b8bee4bc52b2a6e5415f62ba376d'
-    oldFile: !uuid '37a378cb4eaf8883c26addc9877f3e61a525a4aa'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common:
-    newFile: !uuid '19d1535e70dee984dacb5540ab46c09a1e6ce765'
-    oldFile: !uuid '1087592c461db40853a8b070a3004ea8b502e03c'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils:
-    newFile: !uuid 'c67e016375bdfd8cb1eeccb421bc3c4016a0ecdd'
-    oldFile: !uuid '23266f523983d2b3b223faabe749126950c1a132'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CodeGenerateUtils.java:
-    newFile: !uuid 'f35523b59df7548c82ee779d5589d843d65aabac'
-    oldFile: !uuid 'ffea87be517ee51d23589bd0797885a0d0cbf8c1'
   /dolphinscheduler-dao:
-    newFile: !uuid 'b9d18b1a7883607b50479e40056a20eb6ca5b248'
+    newFile: !uuid '929cbc53586809effb1c5f15017b058bc89b7b5d'
-    oldFile: !uuid '69de67a7c36782a52f12b38c68a77fec2dba3f37'
+    oldFile: !uuid 'b9d18b1a7883607b50479e40056a20eb6ca5b248'
   /dolphinscheduler-dao/src:
-    newFile: !uuid '5e88525da49959697b641f2767026c7d81d8d081'
+    newFile: !uuid 'e442440788ab5e1513da6769240ea1cd2a2803ab'
-    oldFile: !uuid 'ffab5c8fdef04624061ea4c2b69a3c8cf85775c5'
+    oldFile: !uuid '5e88525da49959697b641f2767026c7d81d8d081'
   /dolphinscheduler-dao/src/main:
-    newFile: !uuid 'ba39eb650ca1ebbbd8663c776fa701eeb25f84fd'
+    newFile: !uuid '21a332e7ad38086ff6a929d4245697766634d45b'
-    oldFile: !uuid 'cf70cef06a8218eb8a6e6a1e22b4d274cc40a375'
+    oldFile: !uuid 'ba39eb650ca1ebbbd8663c776fa701eeb25f84fd'
   /dolphinscheduler-dao/src/main/java:
-    newFile: !uuid 'abb2c224d055922d8c2019771fdf1389f11a9ea2'
+    newFile: !uuid '23019ec7462ea7f876667664af249ac3ea763ad1'
-    oldFile: !uuid '9234122299dd70c44474d3e5d4107ec446634509'
+    oldFile: !uuid 'abb2c224d055922d8c2019771fdf1389f11a9ea2'
   /dolphinscheduler-dao/src/main/java/org:
-    newFile: !uuid '248cead074574b6a05e656aeee15652e3f03f8e3'
+    newFile: !uuid 'a94e3822d105acef292b4288c0632ebdec688207'
-    oldFile: !uuid 'b57b6d8f718285e7dea6dab90b4bd99b39d1e763'
+    oldFile: !uuid '248cead074574b6a05e656aeee15652e3f03f8e3'
   /dolphinscheduler-dao/src/main/java/org/apache:
-    newFile: !uuid 'f35dc2517717c9e639978345d5cc0d2e4344a954'
+    newFile: !uuid '1675c86ba8d7657c1ab15ff49eb2b7af344ba409'
-    oldFile: !uuid '0789d8e53e609fdac58bbcad4cf3a8051cbb6889'
+    oldFile: !uuid 'f35dc2517717c9e639978345d5cc0d2e4344a954'
   /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '04caea598debb1a6c9ba41a8586df90bf3f661a0'
+    newFile: !uuid 'eb53f116ded013419d62c1c7fee622b92d5f2c30'
-    oldFile: !uuid '221db438a9c3129b3ef7340be5ab8fad8b7bc75b'
+    oldFile: !uuid '04caea598debb1a6c9ba41a8586df90bf3f661a0'
   /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
-    newFile: !uuid '4d8eb21802fe632ffe36f4f75a0b1ac8fd4c5fb1'
+    newFile: !uuid 'de15430007290f6ca00d6c9e3603a30703fd104f'
-    oldFile: !uuid 'f0069352471a35e4561f284b3e38caba912d4285'
+    oldFile: !uuid '4d8eb21802fe632ffe36f4f75a0b1ac8fd4c5fb1'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity:
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java:
-    newFile: !uuid 'bca120053c459291cd4d9fde947aedafed36b545'
+    newFile: !uuid '71e3be70c45253426a5366a5827c9e926c18260e'
-    oldFile: !uuid 'c8f9a7e77897bab621fd9a0faab7bd862b5436c5'
+    oldFile: !uuid '0527cfd70597aac3077dab5d35e4ff41d81e9083'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java:
+gitCommitId: !uuid '864a90820de8b8470714574dd506f757a73db874'
-    newFile: !uuid 'ec9336d5013f16b28ef7288dadaa313ca512ea01'
-    oldFile: !uuid '12a094139a912bfe46b7fd8f32fcd27c0d6ba031'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java:
-    newFile: !uuid '6e7414c2869037e7bd45631b1c1bebf0ce6482e1'
-    oldFile: !uuid '089a0353734f7d82afb9babeb0273f4d90885245'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessTaskRelation.java:
-    newFile: !uuid 'bef2630d8f2f568ef192f7aba4d176142717dd5d'
-    oldFile: !uuid '70a324f2981976b5e788dd8473ef10f4e065d35f'
-  /dolphinscheduler-dao/src/test:
-    newFile: !uuid '4a6452fbc39c8b5fc60ac465693a47d7abce76f5'
-    oldFile: !uuid '0f3292f9ce9eefb145e9ab841c5411e39b501acc'
-  /dolphinscheduler-dao/src/test/java:
-    newFile: !uuid '337a7d0a1d9f170546f103dbadc222ebef60f199'
-    oldFile: !uuid 'f734b59634b5e90a7f6e8b00da910e06a6dee074'
-  /dolphinscheduler-dao/src/test/java/org:
-    newFile: !uuid '7d7546a6148130f335426ed75c31455e30a382ad'
-    oldFile: !uuid '52490473b3fb62bedb5893f6e755e9b26c74ae30'
-  /dolphinscheduler-dao/src/test/java/org/apache:
-    newFile: !uuid 'db90425e157e12e81529709ff90225bca1cfc85e'
-    oldFile: !uuid 'eaab6d7d4153d748b50babdd1606454b9ee620b9'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler:
-    newFile: !uuid '4bea1867282249a0f180942508dd27ca3a36e092'
-    oldFile: !uuid '19cd41aecf655f759647d5ff99e5ca73913f7f9f'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao:
-    newFile: !uuid '80ff22ee2df5b0a8f90c5fcdf1f28a9b2aee1426'
-    oldFile: !uuid 'fee221096c3db0031fdad9017adca06a9399a464'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper:
-    newFile: !uuid 'd3f2a506ddad37b9e4cc579817c1dc51f0d651f5'
-    oldFile: !uuid 'dbf1f37afe4627e48605b35dddda085b6ae540f8'
-  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java:
-    newFile: !uuid '0c4702517e2eb5d8536e1596ccc092362ed4578c'
-    oldFile: !uuid '014a2a2c3c9f460c72038bd8da202ee59ad0398a'
-  /dolphinscheduler-service:
-    newFile: !uuid '3a06a38659ce83cd7b10774f6eb180e2d0e10772'
-    oldFile: !uuid 'e71b967254fbd939a18392177240588531c3410f'
-  /dolphinscheduler-service/src:
-    newFile: !uuid '80dc9ee4144c1abc8a790f9c5716f2d22bc8bcb2'
-    oldFile: !uuid '8601131acd613d731f31043740e0749853eda8ae'
-  /dolphinscheduler-service/src/main:
-    newFile: !uuid '3bacbc76a9fbe1ea6b8f24f524896bebd7fc9c18'
-    oldFile: !uuid '58e653858114ec89ab5c576a76f4a2f709d7e1f1'
-  /dolphinscheduler-service/src/main/java:
-    newFile: !uuid 'db1bffdf47107951983e459506680198b9058d2d'
-    oldFile: !uuid 'ab6d5fe289b6e0bc4d3b7480ea4ab025529c3dab'
-  /dolphinscheduler-service/src/main/java/org:
-    newFile: !uuid '78ea3ed8a9fb4766bc0a2af1bbff55bf247eb0a4'
-    oldFile: !uuid '2c799a21287322ec239b376262efce5525fe3d8e'
-  /dolphinscheduler-service/src/main/java/org/apache:
-    newFile: !uuid '247c1650b779d0708eb5503028f4713fbe16e357'
-    oldFile: !uuid '91827085b7f99d1f90f8317548c6acae05e85229'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '5e36155d542acd89ac8e80e8fa9d64804222d9db'
-    oldFile: !uuid '1ea4e5fe3ac86128adb58de4f1f91127c2900dd5'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service:
-    newFile: !uuid 'b30d027516cde77831d7c19fac47f76de2fe37d0'
-    oldFile: !uuid 'fecdaa55846820bb52c4d5f966ae2efede59a45b'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process:
-    newFile: !uuid '117efe49d09dc54cfc309d47fa6d83f641966c3e'
-    oldFile: !uuid 'b1df75b694b6bd68a3a5e1bf14626894170f9bab'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java:
-    newFile: !uuid 'fa6b640ddc44d3808ab280694261e2b5868707ce'
-    oldFile: !uuid 'c213346451ecd29c2fbf69893665237df1581e40'
-gitCommitId: !uuid 'd833a28b2e312c9becd3d356f71f124317bad7f9'
 renames: {
   }
-revisionId: 3489
+revisionId: 3490