Commit a73abaf0 authored by terrymanu's avatar terrymanu
Browse files

SQLExecutorEngine => SQLExecuteTemplate

parent f9bfcc03
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import io.shardingsphere.core.constant.ConnectionMode;
import io.shardingsphere.core.event.ShardingEventBusInstance;
import io.shardingsphere.core.executor.event.overall.OverallExecutionEvent;
import io.shardingsphere.core.executor.threadlocal.ExecutorExceptionHandler;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

import java.sql.SQLException;
@@ -33,7 +32,7 @@ import java.util.List;
import java.util.Map;

/**
 * SQL execute engine.
 * SQL execute template.
 * 
 * @author gaohongtao
 * @author zhangliang
@@ -41,9 +40,8 @@ import java.util.Map;
 * @author panjuan
 */
@RequiredArgsConstructor
public final class SQLExecutorEngine {
public final class SQLExecuteTemplate {
    
    @Getter
    private final ShardingExecuteEngine shardingExecuteEngine;
    
    private final ConnectionMode connectionMode;
+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import io.shardingsphere.core.constant.DatabaseType;
import io.shardingsphere.core.constant.SQLType;
import io.shardingsphere.core.executor.StatementExecuteUnit;
import io.shardingsphere.core.executor.SQLExecuteCallback;
import io.shardingsphere.core.executor.SQLExecutorEngine;
import io.shardingsphere.core.executor.SQLExecuteTemplate;
import io.shardingsphere.core.executor.threadlocal.ExecutorDataMap;
import io.shardingsphere.core.executor.threadlocal.ExecutorExceptionHandler;
import lombok.RequiredArgsConstructor;
@@ -40,7 +40,7 @@ import java.util.Map;
@RequiredArgsConstructor
public final class BatchPreparedStatementExecutor {
    
    private final SQLExecutorEngine executorEngine;
    private final SQLExecuteTemplate executeTemplate;
    
    private final DatabaseType dbType;
    
@@ -66,7 +66,7 @@ public final class BatchPreparedStatementExecutor {
                return executeUnit.getStatement().executeBatch();
            }
        };
        return accumulate(executorEngine.execute(batchPreparedStatementUnits, callback));
        return accumulate(executeTemplate.execute(batchPreparedStatementUnits, callback));
    }
    
    private int[] accumulate(final List<int[]> results) {
+5 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ package io.shardingsphere.core.executor.type.prepared;
import io.shardingsphere.core.constant.SQLType;
import io.shardingsphere.core.executor.StatementExecuteUnit;
import io.shardingsphere.core.executor.SQLExecuteCallback;
import io.shardingsphere.core.executor.SQLExecutorEngine;
import io.shardingsphere.core.executor.SQLExecuteTemplate;
import io.shardingsphere.core.executor.threadlocal.ExecutorDataMap;
import io.shardingsphere.core.executor.threadlocal.ExecutorExceptionHandler;
import lombok.RequiredArgsConstructor;
@@ -42,7 +42,7 @@ import java.util.Map;
@RequiredArgsConstructor
public final class PreparedStatementExecutor {
    
    private final SQLExecutorEngine executorEngine;
    private final SQLExecuteTemplate executeTemplate;
    
    private final SQLType sqlType;
    
@@ -64,7 +64,7 @@ public final class PreparedStatementExecutor {
                return ((PreparedStatement) executeUnit.getStatement()).executeQuery();
            }
        };
        return executorEngine.execute(preparedStatementUnits, executeCallback);
        return executeTemplate.execute(preparedStatementUnits, executeCallback);
    }
    
