#3395: [Improvement][TaskInstance] reduce database queries (#11522)

* [Improvement][TaskInstance] reduce database queries * Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java Co-authored-by: caishunfeng <caishunfeng2021@gmail.com> * [Improvement][TaskInstance] queryByInstanceIdsAndCodes -> queryByProcessInstanceIdsAndTaskCodes Co-authored-by: zhangshunmin <zhangshunmin@kezaihui.com> Co-authored-by: caishunfeng <caishunfeng2021@gmail.com>
2 years ago · 4bd217b224
2 changed files with 116 additions and 108 deletions
--- a/commit.ref
+++ b/commit.ref
@ -1 +1 @@
-Subproject commit 3f2ca7bca3e612b2ce5d22324d22aa33fac04ea2
+Subproject commit 4893bef5a79fc022b74f8c273bd8079517726f35
--- a/commit.yml
+++ b/commit.yml
@ -2,110 +2,118 @@
 branches: {
  }
 fileChange:
-  /dolphinscheduler-master:
+  /dolphinscheduler-api:
-    newFile: !uuid '51cec771bd0c20d6a3f5d0760063ae7b193f65a5'
+    newFile: !uuid '9bcf023e1fcea18d19e2010cc2b3f318346866ff'
-    oldFile: !uuid 'cb74424af58a5299dc3b0b41eb8f881f25e9ce53'
+    oldFile: !uuid 'ebfbd65338ba98747303df44f603491761f85ec8'
-  /dolphinscheduler-master/src:
+  /dolphinscheduler-api/src:
-    newFile: !uuid 'b12d9d6217579bbbae462e92452483791fae205a'
+    newFile: !uuid '82a110f3197154192088697797c72019d76c7e28'
-    oldFile: !uuid '8a1bede4f042a03e480d1f3d123f884c152889ac'
+    oldFile: !uuid '1449f8d24b745de24abdd60f961a8911375055aa'
-  /dolphinscheduler-master/src/main:
+  /dolphinscheduler-api/src/main:
-    newFile: !uuid 'fde4b5ed82bb8f7ca31f9a9c6a084ca1604535db'
+    newFile: !uuid 'de30b24073f6aca2779a7296568eae25cb691f72'
-    oldFile: !uuid '8e3b01c0281ec2011a118ccfd1a56399c6150013'
+    oldFile: !uuid '5304ed4854d781144f0f2a8a10b0bfe69c9ab2c7'
-  /dolphinscheduler-master/src/main/java:
+  /dolphinscheduler-api/src/main/java:
-    newFile: !uuid '2ce87ae354d577876b90fa5c35d2958496add6e4'
+    newFile: !uuid '5e1006598d6dde4603575a7f5e01383e5a2aafce'
-    oldFile: !uuid 'f5fcb76b5e890886e4c025ac1106245e7f92a6d5'
+    oldFile: !uuid '3b53b056f13f0e3c97ab69b065268b4b58c240ad'
-  /dolphinscheduler-master/src/main/java/org:
+  /dolphinscheduler-api/src/main/java/org:
-    newFile: !uuid '596aa7928273ad3e547c52107e1a8e2cf1192fb5'
+    newFile: !uuid '6c610e0dae25cd231f01ae5cd5ca384bed72e665'
-    oldFile: !uuid '67683cba0c354fb70bb29f79cc1aa09b2f586b8a'
+    oldFile: !uuid '07b50e0a2be7a3df2f77f0313f55e7041750cbec'
-  /dolphinscheduler-master/src/main/java/org/apache:
+  /dolphinscheduler-api/src/main/java/org/apache:
-    newFile: !uuid '481f0a64e5b5dd5c0a7d4e31f2182b3ec5d62ac8'
+    newFile: !uuid '489842cdab262f5b75ade7d0e401def6c721b08f'
-    oldFile: !uuid 'f823d79c2cb9b40ba5839135a0564d2ef1fda423'
+    oldFile: !uuid '5c4566e67d110f5cab614c7fd12b319e37176be0'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '778906adbbe3c18a22abc9d0cdecb5a714c1b1f1'
+    newFile: !uuid 'd9900fbba1d8e80402eca547f33c0f7a4016ccdf'
-    oldFile: !uuid '852f1f563d5892ce69dbbe7ff7a1b3c6c0d7a1e3'
+    oldFile: !uuid 'e60f9906dd2b804b5e5ddaa0f02a1b2950695ba1'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid '35cca4b4eb552514a55e485909896da263c38c7e'
+    newFile: !uuid '22cf7f74c7ebfc99231ce9f05aba6da4e7cf3d9d'
-    oldFile: !uuid '9b33c2ed498e21c6ce8f9ab892c185ae0a2ce7a7'
+    oldFile: !uuid '380e7b0071be612223d8c2ad15bf898f5fc7a8ab'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid '5a560d36ef2075b1d68c02ecf444d9ed55d6c9cc'
+    newFile: !uuid 'b2c4a69f1e099420a23744b425690e6e57e0c7fe'
-    oldFile: !uuid '9d81ef7489349b210fda409297b428970054a8a3'
+    oldFile: !uuid 'da7dfb8921be4820a7f73bda020a7f12f1b11ee7'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
-    newFile: !uuid 'a5afa3eedd6a5494f74ef90ac2e9ed6de40e09dc'
+    newFile: !uuid '8dec1d1aabb4bb404d5c08697d85026a7d3b8237'
-    oldFile: !uuid '1fe7ef65535e7c019820e0160691cc8ea29a1ba3'
+    oldFile: !uuid 'b545fe7023e4d72bed92139aca472fd91dea8e10'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterHeartBeatTask.java:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java:
-    newFile: !uuid '5ca7c87f1b22427ab1f9283363c8c8bac3830cb1'
+    newFile: !uuid '9cc12a8f8f534f4fdfb8409e434992a480c5b608'
-    oldFile: null
+    oldFile: !uuid '1c7b2aba2756168ca6e6130cd51d6530c7edb451'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java:
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java:
-    newFile: !uuid '99a65e9fced1dbddf650a5aa59e29ab5d5ff3b7a'
+    newFile: !uuid '67ff0edb9ba67b563532e9be300cc46359524660'
-    oldFile: !uuid '63938bd9287b4c6b5bbccd7d544db16fe1bbde98'
+    oldFile: !uuid '833a734377413ed93d72e557bb4700e808f52e82'
-  /dolphinscheduler-server:
+  /dolphinscheduler-dao:
-    newFile: !uuid 'bd3f0abc4e210413cd0b1e146766db93fd1c1328'
+    newFile: !uuid '233b6cecc634ffd3c6b0b83494132dc042041459'
-    oldFile: !uuid 'eb6c6cfd2d2da90909c6395660d1b1c26076e359'
+    oldFile: !uuid '0bfd4e77322e10b437f225d44ae11301b05a8866'
-  /dolphinscheduler-server/src:
+  /dolphinscheduler-dao/src:
-    newFile: !uuid '4b6f711a6f3aa1154afaeb6c5e881557f41ad28e'
+    newFile: !uuid '63b123b8357036070b18a7995fb56a3d2def911a'
-    oldFile: !uuid '078447c9a08a59f38f71c2123fef42a501d84816'
+    oldFile: !uuid '6e203b35895605071010d8b7597d0c1a2dddc06b'
-  /dolphinscheduler-server/src/main:
+  /dolphinscheduler-dao/src/main:
-    newFile: !uuid '4f1aa06fbb4280f41de96c33b828ce5d5904af45'
+    newFile: !uuid '5cd7dd8513cf65f15b0d37e990f214c8411a7400'
-    oldFile: !uuid 'c30315d12e5c387d8c5f5bc75706a0f7b53df189'
+    oldFile: !uuid '93f88ea647837cee95c683068d4ad3b12b9dbbfd'
-  /dolphinscheduler-server/src/main/java:
+  /dolphinscheduler-dao/src/main/java:
-    newFile: !uuid '002d4bae45db4cfca826a3a138e46ae8a785f73e'
+    newFile: !uuid '4f3263dd35f7e0eef8f3d18c85843649685fc731'
-    oldFile: !uuid 'a4e170f6b4025574850d2f1245173f643ee6d741'
+    oldFile: !uuid '59f68899d49713f196882d986853da969825ee43'
-  /dolphinscheduler-server/src/main/java/org:
+  /dolphinscheduler-dao/src/main/java/org:
-    newFile: !uuid '147de792dc608b8d1b1f08acb76c4a25264142ba'
+    newFile: !uuid 'babdeb71f12170367d710daa9052e8e479b6365c'
-    oldFile: !uuid '8851cc94f4e7a78b74fe99aace48db7fcd5c9bbb'
+    oldFile: !uuid '975e8e5b2ee9690392a9193914f5b1b0a20634f6'
-  /dolphinscheduler-server/src/main/java/org/apache:
+  /dolphinscheduler-dao/src/main/java/org/apache:
-    newFile: !uuid 'e8d2ae20739bd9150cb031b69c07dca3e968d803'
+    newFile: !uuid '627cdea40d1bfbdf20ea03bc562c3e6d107d8676'
-    oldFile: !uuid '25c03bae6632fe83a3c99b9afa2cd00a90b0516f'
+    oldFile: !uuid 'c27b1185ab65f28e03c44774abb2216620d2dbee'
-  /dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler:
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '5809b6d5467f9ff2dcf655d9f645e85c231de823'
+    newFile: !uuid '4489204abb880ffb39ca1cf3ce8d232f76fe5100'
-    oldFile: !uuid 'a8c7d27c3a09beeed03c24727c86ca9826af893b'
+    oldFile: !uuid 'c576486db3f374f088368ed81b45387cd760fea6'
-  /dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server:
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
-    newFile: !uuid '4581f5e5a029f45c47ab239b568bbcf53ae74b7c'
+    newFile: !uuid '57d00758cc1d21a7ad765095c6f1b651a69d6a74'
-    oldFile: !uuid '5fa508c2517a525ffbdccf72195cc8e71f07b64b'
+    oldFile: !uuid 'c75b369dd907e3e0b8494039a0557ef6402b324b'
-  /dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/registry:
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper:
-    newFile: null
+    newFile: !uuid 'ff0886d744fd277bf2a3f0ce160930cfbba66e56'
-    oldFile: !uuid '0c1b6f5449f287625e1db0f54a98bf8376edb225'
+    oldFile: !uuid '7ff07d64ff6a6058044e8968acaf8fb060d450d4'
-  /dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/registry/HeartBeatTask.java:
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java:
-    newFile: null
+    newFile: !uuid '2ab78f5151713b1e401b7abf9117fc4cb9acfe64'
-    oldFile: !uuid '495d48e34240b2d52d5d6367c11f3210b86d0fd4'
+    oldFile: !uuid 'ca68dc57e56997bb698d7e640104e3805bd68f65'
-  /dolphinscheduler-worker:
+  /dolphinscheduler-dao/src/main/resources:
-    newFile: !uuid 'e1245248b747dc32b346e4afaa60037a25cbd2e2'
+    newFile: !uuid 'a130316775b91c29582c59ddb8df0da919884a17'
-    oldFile: !uuid '36da3f733d10b2af7ec013236426da42c51927c3'
+    oldFile: !uuid 'd96bdcdb87e9068cfdd467b286ebb43b6a2acbf1'
-  /dolphinscheduler-worker/src:
+  /dolphinscheduler-dao/src/main/resources/org:
-    newFile: !uuid '8071cb37529d6c753003c67b426d280bec3bd258'
+    newFile: !uuid 'db0157dc879dcc2c4a6d91bc04786e9df087f576'
-    oldFile: !uuid '4e0121b10eb81b25fed87ab0b85f0e2f1d760428'
+    oldFile: !uuid 'dffc5534e9c29507890926df0b6366819ba97eb9'
-  /dolphinscheduler-worker/src/main:
+  /dolphinscheduler-dao/src/main/resources/org/apache:
-    newFile: !uuid 'f07b180d77b3fb9d45464008f6d8200e5a623704'
+    newFile: !uuid '9ef1e1c066d563e286d744e493476937b7125e39'
-    oldFile: !uuid 'bbf95ba091ac87237dd557a8cd25ddd5975ef8f9'
+    oldFile: !uuid 'db371166fc428021920a4d17476eec9dd6a4b02a'
-  /dolphinscheduler-worker/src/main/java:
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler:
-    newFile: !uuid 'a1f390f699a175217ebde92dec501c364ec7c98e'
+    newFile: !uuid 'e1e0540a40267cc24a68fddaecf6ee475252d122'
-    oldFile: !uuid '7ec55a1d158358c75f44c5468602217c0b8744cc'
+    oldFile: !uuid '135aa21b94093399d1fcb270e42f6ea90de50f09'
-  /dolphinscheduler-worker/src/main/java/org:
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao:
-    newFile: !uuid '31e95c63a8261fdbbe24212821222b146a535fc6'
+    newFile: !uuid 'cd829a02489ddc6ac749e58fce6a1ddaac4f266a'
-    oldFile: !uuid '5a80c3c0a5591d57c7a47af7d33f0c7e76d319d7'
+    oldFile: !uuid '3fb89fb52a8ed173ee602feb0e83dfcbef4b8570'
-  /dolphinscheduler-worker/src/main/java/org/apache:
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper:
-    newFile: !uuid '43c6da3b50e0e9f9ee44b0cb9bf5736fa22437d4'
+    newFile: !uuid 'bebc165ecd65f504b113ebcecbe01ce4d980bab9'
-    oldFile: !uuid 'ee92b43ed3b19fa3de8dac256931d4cc1a8e5057'
+    oldFile: !uuid 'be36412580f40a765599b64a3dd6449223f25973'
-  /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler:
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml:
-    newFile: !uuid '54af8e1b05097e433abdbbe81ea4cccdc4ceb0c9'
+    newFile: !uuid '0ba80db75f9ca15137949014462cf85e802f65eb'
-    oldFile: !uuid '431b824a558a7bddd2a2b0e198b91c3f1e6648f9'
+    oldFile: !uuid 'e09b8aa887d79952ea945b691765f96966bbc5a6'
-  /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server:
+  /dolphinscheduler-dao/src/test:
-    newFile: !uuid '252b66eb824e38fca90a4c6134daf45f9265ad17'
+    newFile: !uuid 'ba878b4a2ca56dce14a9e33d223bc2860a09f185'
-    oldFile: !uuid '9a3e7576c861d0249e7fb3d381c48d11259d9a72'
+    oldFile: !uuid '4e963e89a1acc4e73486a232d13d3ca5b58761b6'
-  /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker:
+  /dolphinscheduler-dao/src/test/java:
-    newFile: !uuid 'ff0b14598beb984d4e33c1bf3eab154ac5069249'
+    newFile: !uuid '1e98d13b795eb8dffddf612f25d5c99ed47a00c3'
-    oldFile: !uuid 'a4a0daed533aaa175369a18f0ce6a895338833c0'
+    oldFile: !uuid '032fd99b2cf258b7851b916f2272e28bf2fad9fb'
-  /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/registry:
+  /dolphinscheduler-dao/src/test/java/org:
-    newFile: !uuid 'd3e1ea8a6f77436cad4881cb0435676031a7164e'
+    newFile: !uuid '3b73500ef947a25ea0b2254f02a65c1d808738c1'
-    oldFile: !uuid '45939175fdc9e158e3be5ff20dcb309b6ef238cf'
+    oldFile: !uuid '4fa80c5f80a4c0e40d321be8b364abd82a4d043f'
-  /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerHeartBeatTask.java:
+  /dolphinscheduler-dao/src/test/java/org/apache:
-    newFile: !uuid '84506753be3217c76359b5ad337bac532914a702'
+    newFile: !uuid '402b48e25f1dee32bd29cd8b4d0911ed157aff4e'
-    oldFile: null
+    oldFile: !uuid 'e334125259da977b07afa2c657350f81442e1774'
-  /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java:
+  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler:
-    newFile: !uuid '5c3f7bf507103bd2b7adabdc3bb9d60b40a59495'
+    newFile: !uuid 'fd8330e023d5dc873df4ea08c3c0cffcf11afc37'
-    oldFile: !uuid '225439b33d00fd0659268d792ffba235d3d35296'
+    oldFile: !uuid '81e475b7bf67f935c9f32c70cb8cbae8dea4825b'
-gitCommitId: !uuid '3f2ca7bca3e612b2ce5d22324d22aa33fac04ea2'
+  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao:
-renames:
+    newFile: !uuid '6ea4d3d72028a58e8a64f45df43e069f370ee2b1'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterHeartBeatTask.java: /dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/registry/HeartBeatTask.java
+    oldFile: !uuid '64c0aea761c362366f89cd7647659bf790f5ea9b'
-  /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerHeartBeatTask.java: /dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/registry/HeartBeatTask.java
+  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper:
-revisionId: 3394
+    newFile: !uuid 'e744f5be2e4deb7c20f17af30c7d5e128894d82a'
    oldFile: !uuid 'd5afdca9b9e783ae8f78c771b6282a4db0f2ff25'
  /dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java:
    newFile: !uuid '014a2a2c3c9f460c72038bd8da202ee59ad0398a'
    oldFile: !uuid 'fa5a256caac8d1c2c5fb2de2d5b1e784c6852fc6'
 gitCommitId: !uuid '4893bef5a79fc022b74f8c273bd8079517726f35'
 renames: {
  }
 revisionId: 3395
		`@ -1 +1 @@`
			`Subproject commit 3f2ca7bca3e612b2ce5d22324d22aa33fac04ea2`				`Subproject commit 4893bef5a79fc022b74f8c273bd8079517726f35`