diff --git a/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/ShardingTableMetaData.java b/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/ShardingTableMetaData.java index 663c237fe55ab..c87031dc84c62 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/ShardingTableMetaData.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/ShardingTableMetaData.java @@ -20,6 +20,9 @@ import com.google.common.base.Optional; import com.google.common.util.concurrent.ListeningExecutorService; import io.shardingsphere.core.exception.ShardingException; +import io.shardingsphere.core.metadata.table.executor.TableLoader; +import io.shardingsphere.core.metadata.table.executor.TableMetaDataExecutorAdapter; +import io.shardingsphere.core.metadata.table.executor.TableMetaDataLoader; import io.shardingsphere.core.rule.ShardingRule; import io.shardingsphere.core.rule.TableRule; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/TableLoader.java b/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableLoader.java similarity index 96% rename from sharding-core/src/main/java/io/shardingsphere/core/metadata/table/TableLoader.java rename to sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableLoader.java index bd79f2bc5ad1f..5b44762487e3f 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/TableLoader.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableLoader.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.metadata.table; +package io.shardingsphere.core.metadata.table.executor; import lombok.RequiredArgsConstructor; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/TableMetaDataExecutorAdapter.java b/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataExecutorAdapter.java similarity index 95% rename from sharding-core/src/main/java/io/shardingsphere/core/metadata/table/TableMetaDataExecutorAdapter.java rename to sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataExecutorAdapter.java index 016ae64717516..ca9b431177ff6 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/TableMetaDataExecutorAdapter.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataExecutorAdapter.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.metadata.table; +package io.shardingsphere.core.metadata.table.executor; import java.sql.Connection; import java.sql.SQLException; diff --git a/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/TableMetaDataLoader.java b/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataLoader.java similarity index 97% rename from sharding-core/src/main/java/io/shardingsphere/core/metadata/table/TableMetaDataLoader.java rename to sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataLoader.java index 1cdba552598dc..09edf37951a32 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/TableMetaDataLoader.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataLoader.java @@ -15,12 +15,14 @@ *

*/ -package io.shardingsphere.core.metadata.table; +package io.shardingsphere.core.metadata.table.executor; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import io.shardingsphere.core.exception.ShardingException; +import io.shardingsphere.core.metadata.table.ColumnMetaData; +import io.shardingsphere.core.metadata.table.TableMetaData; import io.shardingsphere.core.rule.DataNode; import io.shardingsphere.core.rule.ShardingDataSourceNames; import io.shardingsphere.core.rule.ShardingRule; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java index 81a2b22326033..e64b15da7da67 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java @@ -39,7 +39,7 @@ import io.shardingsphere.core.merger.event.EventMergeType; import io.shardingsphere.core.merger.event.ResultSetMergeEvent; import io.shardingsphere.core.metadata.table.ShardingTableMetaData; -import io.shardingsphere.core.metadata.table.TableMetaDataLoader; +import io.shardingsphere.core.metadata.table.executor.TableMetaDataLoader; import io.shardingsphere.core.parsing.parser.sql.dal.DALStatement; import io.shardingsphere.core.parsing.parser.sql.dml.insert.InsertStatement; import io.shardingsphere.core.parsing.parser.sql.dql.DQLStatement; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java index e6da7bbddf34f..11a544617d564 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java @@ -35,7 +35,7 @@ import io.shardingsphere.core.merger.event.EventMergeType; import io.shardingsphere.core.merger.event.ResultSetMergeEvent; import io.shardingsphere.core.metadata.table.ShardingTableMetaData; -import io.shardingsphere.core.metadata.table.TableMetaDataLoader; +import io.shardingsphere.core.metadata.table.executor.TableMetaDataLoader; import io.shardingsphere.core.parsing.parser.sql.dal.DALStatement; import io.shardingsphere.core.parsing.parser.sql.dml.insert.InsertStatement; import io.shardingsphere.core.parsing.parser.sql.dql.DQLStatement; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/metadata/DataSourceMapTableMetaDataExecutorAdapter.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/metadata/DataSourceMapTableMetaDataExecutorAdapter.java index af5f8caa8abb5..747c04eca96d8 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/metadata/DataSourceMapTableMetaDataExecutorAdapter.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/metadata/DataSourceMapTableMetaDataExecutorAdapter.java @@ -17,7 +17,7 @@ package io.shardingsphere.core.jdbc.metadata; -import io.shardingsphere.core.metadata.table.TableMetaDataExecutorAdapter; +import io.shardingsphere.core.metadata.table.executor.TableMetaDataExecutorAdapter; import lombok.RequiredArgsConstructor; import javax.sql.DataSource; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/metadata/ShardingConnectionTableMetaDataExecutorAdapter.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/metadata/ShardingConnectionTableMetaDataExecutorAdapter.java index 66c5397a4d44d..3fbc011df0da7 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/metadata/ShardingConnectionTableMetaDataExecutorAdapter.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/metadata/ShardingConnectionTableMetaDataExecutorAdapter.java @@ -18,7 +18,7 @@ package io.shardingsphere.core.jdbc.metadata; import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; -import io.shardingsphere.core.metadata.table.TableMetaDataExecutorAdapter; +import io.shardingsphere.core.metadata.table.executor.TableMetaDataExecutorAdapter; import lombok.RequiredArgsConstructor; import java.sql.Connection; diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/jdbc/JDBCBackendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/jdbc/JDBCBackendHandler.java index 48fb546da1df3..efc4fdb8d2702 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/jdbc/JDBCBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/jdbc/JDBCBackendHandler.java @@ -23,7 +23,7 @@ import io.shardingsphere.core.constant.TransactionType; import io.shardingsphere.core.merger.MergeEngineFactory; import io.shardingsphere.core.merger.MergedResult; -import io.shardingsphere.core.metadata.table.TableMetaDataLoader; +import io.shardingsphere.core.metadata.table.executor.TableMetaDataLoader; import io.shardingsphere.core.parsing.parser.sql.SQLStatement; import io.shardingsphere.core.parsing.parser.sql.dml.insert.InsertStatement; import io.shardingsphere.core.routing.SQLRouteResult; diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/netty/SQLPacketsBackendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/netty/SQLPacketsBackendHandler.java index 0f148df5fdbd1..841c6c9fc67ca 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/netty/SQLPacketsBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/netty/SQLPacketsBackendHandler.java @@ -26,7 +26,7 @@ import io.shardingsphere.core.merger.MergeEngineFactory; import io.shardingsphere.core.merger.MergedResult; import io.shardingsphere.core.merger.QueryResult; -import io.shardingsphere.core.metadata.table.TableMetaDataLoader; +import io.shardingsphere.core.metadata.table.executor.TableMetaDataLoader; import io.shardingsphere.core.parsing.SQLJudgeEngine; import io.shardingsphere.core.parsing.parser.sql.SQLStatement; import io.shardingsphere.core.routing.SQLExecutionUnit; diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/metadata/ProxyTableMetaDataExecutorAdapter.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/metadata/ProxyTableMetaDataExecutorAdapter.java index 74bfbe03d281a..6d393a8419d3a 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/metadata/ProxyTableMetaDataExecutorAdapter.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/metadata/ProxyTableMetaDataExecutorAdapter.java @@ -17,7 +17,7 @@ package io.shardingsphere.proxy.metadata; -import io.shardingsphere.core.metadata.table.TableMetaDataExecutorAdapter; +import io.shardingsphere.core.metadata.table.executor.TableMetaDataExecutorAdapter; import io.shardingsphere.proxy.backend.jdbc.datasource.JDBCBackendDataSource; import lombok.RequiredArgsConstructor;