    /**
@@ -83,7 +83,7 @@ public final class PreparedStatementExecutor {
                return ((PreparedStatement) executeUnit.getStatement()).executeUpdate();
            }
        };
        List<Integer> results = executorEngine.execute(preparedStatementUnits, executeCallback);
        List<Integer> results = executeTemplate.execute(preparedStatementUnits, executeCallback);
        return accumulate(results);
    }
    
@@ -111,7 +111,7 @@ public final class PreparedStatementExecutor {
                return ((PreparedStatement) executeUnit.getStatement()).execute();
            }
        };
        List<Boolean> result = executorEngine.execute(preparedStatementUnits, executeCallback);
        List<Boolean> result = executeTemplate.execute(preparedStatementUnits, executeCallback);
        if (null == result || result.isEmpty() || null == result.get(0)) {
            return false;
        }
+5 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ package io.shardingsphere.core.executor.type.statement;
import io.shardingsphere.core.constant.SQLType;
import io.shardingsphere.core.executor.StatementExecuteUnit;
import io.shardingsphere.core.executor.SQLExecuteCallback;
import io.shardingsphere.core.executor.SQLExecutorEngine;
import io.shardingsphere.core.executor.SQLExecuteTemplate;
import io.shardingsphere.core.executor.threadlocal.ExecutorDataMap;
import io.shardingsphere.core.executor.threadlocal.ExecutorExceptionHandler;
import lombok.RequiredArgsConstructor;
@@ -43,7 +43,7 @@ import java.util.Map;
@RequiredArgsConstructor
public final class StatementExecutor {
    
    private final SQLExecutorEngine executorEngine;
    private final SQLExecuteTemplate executeTemplate;
    
    private final SQLType sqlType;
    
@@ -65,7 +65,7 @@ public final class StatementExecutor {
                return executeUnit.getStatement().executeQuery(executeUnit.getSqlExecutionUnit().getSqlUnit().getSql());
            }
        };
        return executorEngine.execute(statementUnits, executeCallback);
        return executeTemplate.execute(statementUnits, executeCallback);
    }
    
    /**
@@ -145,7 +145,7 @@ public final class StatementExecutor {
                return updater.executeUpdate(executeUnit.getStatement(), executeUnit.getSqlExecutionUnit().getSqlUnit().getSql());
            }
        };
        List<Integer> results = executorEngine.execute(statementUnits, executeCallback);
        List<Integer> results = executeTemplate.execute(statementUnits, executeCallback);
        return accumulate(results);
    }
    
@@ -234,7 +234,7 @@ public final class StatementExecutor {
                return executor.execute(executeUnit.getStatement(), executeUnit.getSqlExecutionUnit().getSqlUnit().getSql());
            }
        };
        List<Boolean> result = executorEngine.execute(statementUnits, executeCallback);
        List<Boolean> result = executeTemplate.execute(statementUnits, executeCallback);
        if (null == result || result.isEmpty() || null == result.get(0)) {
            return false;
        }
+5 −5
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import com.google.common.collect.Iterators;
import io.shardingsphere.core.constant.ConnectionMode;
import io.shardingsphere.core.constant.SQLType;
import io.shardingsphere.core.event.ShardingEventBusInstance;
import io.shardingsphere.core.executor.SQLExecutorEngine;
import io.shardingsphere.core.executor.SQLExecuteTemplate;
import io.shardingsphere.core.executor.result.MemoryQueryResult;
import io.shardingsphere.core.executor.result.StreamQueryResult;
import io.shardingsphere.core.executor.type.batch.BatchPreparedStatementExecutor;
@@ -137,7 +137,7 @@ public final class ShardingPreparedStatement extends AbstractShardingPreparedSta
        ResultSet result;
        try {
            Collection<PreparedStatementUnit> preparedStatementUnits = route();
            List<ResultSet> resultSets = new PreparedStatementExecutor(new SQLExecutorEngine(connection.getShardingContext().getExecuteEngine(), connection.getShardingContext().getConnectionMode()), 
            List<ResultSet> resultSets = new PreparedStatementExecutor(new SQLExecuteTemplate(connection.getShardingContext().getExecuteEngine(), connection.getShardingContext().getConnectionMode()), 
                    routeResult.getSqlStatement().getType(), preparedStatementUnits).executeQuery();
            MergeEngine mergeEngine = MergeEngineFactory.newInstance(
                    connection.getShardingContext().getShardingRule(), getQueryResults(resultSets), routeResult.getSqlStatement(), connection.getShardingContext().getMetaData().getTable());
@@ -166,7 +166,7 @@ public final class ShardingPreparedStatement extends AbstractShardingPreparedSta
        routedStatements.clear();
        try {
            Collection<PreparedStatementUnit> preparedStatementUnits = route();
            return new PreparedStatementExecutor(new SQLExecutorEngine(connection.getShardingContext().getExecuteEngine(), connection.getShardingContext().getConnectionMode()),
            return new PreparedStatementExecutor(new SQLExecuteTemplate(connection.getShardingContext().getExecuteEngine(), connection.getShardingContext().getConnectionMode()),
                    routeResult.getSqlStatement().getType(), preparedStatementUnits).executeUpdate();
        } finally {
            refreshTableMetaData();
@@ -179,7 +179,7 @@ public final class ShardingPreparedStatement extends AbstractShardingPreparedSta
        routedStatements.clear();
        try {
            Collection<PreparedStatementUnit> preparedStatementUnits = route();
            return new PreparedStatementExecutor(new SQLExecutorEngine(connection.getShardingContext().getExecuteEngine(), connection.getShardingContext().getConnectionMode()), 
            return new PreparedStatementExecutor(new SQLExecuteTemplate(connection.getShardingContext().getExecuteEngine(), connection.getShardingContext().getConnectionMode()), 
                    routeResult.getSqlStatement().getType(), preparedStatementUnits).execute();
        } finally {
            refreshTableMetaData();
@@ -308,7 +308,7 @@ public final class ShardingPreparedStatement extends AbstractShardingPreparedSta
    @Override
    public int[] executeBatch() throws SQLException {
        try {
            return new BatchPreparedStatementExecutor(new SQLExecutorEngine(connection.getShardingContext().getExecuteEngine(), connection.getShardingContext().getConnectionMode()),
            return new BatchPreparedStatementExecutor(new SQLExecuteTemplate(connection.getShardingContext().getExecuteEngine(), connection.getShardingContext().getConnectionMode()),
                    connection.getShardingContext().getDatabaseType(), routeResult.getSqlStatement().getType(), batchStatementUnits, batchCount).executeBatch();
        } finally {
            clearBatch();
Loading