#3122: [Optimization] Config module resource relation fix. (#10718)

* Config module resource relation fix.

* Boolean judge fix

* e2e rerun

* e2e rerun

* e2e rerun

* ArrayList fix

* change variable name.

* Add transaction processing on create data resource method

commit.ref

@@ -1 +1 @@
-Subproject commit 91283e59cf240e3a756eb66e3917fa54ba96fb63
+Subproject commit d2fe16d252cd511e16049b6a88e4147bc9304ff6

commit.yml

@@ -2,13 +2,196 @@
 branches: {
   }
 fileChange:
-  /script:
+  /dolphinscheduler-api:
-    newFile: !uuid '5bc7b6187d3b0ce5d545609a7caa3a42851840dd'
+    newFile: !uuid '101a9759e03c4d4d0ed69081af6d3a87411977c4'
-    oldFile: !uuid '346b21251b9d6124f971191dc8a00a6bf22c72dc'
+    oldFile: !uuid 'df61b6b9b116c5e9f8f6be2d01225362a96d2dc5'
-  /script/remove-zk-node.sh:
+  /dolphinscheduler-api/src:
-    newFile: !uuid 'fbedd3158022a27bd5a28c3bd1ccb9eb805434fb'
+    newFile: !uuid '915d91afd4e4da8b63cedece32596288e5f3f5eb'
-    oldFile: !uuid '499d67e8c57737df00a4c6c9e703d9f9b25204dd'
+    oldFile: !uuid 'b1e97357bc6937984bf148403ed83a5fac7aa793'
-gitCommitId: !uuid '91283e59cf240e3a756eb66e3917fa54ba96fb63'
+  /dolphinscheduler-api/src/main:
+    newFile: !uuid '68a56402ac3a064e7991cd40163f68423d215fb6'
+    oldFile: !uuid '44b7a28b9e92233f861e99f1b88481de314be798'
+  /dolphinscheduler-api/src/main/java:
+    newFile: !uuid 'f48cac5ed4e282965556f756f8f04097962bc140'
+    oldFile: !uuid 'a04cdef26b016da8d127351c043e8ce9daeaba59'
+  /dolphinscheduler-api/src/main/java/org:
+    newFile: !uuid '7df7f77a0f4e0fcfd22c0ef7dd781b4bd29e99d0'
+    oldFile: !uuid 'f9004036237371d18155089e641eeee5d1fe4df4'
+  /dolphinscheduler-api/src/main/java/org/apache:
+    newFile: !uuid '4a22b49f2a55b21c85bfa72d5b9c53abaaa722cf'
+    oldFile: !uuid 'bc71f637efb19ba7276a7aeb9c37bc33c075f2a7'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '2b3b76429eb611c1197095774ca3711cca70d385'
+    oldFile: !uuid 'c8763fcd05347388fd7d755e88861e3afd7607aa'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
+    newFile: !uuid 'c2961c43b869203323b17f8ca91ec94b63e2bd74'
+    oldFile: !uuid '3e932ceec958cf8514a3c7e994c4142e122a7a68'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
+    newFile: !uuid '175f17334433366cae89ba7271badbb635688e7c'
+    oldFile: !uuid '78345764cfb0ff2f18bdc1c7e3d3b6abca6307ce'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
+    newFile: !uuid '2865243a903bbc87e2bb825fbc78a2057e9214cc'
+    oldFile: !uuid '61421aceb29437c087a096b0160754138b92e015'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertGroupServiceImpl.java:
+    newFile: !uuid '74eb186a19a2fc6043017081a9e98fd7baeb6243'
+    oldFile: !uuid '918fc7a680bc389d1be731bb7cbd809b07e55956'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java:
+    newFile: !uuid 'b12d9e9904d00f7db0e292ac2cc8d41369afe3b7'
+    oldFile: !uuid '0cea4cf5a6dfc0d21fb82e4f4d09a98387805618'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceImpl.java:
+    newFile: !uuid '67def536740a2fa3dfb67195169aeb2fa83e03ec'
+    oldFile: !uuid '5ee992d16ba3e79fde403115a634f1c2b526aef3'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java:
+    newFile: !uuid '12ddafaa428a2a962548f65f6f008c3b3ca6fa9e'
+    oldFile: !uuid 'b10ee78392c735d07d063ad9a4a498068f1e908f'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/QueueServiceImpl.java:
+    newFile: !uuid '465f2243f4efdedb42dbd3890601d78685340e74'
+    oldFile: !uuid '1301540a469e6b9f920b0188b017183908dc314a'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java:
+    newFile: !uuid '7d8d1128d947a7c721069426f76cd33059587a05'
+    oldFile: !uuid 'e02fbca658546609c04a3655fbc9f5ac5801e924'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java:
+    newFile: !uuid '3d315ee3cf06d25b787eaf979d58e6ec5b28a4a3'
+    oldFile: !uuid 'a3c4e30ef60e5925edeed922effd102828df9ee9'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UdfFuncServiceImpl.java:
+    newFile: !uuid '4542b648b847fa34d004f0acb2458a166fbf2075'
+    oldFile: !uuid '010629756ee318ed5f7f4f2787234a408b74307c'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java:
+    newFile: !uuid '7878d942201450451b90454257e536ab254ae89b'
+    oldFile: !uuid 'bf678d3dcc7472c28cd591063deaf06953e395ed'
+  /dolphinscheduler-api/src/test:
+    newFile: !uuid 'bf3d19ba8bc62e87a993d33567b7b258b1919931'
+    oldFile: !uuid '04cad42320f72efc9b6ffbbc08f00fbe7219672d'
+  /dolphinscheduler-api/src/test/java:
+    newFile: !uuid '5d731f736ceaf11546c1fbc167b7fb8818a5187c'
+    oldFile: !uuid '5254ebf81273af09fde45cc0969193d24f689611'
+  /dolphinscheduler-api/src/test/java/org:
+    newFile: !uuid 'c3939852fb0c834cd4d4bd335415adc723f8e476'
+    oldFile: !uuid '9ef4d42d48e14942fd7c8e3748a7f25a1cb71142'
+  /dolphinscheduler-api/src/test/java/org/apache:
+    newFile: !uuid 'a4f3aa6c54a2059d7d49c9bd3c1df4ecb532628c'
+    oldFile: !uuid '8946810b00908a0049fd522df0856c7d9004e9f6'
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'f72de2e2dc3dbc2a805320c4349e3050ea6a3869'
+    oldFile: !uuid 'd073f916d2b9ab649cb98f5652ec6d2e95e899eb'
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api:
+    newFile: !uuid '420093691eeefd53e5bdca81d2366f544dcca469'
+    oldFile: !uuid '251221ab0bfe028a3701c1c4e0aa0c3939b4282f'
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/permission:
+    newFile: !uuid 'af88c1263d164b3d9e07e366ab7d618ba68eaef1'
+    oldFile: !uuid 'fff1ba0291f9a4b97f31525f144e00775efd8000'
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceTest.java:
+    newFile: !uuid '68e5e74196d95e5745e5eae70880b91ce66d1aeb'
+    oldFile: !uuid 'cf6b4e71cc91ce12f0f7ce0ffdf2c2d819c79ca2'
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service:
+    newFile: !uuid '7ffad7d47f5d42b8028ee3b58db73cb5ae9bdcc2'
+    oldFile: !uuid '575471b48ab9ffad84df8b5a914d2d81af167272'
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/QueueServiceTest.java:
+    newFile: !uuid '30eaeb52e1f5d35a37a7214de0c908833f7be01b'
+    oldFile: !uuid 'a2a7957a23065f1ffc91614ee97d53497e6df4d0'
+  /dolphinscheduler-common:
+    newFile: !uuid '012e377b75def3397776f9d4211b2d4738f16089'
+    oldFile: !uuid '594521c7dba4323395e33d525c91a87a23e60896'
+  /dolphinscheduler-common/src:
+    newFile: !uuid '66d5f9bd4fc09c38b3001294d3a6a897fbb7e1b1'
+    oldFile: !uuid '839fde9ad323cf9a164ac737b8f283a7efdd7c54'
+  /dolphinscheduler-common/src/main:
+    newFile: !uuid 'ac742f40cc54c727c1a17c1a3cce8c6ad1c4c907'
+    oldFile: !uuid 'adde59053a4471d9dbb1f60e9224ccaa2d5a9a7f'
+  /dolphinscheduler-common/src/main/java:
+    newFile: !uuid '57f7eea0281a0843a7997b9801acb3d61aecd759'
+    oldFile: !uuid '1ca780d7f2177381ede9ee8eb43eaaab2b29a0d7'
+  /dolphinscheduler-common/src/main/java/org:
+    newFile: !uuid '865bcc668cc4a5a489bc05218b7494dd4498b4a5'
+    oldFile: !uuid '66edfe4f482a1a1790435955408b84db4244091d'
+  /dolphinscheduler-common/src/main/java/org/apache:
+    newFile: !uuid '342661f9e8b63ed2948569b1cf73cb7d662155c6'
+    oldFile: !uuid 'e203f6025181b964d981891ec0e8dfa72b729ca6'
+  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '1d647f1ed161979c42f5097148419d05c951d8d0'
+    oldFile: !uuid '7c96ae4ea0aea79511f663c04c299119af04a58f'
+  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common:
+    newFile: !uuid '9ce59805a39de2189f19101fd81eceed050f4a57'
+    oldFile: !uuid '1e537a4cc2c9f5d0c0f39f6a465dc120e58647d7'
+  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java:
+    newFile: !uuid 'ea54e362cc0cbae985ee5108b8fe51c33a583d3b'
+    oldFile: !uuid 'a081570f4aeb1ce7efee620441014bca5806ce58'
+  /dolphinscheduler-dao:
+    newFile: !uuid '22fd341e69f728998120dee99abdc884af634b28'
+    oldFile: !uuid '8d1f16fdfb730682b01796e4bd15c35c3b8fdb7b'
+  /dolphinscheduler-dao/src:
+    newFile: !uuid '6253567abc9b7d26497d189b9ca9c6d7a99d3726'
+    oldFile: !uuid '9564daced390f93ae1e53897ea3e7a851a58cb33'
+  /dolphinscheduler-dao/src/main:
+    newFile: !uuid '867e1500d08c778e89b83e1cbc5c76d62af5a057'
+    oldFile: !uuid '1607c0e03149ac925428a82661985c5caea61355'
+  /dolphinscheduler-dao/src/main/java:
+    newFile: !uuid 'b2519c8b968b304f05c97c5a679879e2076b15c6'
+    oldFile: !uuid 'e925197359ae8cd97453f5a37bef5d65901eae19'
+  /dolphinscheduler-dao/src/main/java/org:
+    newFile: !uuid 'b65511d38274bfc8aaa1c1dd750afea2f4b9aa7a'
+    oldFile: !uuid '1f3ec9cd1198c29b0c91dac4d90e09874becdc05'
+  /dolphinscheduler-dao/src/main/java/org/apache:
+    newFile: !uuid '0ba97911875657242a5a670da452e29c3a77e86c'
+    oldFile: !uuid '3b202d79d8f653205d2ccd3513c60f4357d0773d'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '03edad01fbfbfeb64facca90896f0a1814f59d9e'
+    oldFile: !uuid '43530926de7497e1f69a197b3ae6133089968570'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
+    newFile: !uuid '4d76ff787dc25093b43cfab1f81bc3922bef7fe9'
+    oldFile: !uuid '4b67d5f7c75345dc97091e9dbbacec16b12038f8'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper:
+    newFile: !uuid '94860ec88b53f9de71ce339d1f19b47113117718'
+    oldFile: !uuid '7f4d8de0f1b1f796d4bc9680b6a9e9def403e109'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/QueueMapper.java:
+    newFile: !uuid '8a3942a73824b9d8bf1825d79159b36c9ae983aa'
+    oldFile: !uuid 'e48607007d57e762651f93cc0c858deb79c04c53'
+  /dolphinscheduler-dao/src/main/resources:
+    newFile: !uuid 'e1f2b8b67d99f305808b03980a2650c588d1a0e6'
+    oldFile: !uuid '3a7c5f99fd553ad58cff96dcf21aa61802b6f12f'
+  /dolphinscheduler-dao/src/main/resources/org:
+    newFile: !uuid '5afe177d6c1e67b7b546245a2b2695051bf90fef'
+    oldFile: !uuid 'b0f1ea0bb173cc337617db419bc63deeb81c3fb7'
+  /dolphinscheduler-dao/src/main/resources/org/apache:
+    newFile: !uuid '9ad23b5824cc782d0e375a618bc4e661ede0cf28'
+    oldFile: !uuid 'cdbf08f638ea79b73bc3a71279058a7864b52948'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler:
+    newFile: !uuid 'f715e3c42f60111eec4b9f681287b81be2f478cd'
+    oldFile: !uuid 'ebe28cdf602bb5134d6755417c82a05cfefd37b9'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao:
+    newFile: !uuid 'c924946be5f2659470021aa3d3d9a7bfd0413f20'
+    oldFile: !uuid 'a92fb3f7c6dd762d9b64672488c68030ecb03463'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper:
+    newFile: !uuid '2a7cc890be44c4b434485696b401a8dad7bf50ee'
+    oldFile: !uuid '80b256bd2ad8ce154af8bbac5f5ac3e6dc68e8a7'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/QueueMapper.xml:
+    newFile: !uuid '370536554379cf1ea7985b67dec41fe547db3d5e'
+    oldFile: !uuid 'cf381e494a7f9283ac8f194c4e15695824c1f786'
+  /dolphinscheduler-dao/src/test:
+    newFile: !uuid '6041812ff568a4576968a7f8ff00ad4bfeaacc03'
+    oldFile: !uuid '0eabcf379ba1252e31f3fbd938becca7db334116'
+  /dolphinscheduler-dao/src/test/java:
+    newFile: !uuid '66376465e5025e29b59e4e5e77317653d05206c8'
+    oldFile: !uuid '6571cfa1e0781ffed6841c6a14e3fff2d1b371c6'
+  /dolphinscheduler-dao/src/test/java/org:
+    newFile: !uuid 'fd014afe612352a6c0def2ac83707c369853275e'
+    oldFile: !uuid '2871ff5006aa4b6296e03bc3cf4559cd470dbecc'
+  /dolphinscheduler-dao/src/test/java/org/apache:
+    newFile: !uuid '8c703fd6b7bd3c999f8817885b6f65d63bdc36f8'
+    oldFile: !uuid '092c47d8d84e60465315f18a4dd46e45a110ebb5'
+  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'e3aa4906dc94fd9830ea9bee16d255c45c09cb14'
+    oldFile: !uuid 'd16e55ff92ab401ec97848987404464c9bd7167b'
+  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao:
+    newFile: !uuid '955b4dedbc2342cbdb60db8220ad484af4e8a19a'
+    oldFile: !uuid '1fdb63e394545f10985816a6e9569f0abf71fd91'
+  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper:
+    newFile: !uuid 'e37d5dbb4cb025e8eb0e60ecd402f396a64944c1'
+    oldFile: !uuid '3dbf52d8d009a4849d5bf28f4d8d2317801fd89e'
+  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/QueueMapperTest.java:
+    newFile: !uuid '28e7044f85c7bf5bc1760c6996b01678ecc24ad9'
+    oldFile: !uuid '9bdc9b82c50f897be7cedf3d3509fce7459d0c83'
+gitCommitId: !uuid 'd2fe16d252cd511e16049b6a88e4147bc9304ff6'
 renames: {
   }
-revisionId: 3121
+revisionId: 3122