This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 47a62120671 Add DataSourcesCloser (#31013)
47a62120671 is described below
commit 47a6212067141c45a84756de22a84b2b9c7f440f
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Apr 25 19:47:36 2024 +0800
Add DataSourcesCloser (#31013)
* Close created data sources if create next data source failed on
DataSourceGeneratedDatabaseConfiguration
* Add DataSourcesCloser
---
.../DataSourceGeneratedDatabaseConfiguration.java | 17 +-----
.../infra/util/close/DataSourcesCloser.java | 65 ++++++++++++++++++++++
2 files changed, 67 insertions(+), 15 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/database/impl/DataSourceGeneratedDatabaseConfiguration.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/database/impl/DataSourceGeneratedDatabaseConfiguration.java
index 9a60293ca24..f77c07ba9f0 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/database/impl/DataSourceGeneratedDatabaseConfiguration.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/database/impl/DataSourceGeneratedDatabaseConfiguration.java
@@ -24,13 +24,12 @@ import
org.apache.shardingsphere.infra.datasource.pool.config.DataSourceConfigur
import
org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator;
import
org.apache.shardingsphere.infra.datasource.pool.props.creator.DataSourcePoolPropertiesCreator;
import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
-import
org.apache.shardingsphere.infra.exception.core.external.sql.type.wrapper.SQLWrapperException;
import
org.apache.shardingsphere.infra.metadata.database.resource.node.StorageNode;
import
org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit;
import
org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnitNodeMapCreator;
+import org.apache.shardingsphere.infra.util.close.DataSourcesCloser;
import javax.sql.DataSource;
-import java.sql.SQLException;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -75,21 +74,9 @@ public final class DataSourceGeneratedDatabaseConfiguration
implements DatabaseC
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- result.values().forEach(this::close);
+ DataSourcesCloser.close(result.values());
throw ex;
}
return result;
}
-
- private void close(final DataSource dataSource) {
- if (dataSource instanceof AutoCloseable) {
- try {
- ((AutoCloseable) dataSource).close();
- // CHECKSTYLE:OFF
- } catch (final Exception ex) {
- // CHECKSTYLE:ON
- throw new SQLWrapperException(new SQLException(ex));
- }
- }
- }
}
diff --git
a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/close/DataSourcesCloser.java
b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/close/DataSourcesCloser.java
new file mode 100644
index 00000000000..1cf0337b19a
--- /dev/null
+++
b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/close/DataSourcesCloser.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.infra.util.close;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import
org.apache.shardingsphere.infra.exception.core.external.sql.type.wrapper.SQLWrapperException;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.LinkedList;
+
+/**
+ * Data sources closer.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class DataSourcesCloser {
+
+ /**
+ * Close data sources.
+ *
+ * @param dataSources data sources
+ */
+ public static void close(final Collection<DataSource> dataSources) {
+ Collection<Exception> causes = new LinkedList<>();
+ for (DataSource each : dataSources) {
+ if (each instanceof AutoCloseable) {
+ try {
+ ((AutoCloseable) each).close();
+ // CHECKSTYLE:OFF
+ } catch (final Exception ex) {
+ // CHECKSTYLE:ON
+ causes.add(ex);
+ }
+ }
+ }
+ if (!causes.isEmpty()) {
+ throwException(causes);
+ }
+ }
+
+ private static void throwException(final Collection<Exception> causes) {
+ SQLException sqlException = new SQLException();
+ for (Exception each : causes) {
+ sqlException.setNextException(new SQLException(each));
+ }
+ throw new SQLWrapperException(sqlException);
+ }
+}
