Merge pull request #23 from sharding-sphere/dev

beckhampu · web-flow · commit a0b2dc408b4c · 2018-08-17T20:29:05.000+08:00
update from origin
diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/ExecuteCallback.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/ExecuteCallback.java
@@ -19,6 +19,8 @@
 
 import io.shardingsphere.core.constant.SQLType;
 
+import java.util.Map;
+
 /**
  * Statement execute callback interface.
  *
@@ -35,4 +37,18 @@ public interface ExecuteCallback<T> extends ShardingExecuteCallback<BaseStatemen
      * @return SQL type
      */
     SQLType getSQLType();
+    
+    /**
+     * Judge is exception thrown or not.
+     * 
+     * @return is exception thrown or not
+     */
+    boolean isExceptionThrown();
+    
+    /**
+     * Get data map.
+     * 
+     * @return data map
+     */
+    Map<String, Object> getDataMap();
 }
diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/ExecutorEngine.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/ExecutorEngine.java
@@ -34,7 +34,6 @@
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -97,10 +96,10 @@ public <T> List<T> execute(final Collection<? extends BaseStatementUnit> baseSta
     protected abstract <T> List<T> getExecuteResults(Collection<? extends BaseStatementUnit> baseStatementUnits, ExecuteCallback<T> executeCallback) throws Exception;
     
     protected final <T> T executeInternal(
-            final BaseStatementUnit baseStatementUnit, final ExecuteCallback<T> executeCallback, final boolean isExceptionThrown, final Map<String, Object> dataMap) throws Exception {
+            final BaseStatementUnit baseStatementUnit, final ExecuteCallback<T> executeCallback) throws Exception {
         T result;
-        ExecutorExceptionHandler.setExceptionThrown(isExceptionThrown);
-        ExecutorDataMap.setDataMap(dataMap);
+        ExecutorExceptionHandler.setExceptionThrown(executeCallback.isExceptionThrown());
+        ExecutorDataMap.setDataMap(executeCallback.getDataMap());
         List<SQLExecutionEvent> events = new LinkedList<>();
         for (List<Object> each : baseStatementUnit.getSqlExecutionUnit().getSqlUnit().getParameterSets()) {
             SQLExecutionEvent event = SQLExecutionEventFactory.createEvent(executeCallback.getSQLType(), baseStatementUnit, each);
diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/type/batch/BatchPreparedStatementExecutor.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/type/batch/BatchPreparedStatementExecutor.java
@@ -22,6 +22,8 @@
 import io.shardingsphere.core.executor.BaseStatementUnit;
 import io.shardingsphere.core.executor.ExecuteCallback;
 import io.shardingsphere.core.executor.ExecutorEngine;
+import io.shardingsphere.core.executor.threadlocal.ExecutorDataMap;
+import io.shardingsphere.core.executor.threadlocal.ExecutorExceptionHandler;
 import lombok.RequiredArgsConstructor;
 
 import java.sql.SQLException;
@@ -55,6 +57,8 @@ public final class BatchPreparedStatementExecutor {
      * @throws SQLException SQL exception
      */
     public int[] executeBatch() throws SQLException {
+        final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+        final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
         return accumulate(executorEngine.execute(batchPreparedStatementUnits, new ExecuteCallback<int[]>() {
             
             @Override
@@ -66,6 +70,16 @@ public int[] execute(final BaseStatementUnit baseStatementUnit) throws Exception
             public SQLType getSQLType() {
                 return sqlType;
             }
+            
+            @Override
+            public boolean isExceptionThrown() {
+                return isExceptionThrown;
+            }
+            
+            @Override
+            public Map<String, Object> getDataMap() {
+                return dataMap;
+            }
         }));
     }
     
diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/type/connection/ConnectionStrictlyExecutorEngine.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/type/connection/ConnectionStrictlyExecutorEngine.java
@@ -21,8 +21,6 @@
 import io.shardingsphere.core.executor.BaseStatementUnit;
 import io.shardingsphere.core.executor.ExecuteCallback;
 import io.shardingsphere.core.executor.ExecutorEngine;
-import io.shardingsphere.core.executor.threadlocal.ExecutorDataMap;
-import io.shardingsphere.core.executor.threadlocal.ExecutorExceptionHandler;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -66,16 +64,14 @@ private Map<String, Collection<BaseStatementUnit>> getBaseStatementUnitGroups(fi
     
     private <T> Collection<ListenableFuture<Collection<T>>> asyncExecute(final Map<String, Collection<BaseStatementUnit>> baseStatementUnitGroups, final ExecuteCallback<T> executeCallback) {
         Collection<ListenableFuture<Collection<T>>> result = new ArrayList<>(baseStatementUnitGroups.size());
-        final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
-        final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
         for (Map.Entry<String, Collection<BaseStatementUnit>> entry : baseStatementUnitGroups.entrySet()) {
             final Collection<BaseStatementUnit> baseStatementUnits = entry.getValue();
             result.add(getExecutorService().submit(new Callable<Collection<T>>() {
                 @Override
                 public Collection<T> call() throws Exception {
                     Collection<T> result = new LinkedList<>();
                     for (BaseStatementUnit each : baseStatementUnits) {
-                        result.add(executeInternal(each, executeCallback, isExceptionThrown, dataMap));
+                        result.add(executeInternal(each, executeCallback));
                     }
                     return result;
                 }
@@ -87,7 +83,7 @@ public Collection<T> call() throws Exception {
     private <T> Collection<T> syncExecute(final Collection<? extends BaseStatementUnit> baseStatementUnits, final ExecuteCallback<T> executeCallback) throws Exception {
         Collection<T> result = new LinkedList<>();
         for (BaseStatementUnit each : baseStatementUnits) {
-            result.add(executeInternal(each, executeCallback, ExecutorExceptionHandler.isExceptionThrown(), ExecutorDataMap.getDataMap()));
+            result.add(executeInternal(each, executeCallback));
         }
         return result;
     }
diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/type/memory/MemoryStrictlyExecutorEngine.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/type/memory/MemoryStrictlyExecutorEngine.java
@@ -22,15 +22,12 @@
 import io.shardingsphere.core.executor.BaseStatementUnit;
 import io.shardingsphere.core.executor.ExecuteCallback;
 import io.shardingsphere.core.executor.ExecutorEngine;
-import io.shardingsphere.core.executor.threadlocal.ExecutorDataMap;
-import io.shardingsphere.core.executor.threadlocal.ExecutorExceptionHandler;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 
@@ -55,22 +52,20 @@ protected <T> List<T> getExecuteResults(final Collection<? extends BaseStatement
     
     private <T> Collection<ListenableFuture<T>> asyncExecute(final Collection<BaseStatementUnit> baseStatementUnits, final ExecuteCallback<T> executeCallback) {
         List<ListenableFuture<T>> result = new ArrayList<>(baseStatementUnits.size());
-        final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
-        final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
         for (final BaseStatementUnit each : baseStatementUnits) {
             result.add(getExecutorService().submit(new Callable<T>() {
                 
                 @Override
                 public T call() throws Exception {
-                    return executeInternal(each, executeCallback, isExceptionThrown, dataMap);
+                    return executeInternal(each, executeCallback);
                 }
             }));
         }
         return result;
     }
     
     private <T> T syncExecute(final BaseStatementUnit baseStatementUnit, final ExecuteCallback<T> executeCallback) throws Exception {
-        return executeInternal(baseStatementUnit, executeCallback, ExecutorExceptionHandler.isExceptionThrown(), ExecutorDataMap.getDataMap());
+        return executeInternal(baseStatementUnit, executeCallback);
     }
     
     private <T> List<T> getResultList(final T firstOutput, final Collection<ListenableFuture<T>> restResultFutures) throws ExecutionException, InterruptedException {
diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/type/prepared/PreparedStatementExecutor.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/type/prepared/PreparedStatementExecutor.java
@@ -21,13 +21,16 @@
 import io.shardingsphere.core.executor.BaseStatementUnit;
 import io.shardingsphere.core.executor.ExecuteCallback;
 import io.shardingsphere.core.executor.ExecutorEngine;
+import io.shardingsphere.core.executor.threadlocal.ExecutorDataMap;
+import io.shardingsphere.core.executor.threadlocal.ExecutorExceptionHandler;
 import lombok.RequiredArgsConstructor;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * PreparedStatement Executor for multiple threads.
@@ -52,6 +55,8 @@ public final class PreparedStatementExecutor {
      * @throws SQLException SQL exception
      */
     public List<ResultSet> executeQuery() throws SQLException {
+        final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+        final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
         return executorEngine.execute(preparedStatementUnits, new ExecuteCallback<ResultSet>() {
             
             @Override
@@ -63,6 +68,16 @@ public ResultSet execute(final BaseStatementUnit baseStatementUnit) throws Excep
             public SQLType getSQLType() {
                 return sqlType;
             }
+            
+            @Override
+            public boolean isExceptionThrown() {
+                return isExceptionThrown;
+            }
+            
+            @Override
+            public Map<String, Object> getDataMap() {
+                return dataMap;
+            }
         });
     }
     
@@ -73,6 +88,8 @@ public SQLType getSQLType() {
      * @throws SQLException SQL exception
      */
     public int executeUpdate() throws SQLException {
+        final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+        final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
         List<Integer> results = executorEngine.execute(preparedStatementUnits, new ExecuteCallback<Integer>() {
             
             @Override
@@ -84,6 +101,16 @@ public Integer execute(final BaseStatementUnit baseStatementUnit) throws Excepti
             public SQLType getSQLType() {
                 return sqlType;
             }
+            
+            @Override
+            public boolean isExceptionThrown() {
+                return isExceptionThrown;
+            }
+            
+            @Override
+            public Map<String, Object> getDataMap() {
+                return dataMap;
+            }
         });
         return accumulate(results);
     }
@@ -103,6 +130,8 @@ private int accumulate(final List<Integer> results) {
      * @throws SQLException SQL exception
      */
     public boolean execute() throws SQLException {
+        final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+        final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
         List<Boolean> result = executorEngine.execute(preparedStatementUnits, new ExecuteCallback<Boolean>() {
             
             @Override
@@ -114,6 +143,16 @@ public Boolean execute(final BaseStatementUnit baseStatementUnit) throws Excepti
             public SQLType getSQLType() {
                 return sqlType;
             }
+            
+            @Override
+            public boolean isExceptionThrown() {
+                return isExceptionThrown;
+            }
+            
+            @Override
+            public Map<String, Object> getDataMap() {
+                return dataMap;
+            }
         });
         if (null == result || result.isEmpty() || null == result.get(0)) {
             return false;
diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/type/statement/StatementExecutor.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/type/statement/StatementExecutor.java
@@ -21,13 +21,16 @@
 import io.shardingsphere.core.executor.BaseStatementUnit;
 import io.shardingsphere.core.executor.ExecuteCallback;
 import io.shardingsphere.core.executor.ExecutorEngine;
+import io.shardingsphere.core.executor.threadlocal.ExecutorDataMap;
+import io.shardingsphere.core.executor.threadlocal.ExecutorExceptionHandler;
 import lombok.RequiredArgsConstructor;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Statement Executor for multiple threads.
@@ -53,6 +56,8 @@ public final class StatementExecutor {
      * @throws SQLException SQL exception
      */
     public List<ResultSet> executeQuery() throws SQLException {
+        final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+        final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
         return executorEngine.execute(statementUnits, new ExecuteCallback<ResultSet>() {
             
             @Override
@@ -64,6 +69,16 @@ public ResultSet execute(final BaseStatementUnit baseStatementUnit) throws Excep
             public SQLType getSQLType() {
                 return sqlType;
             }
+            
+            @Override
+            public boolean isExceptionThrown() {
+                return isExceptionThrown;
+            }
+            
+            @Override
+            public Map<String, Object> getDataMap() {
+                return dataMap;
+            }
         });
     }
     
@@ -135,6 +150,8 @@ public int executeUpdate(final Statement statement, final String sql) throws SQL
     }
     
     private int executeUpdate(final Updater updater) throws SQLException {
+        final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+        final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
         List<Integer> results = executorEngine.execute(statementUnits, new ExecuteCallback<Integer>() {
             
             @Override
@@ -146,6 +163,16 @@ public Integer execute(final BaseStatementUnit baseStatementUnit) throws Excepti
             public SQLType getSQLType() {
                 return sqlType;
             }
+            
+            @Override
+            public boolean isExceptionThrown() {
+                return isExceptionThrown;
+            }
+            
+            @Override
+            public Map<String, Object> getDataMap() {
+                return dataMap;
+            }
         });
         return accumulate(results);
     }
@@ -226,6 +253,8 @@ public boolean execute(final Statement statement, final String sql) throws SQLEx
     }
     
     private boolean execute(final Executor executor) throws SQLException {
+        final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+        final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
         List<Boolean> result = executorEngine.execute(statementUnits, new ExecuteCallback<Boolean>() {
             
             @Override
@@ -237,6 +266,16 @@ public Boolean execute(final BaseStatementUnit baseStatementUnit) throws SQLExce
             public SQLType getSQLType() {
                 return sqlType;
             }
+            
+            @Override
+            public boolean isExceptionThrown() {
+                return isExceptionThrown;
+            }
+            
+            @Override
+            public Map<String, Object> getDataMap() {
+                return dataMap;
+            }
         });
         if (null == result || result.isEmpty() || null == result.get(0)) {
             return false;
diff --git a/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/listener/execution/ExecuteEventListenerTest.java b/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/listener/execution/ExecuteEventListenerTest.java
