Commit 3c35015f authored by terrymanu's avatar terrymanu
Browse files

refactor ExecuteCallback

parent bcff9803

sharding-jdbc/src/main/java/io/shardingsphere/core/executor/type/connection/ConnectionStrictlyExecutorEngine.java

+0 −4
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import com.google.common.util.concurrent.ListenableFuture; 
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,8 +64,6 @@ public final class ConnectionStrictlyExecutorEngine extends ExecutorEngine { 
    

    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>>() {

sharding-jdbc/src/main/java/io/shardingsphere/core/executor/type/memory/MemoryStrictlyExecutorEngine.java

+0 −5
Original line number Diff line number Diff line
@@ -22,15 +22,12 @@ import com.google.common.util.concurrent.ListenableFuture; 
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,8 +52,6 @@ public final class MemoryStrictlyExecutorEngine extends ExecutorEngine { 
    

    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>() {