use executeEngine instead of shardingExecuteEngine on variable to simplify codes (70e65219) · Commits · SUMMER2020 / students / proj-2004142

sharding-core/src/main/java/io/shardingsphere/core/metadata/ShardingMetaData.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,8 +41,8 @@ public final class ShardingMetaData {
		private final ShardingTableMetaData table;

		public ShardingMetaData(final Map<String, String> dataSourceURLs, final ShardingRule shardingRule,
		final DatabaseType databaseType, final ShardingExecuteEngine shardingExecuteEngine, final TableMetaDataConnectionManager connectionManager) {
		final DatabaseType databaseType, final ShardingExecuteEngine executeEngine, final TableMetaDataConnectionManager connectionManager) {
		dataSource = new ShardingDataSourceMetaData(dataSourceURLs, shardingRule, databaseType);
		table = new ShardingTableMetaData(new TableMetaDataInitializer(dataSource, shardingExecuteEngine, connectionManager).load(shardingRule));
		table = new ShardingTableMetaData(new TableMetaDataInitializer(dataSource, executeEngine, connectionManager).load(shardingRule));
		}
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -44,10 +44,9 @@ public final class TableMetaDataInitializer {

		private final TableMetaDataLoader tableMetaDataLoader;

		public TableMetaDataInitializer(
		final ShardingDataSourceMetaData shardingDataSourceMetaData, final ShardingExecuteEngine shardingExecuteEngine, final TableMetaDataConnectionManager connectionManager) {
		public TableMetaDataInitializer(final ShardingDataSourceMetaData shardingDataSourceMetaData, final ShardingExecuteEngine executeEngine, final TableMetaDataConnectionManager connectionManager) {
		this.connectionManager = connectionManager;
		tableMetaDataLoader = new TableMetaDataLoader(shardingDataSourceMetaData, shardingExecuteEngine, connectionManager);
		tableMetaDataLoader = new TableMetaDataLoader(shardingDataSourceMetaData, executeEngine, connectionManager);
		}

		/**

+3 −3

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ public final class TableMetaDataLoader {

		private final ShardingDataSourceMetaData shardingDataSourceMetaData;

		private final ShardingExecuteEngine shardingExecuteEngine;
		private final ShardingExecuteEngine executeEngine;

		private final TableMetaDataConnectionManager connectionManager;

		@@ -67,7 +67,7 @@ public final class TableMetaDataLoader {
		}

		private List<TableMetaData> load(final Map<String, Collection<String>> dataNodeGroups, final ShardingDataSourceNames shardingDataSourceNames) throws SQLException {
		return shardingExecuteEngine.groupExecute(dataNodeGroups, new ShardingGroupExecuteCallback<String, TableMetaData>() {
		return executeEngine.groupExecute(dataNodeGroups, new ShardingGroupExecuteCallback<String, TableMetaData>() {

		@Override
		public Collection<TableMetaData> execute(final String dataSourceName, final Collection<String> actualTableNames) throws SQLException {

+3 −3

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ import java.util.Map;
		@RequiredArgsConstructor
		public final class SQLExecuteTemplate {

		private final ShardingExecuteEngine shardingExecuteEngine;
		private final ShardingExecuteEngine executeEngine;

		private final ConnectionMode connectionMode;

		@@ -59,8 +59,8 @@ public final class SQLExecuteTemplate {
		OverallExecutionEvent event = new OverallExecutionEvent(executeUnits.size() > 1);
		ShardingEventBusInstance.getInstance().post(event);
		try {
		List<T> result = ConnectionMode.MEMORY_STRICTLY == connectionMode ? shardingExecuteEngine.execute(new LinkedList<>(executeUnits), executeCallback)
		: shardingExecuteEngine.groupExecute(getExecuteUnitGroups(executeUnits), executeCallback);
		List<T> result = ConnectionMode.MEMORY_STRICTLY == connectionMode ? executeEngine.execute(new LinkedList<>(executeUnits), executeCallback)
		: executeEngine.groupExecute(getExecuteUnitGroups(executeUnits), executeCallback);
		event.setExecuteSuccess();
		return result;
		// CHECKSTYLE:OFF

+4 −4

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ import org.mockito.MockitoAnnotations;
		@Getter(AccessLevel.PROTECTED)
		public abstract class AbstractBaseExecutorTest {

		private ShardingExecuteEngine shardingExecuteEngine;
		private ShardingExecuteEngine executeEngine;

		private SQLExecuteTemplate executeTemplate;

		@@ -54,8 +54,8 @@ public abstract class AbstractBaseExecutorTest {
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		ExecutorExceptionHandler.setExceptionThrown(false);
		shardingExecuteEngine = new ShardingExecuteEngine(Runtime.getRuntime().availableProcessors());
		executeTemplate = new SQLExecuteTemplate(shardingExecuteEngine, ConnectionMode.MEMORY_STRICTLY);
		executeEngine = new ShardingExecuteEngine(Runtime.getRuntime().availableProcessors());
		executeTemplate = new SQLExecuteTemplate(executeEngine, ConnectionMode.MEMORY_STRICTLY);
		overallExecutionEventListener = new TestOverallExecutionEventListener(eventCaller);
		dqlExecutionEventListener = new TestDQLExecutionEventListener(eventCaller);
		dmlExecutionEventListener = new TestDMLExecutionEventListener(eventCaller);
		@@ -70,6 +70,6 @@ public abstract class AbstractBaseExecutorTest {
		ShardingEventBusInstance.getInstance().unregister(overallExecutionEventListener);
		ShardingEventBusInstance.getInstance().unregister(dqlExecutionEventListener);
		ShardingEventBusInstance.getInstance().unregister(dmlExecutionEventListener);
		shardingExecuteEngine.close();
		executeEngine.close();
		}
		}