for #1205, sync SQLExecutePrepareTemplate for Get connection sync to …

…prevent dead lock
apache · Sep 19, 2018 · 58f684d · 58f684d
1 parent 0559861
commit 58f684d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/.../src/main/java/io/shardingsphere/core/executor/sql/prepare/SQLExecutePrepareTemplate.java b/.../src/main/java/io/shardingsphere/core/executor/sql/prepare/SQLExecutePrepareTemplate.java
@@ -57,8 +57,10 @@ public final class SQLExecutePrepareTemplate {
     public Collection<ShardingExecuteGroup<StatementExecuteUnit>> getExecuteUnitGroups(final Collection<RouteUnit> routeUnits, final SQLExecutePrepareCallback callback) throws SQLException {
         Map<String, List<SQLUnit>> sqlUnitGroups = getSQLUnitGroups(routeUnits);
         Collection<ShardingExecuteGroup<StatementExecuteUnit>> result = new LinkedList<>();
-        for (Entry<String, List<SQLUnit>> entry : sqlUnitGroups.entrySet()) {
-            result.addAll(getSQLExecuteGroups(entry.getKey(), entry.getValue(), callback));
+        synchronized (SQLExecutePrepareTemplate.class) {
+            for (Entry<String, List<SQLUnit>> entry : sqlUnitGroups.entrySet()) {
+                result.addAll(getSQLExecuteGroups(entry.getKey(), entry.getValue(), callback));
+            }
         }
         return result;
     }

diff --git a/...ing-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java b/...ing-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java
@@ -119,12 +119,10 @@ public final List<Connection> getConnections(final String dataSourceName, final
 
     private List<Connection> createConnections(final DataSource dataSource, final int connectionSize) throws SQLException {
         List<Connection> result = new ArrayList<>(connectionSize);
-        synchronized (getDataSourceMap()) {
-            for (int i = 0; i < connectionSize; i++) {
-                Connection connection = dataSource.getConnection();
-                replayMethodsInvocation(connection);
-                result.add(connection);
-            }
+        for (int i = 0; i < connectionSize; i++) {
+            Connection connection = dataSource.getConnection();
+            replayMethodsInvocation(connection);
+            result.add(connection);
         }
         return result;
     }

diff --git a/.../src/main/java/io/shardingsphere/proxy/backend/jdbc/datasource/JDBCBackendDataSource.java b/.../src/main/java/io/shardingsphere/proxy/backend/jdbc/datasource/JDBCBackendDataSource.java
@@ -106,10 +106,8 @@ public Connection getConnection(final String dataSourceName) throws SQLException
      */
     public List<Connection> getConnections(final String dataSourceName, final int connectionSize) throws SQLException {
         List<Connection> result = new ArrayList<>(connectionSize);
-        synchronized (getDataSourceMap()) {
-            for (int i = 0; i < connectionSize; i++) {
-                result.add(getDataSourceMap().get(dataSourceName).getConnection());
-            }
+        for (int i = 0; i < connectionSize; i++) {
+            result.add(getDataSourceMap().get(dataSourceName).getConnection());
         }
         return result;
     }