Merge 9568eae into 9739331

apache · Aug 26, 2018 · 13d87f4 · 13d87f4
2 parents 9739331 + 9568eae
commit 13d87f4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...java/io/shardingsphere/proxy/backend/jdbc/execute/stream/MemoryStrictlyExecuteEngine.java b/...java/io/shardingsphere/proxy/backend/jdbc/execute/stream/MemoryStrictlyExecuteEngine.java
@@ -71,18 +71,20 @@ public ExecuteResponse execute(final SQLRouteResult routeResult) throws SQLExcep
         SQLType sqlType = routeResult.getSqlStatement().getType();
         boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
         Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
-        Collection<ExecuteResponseUnit> executeResponseUnits = sqlExecuteTemplate.execute(getStatementExecuteUnits(routeResult, isReturnGeneratedKeys), 
+        Collection<ExecuteResponseUnit> executeResponseUnits = sqlExecuteTemplate.execute(getStatementExecuteUnits(this, routeResult, isReturnGeneratedKeys),
                 new FirstMemoryStrictlySQLExecuteCallback(sqlType, isExceptionThrown, dataMap, isReturnGeneratedKeys), 
                 new MemoryStrictlySQLExecuteCallback(sqlType, isExceptionThrown, dataMap, isReturnGeneratedKeys));
         ExecuteResponseUnit firstExecuteResponseUnit = executeResponseUnits.iterator().next();
         return firstExecuteResponseUnit instanceof ExecuteQueryResponseUnit
                 ? getExecuteQueryResponse(((ExecuteQueryResponseUnit) firstExecuteResponseUnit).getQueryResponsePackets(), executeResponseUnits) : new ExecuteUpdateResponse(executeResponseUnits);
     }
 
-    private Collection<StatementExecuteUnit> getStatementExecuteUnits(final SQLRouteResult routeResult, final boolean isReturnGeneratedKeys) throws SQLException {
+    private static synchronized Collection<StatementExecuteUnit> getStatementExecuteUnits(final MemoryStrictlyExecuteEngine memoryStrictlyExecuteEngine, final SQLRouteResult routeResult,
+                                                                                          final boolean isReturnGeneratedKeys) throws SQLException {
         Collection<StatementExecuteUnit> result = new LinkedList<>();
         for (SQLExecutionUnit each : routeResult.getExecutionUnits()) {
-            Statement statement = getJdbcExecutorWrapper().createStatement(getBackendConnection().getConnection(each.getDataSource()), each.getSqlUnit().getSql(), isReturnGeneratedKeys);
+            Statement statement = memoryStrictlyExecuteEngine.getJdbcExecutorWrapper().createStatement(memoryStrictlyExecuteEngine.getBackendConnection().getConnection(each.getDataSource()),
+                each.getSqlUnit().getSql(), isReturnGeneratedKeys);
             result.add(new ProxyStatementExecuteUnit(each, statement));
         }
         return result;