#3238: [Fix-10918] Close datasource when expire from guava cache (#11120)

* Close datasource when expire from guava cache
* Remove duplicate datasource in HiveDataSourceClient

commit.ref

@@ -1 +1 @@
-Subproject commit 952aee80e78246dd6ea67ebbc6a7d3ade2ae2f62
+Subproject commit 71cf7e1baa7b813ac381c37c0345e837d2c07557

commit.yml

@@ -2,34 +2,115 @@
 branches: {
   }
 fileChange:
-  /docs:
+  /dolphinscheduler-datasource-plugin:
-    newFile: !uuid '712a8cf89ef64ad34acea3606cf2fd1477d8e301'
+    newFile: !uuid '98b2e1c1775116d64b5b0da55d18078dceafb95e'
-    oldFile: !uuid 'ab6e27d7432acbc7ef4d69efce45efdcfcc74460'
+    oldFile: !uuid '1c298b399707e84b0d55148da659c5f79003589e'
-  /docs/configs:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api:
-    newFile: !uuid '381a2ab55850c0815a3aa485552b549b8a82517a'
+    newFile: !uuid '7ffcdb68ed2de965eb403a88db5ed665d12ea721'
-    oldFile: !uuid '6f2f6e7aaa14901671645412c23658e433d4ab3d'
+    oldFile: !uuid '3d7721dff5a70129cc1a1e35ce61a47fd6fbc90d'
-  /docs/configs/docsdev.js:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src:
-    newFile: !uuid 'd74dba0a671e6ea40e5dc07cf132827eae2a743c'
+    newFile: !uuid '0ac2cd48fa536a208d728f84db1e02026a99b186'
-    oldFile: !uuid '2b0128ec537c852f909e9493908a6c1fab8b787a'
+    oldFile: !uuid 'c9e4b588b1b6142b15b4c10d006418de9257869c'
-  /dolphinscheduler-python:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main:
-    newFile: !uuid '85f4847473d8f0caf8630764cc3f50068e929674'
+    newFile: !uuid 'edd88e81a70624bd85d0991334660bdfde87811b'
-    oldFile: !uuid '8f91ebbb840cf9abe1fb6b863c696aff7ede2824'
+    oldFile: !uuid 'e29791f35a48219a6eb75ae269ed7a24ec62931c'
-  /dolphinscheduler-python/pydolphinscheduler:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java:
-    newFile: !uuid '404a47df6b1f8d492c31ad77595499f96256b8d8'
+    newFile: !uuid '71d8715fc6f0908c49c70995ae1bdcc7bbbac590'
-    oldFile: !uuid 'c6db4f1a25b65e205dd333b55c7d3dc63b11ec84'
+    oldFile: !uuid '1445e9d829da7596f0de78141b52daf35f847360'
-  /dolphinscheduler-python/pydolphinscheduler/docs:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org:
-    newFile: !uuid '126d0226efd7707c7871f4cab356fb99cffac934'
+    newFile: !uuid 'fc6655ebfae0abc9071aa6aab81e01856848687c'
-    oldFile: !uuid 'b67f3de367c4fd09325ed49e2d9ed833ff79270d'
+    oldFile: !uuid '382c7ee3ed40cc951a89c2d671b757fdaf74ac9d'
-  /dolphinscheduler-python/pydolphinscheduler/docs/source:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache:
-    newFile: !uuid '3de191af9bf4dba679f4a8833b16a89d8435a9a0'
+    newFile: !uuid '678508d95e8dc2b7632ad6c0e6f29a05342bc375'
-    oldFile: !uuid '3e44e365b2b62b2fe950b945d5686dbbb92150b1'
+    oldFile: !uuid 'c61016176f52745a7831c6ff66ac0de7cfb61a6e'
-  /dolphinscheduler-python/pydolphinscheduler/docs/source/tasks:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '9c7c38125c6a7fb6f0e16bb350ca4736308ba9b0'
+    newFile: !uuid 'c717536c93c623ee5eb9f5eedcd8a1bb14f93e92'
-    oldFile: !uuid '46dd1d3aa694ef784bf12932b334ecef2a2dc1d8'
+    oldFile: !uuid '4d16c707c6f599a7f8ff9aa958e48295cc42b228'
-  /dolphinscheduler-python/pydolphinscheduler/docs/source/tasks/sagemaker.rst:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin:
-    newFile: !uuid '96e7c6d4a098b0f1550cedf77807c27097a45fdb'
+    newFile: !uuid '463a37e4bf0ee7d16ad99c0b110150b80084e0d5'
-    oldFile: !uuid 'af627a929b3ac92c1ef1184e881e60da28104d32'
+    oldFile: !uuid 'e7f9d98839f0805aad621256e0204b2826540bff'
-gitCommitId: !uuid '952aee80e78246dd6ea67ebbc6a7d3ade2ae2f62'
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource
+  : newFile: !uuid '29f7474607726e90797548a08247e5dde0425a17'
+    oldFile: !uuid 'bb6e5505043faed2fd3a59580c13f9413ad39cf0'
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api
+  : newFile: !uuid 'd009b4062d3225fd438c70d9bbd356acb79d4436'
+    oldFile: !uuid '994693ec063fef34da482fb02abab915b7df0159'
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/client
+  : newFile: !uuid '1cdb8bbb7fb703e510c56035059f62a2bb67e662'
+    oldFile: !uuid 'bc2bf6e385286b0a82b9992358ad82d7ff248489'
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClient.java
+  : newFile: !uuid '50de82f93dfa2401dde7c879094edacb080a5278'
+    oldFile: !uuid '37af39775898ee9665320cf17a9dda1b62ea8326'
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/plugin
+  : newFile: !uuid 'c6ec9e5cb533aa9470c505a2e07c717559d62d6e'
+    oldFile: !uuid '761de604855e122842aae6363fd51fcd8594f9dc'
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceClientProvider.java
+  : newFile: !uuid 'a849fa6b4879ab5af361000e52ec93cb8424eae9'
+    oldFile: !uuid '6c2f8b1ac6a5fa2be6adc6b1f4a40de0a377fd7f'
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive:
+    newFile: !uuid 'd45094dd41aa64fb44ab3c9dbee90f7518f51798'
+    oldFile: !uuid 'cedc8c602e2449483ee01140c0052090d25466f9'
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src:
+    newFile: !uuid 'f60a8771c53c16b1f6b75bcd4332ef10c7076e33'
+    oldFile: !uuid '425514de72f8f776a14b9b03775e030c63e70a79'
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main:
+    newFile: !uuid 'decc5a371449d9ae32d00867e9cc194a2313b0e8'
+    oldFile: !uuid '1e27fb1e47ea1208d478ba6154a4074c9e58227e'
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java:
+    newFile: !uuid '1f733decdbcff1af1f356725fe052190160f28ad'
+    oldFile: !uuid 'bb5e68012b09d356be4c83b74f6f6feffac85a0d'
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org:
+    newFile: !uuid 'cba0b33b90865a6a312c0c0db4b07d63a581a0ad'
+    oldFile: !uuid 'fce8b097dc40c7850063d3b6f007bd654e175e94'
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache:
+    newFile: !uuid '6ce330ae4b9ba6e685693ec6b74e35c9af49fd68'
+    oldFile: !uuid '15e8c90c7abaa1da18bc82fc0a6480418bfd89f5'
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'b3602ca12edcbb3c585546986597f4a928f554cc'
+    oldFile: !uuid '33603704e7080a344c788385df7db1dae02a7b57'
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin:
+    newFile: !uuid '89320aa4338d63e25b2cb68ba4ab2433aee15be4'
+    oldFile: !uuid '7e1d343970c8c00fa8813d454bc8c1b424996f79'
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource
+  : newFile: !uuid '040664a9c1a7f07f6619508ad4af5e0f42785332'
+    oldFile: !uuid '231522ac2a4ce33abc68e720304f1e44aee446ad'
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hive
+  : newFile: !uuid 'eec936c9a5423fac5eef1eea9e73c895bb74c1e1'
+    oldFile: !uuid '7f15952c5aa5f761c70dc02e5b4f1431cdb73a81'
+  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hive/HiveDataSourceClient.java
+  : newFile: !uuid '13c1263fa2c981b5a4d6d795c66aebda501cb501'
+    oldFile: !uuid 'dd4f7e89cad258bfdd6e052d00ef158ea40a0fcc'
+  /dolphinscheduler-spi:
+    newFile: !uuid '9c548babebb8912ffbaf55c5861516902da25f52'
+    oldFile: !uuid '39b7f1292e4e215ab0d44e81926d031a1c9144f3'
+  /dolphinscheduler-spi/src:
+    newFile: !uuid '860e8ba5e381e446b1d984a1d4b59f3017534447'
+    oldFile: !uuid 'dfed7887fabec36c79e8c0c23d2309fc4456b44f'
+  /dolphinscheduler-spi/src/main:
+    newFile: !uuid '4cfa96fc27d85dd68e2d04882441fd1c3f3fa8ab'
+    oldFile: !uuid 'f14401a440afe45f79e66a814ef7ae627e532582'
+  /dolphinscheduler-spi/src/main/java:
+    newFile: !uuid 'd29e0d7f501d59daff27fd7d9239df5140c95785'
+    oldFile: !uuid '0e4c6033bb162cea5e8b56bc85b4ca61b728c233'
+  /dolphinscheduler-spi/src/main/java/org:
+    newFile: !uuid '37990cae75b1d6ff8118a5c7e0f1d7c9fd1529c6'
+    oldFile: !uuid '40e313473908c12a0afe9cfcef3bdd93719eb302'
+  /dolphinscheduler-spi/src/main/java/org/apache:
+    newFile: !uuid '7b05dac5401a662b8bdc262f2e44cb59c3da1cdb'
+    oldFile: !uuid '83c34ed20a8141fd5fbdcdaf429a66a954bac946'
+  /dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'b0adb2ee064eacad1a1959862b6ae74784ff194f'
+    oldFile: !uuid '5a4a27bd3ad13f8c9223b465d39bd495a9b2f71f'
+  /dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi:
+    newFile: !uuid 'b05774bf073ac199b92d41200ad209b5114d7c98'
+    oldFile: !uuid '4d4dd61c5ba24b957a318fcc33c4fb52edcef978'
+  /dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/datasource:
+    newFile: !uuid 'c22d2dc7d55f796470b1385819782703d8502fa3'
+    oldFile: !uuid 'd0b12337e6925c98064a660aa58b8c25f01dcac0'
+  /dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/datasource/DataSourceClient.java:
+    newFile: !uuid '82eb1f02cb5ebb08cd6fdeb5c4328b39ff8eb0cf'
+    oldFile: !uuid '879d198284daf3e7716a776b9a7b1955871d7223'
+gitCommitId: !uuid '71cf7e1baa7b813ac381c37c0345e837d2c07557'
 renames: {
   }
-revisionId: 3237
+revisionId: 3238