Commit 7ebca8ce authored by terrymanu's avatar terrymanu
Browse files

refactor merge module, split dql and dal packages

parent c24955be

sharding-core/src/main/java/io/shardingjdbc/core/merger/DALMergeEngine.java→sharding-core/src/main/java/io/shardingjdbc/core/merger/dal/DALMergeEngine.java

+8 −5
Original line number Diff line number Diff line
@@ -15,12 +15,15 @@ 
 * </p>

 */



package io.shardingjdbc.core.merger;

package io.shardingjdbc.core.merger.dal;



import io.shardingjdbc.core.merger.show.ShowCreateTableResultSetMerger;

import io.shardingjdbc.core.merger.show.ShowDatabasesResultSetMerger;

import io.shardingjdbc.core.merger.show.ShowOtherResultSetMerger;

import io.shardingjdbc.core.merger.show.ShowTablesResultSetMerger;

import io.shardingjdbc.core.merger.MergeEngine;

import io.shardingjdbc.core.merger.QueryResult;

import io.shardingjdbc.core.merger.ResultSetMerger;

import io.shardingjdbc.core.merger.dal.show.ShowCreateTableResultSetMerger;

import io.shardingjdbc.core.merger.dal.show.ShowDatabasesResultSetMerger;

import io.shardingjdbc.core.merger.dal.show.ShowOtherResultSetMerger;

import io.shardingjdbc.core.merger.dal.show.ShowTablesResultSetMerger;

import io.shardingjdbc.core.parsing.parser.dialect.mysql.statement.ShowCreateTableStatement;

import io.shardingjdbc.core.parsing.parser.dialect.mysql.statement.ShowDatabasesStatement;

import io.shardingjdbc.core.parsing.parser.dialect.mysql.statement.ShowTablesStatement;

sharding-core/src/main/java/io/shardingjdbc/core/merger/show/ShowCreateTableResultSetMerger.java→sharding-core/src/main/java/io/shardingjdbc/core/merger/dal/show/ShowCreateTableResultSetMerger.java

+3 −3
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 
 * </p>

 */



package io.shardingjdbc.core.merger.show;

package io.shardingjdbc.core.merger.dal.show;



import com.google.common.base.Optional;

import io.shardingjdbc.core.constant.DatabaseType;

import io.shardingjdbc.core.merger.QueryResult;

import io.shardingjdbc.core.merger.common.AbstractMemoryResultSetMerger;

import io.shardingjdbc.core.merger.common.MemoryResultSetRow;

import io.shardingjdbc.core.merger.dql.common.AbstractMemoryResultSetMerger;

import io.shardingjdbc.core.merger.dql.common.MemoryResultSetRow;

import io.shardingjdbc.core.parsing.SQLParsingEngine;

import io.shardingjdbc.core.rule.ShardingRule;

import io.shardingjdbc.core.rule.TableRule;

sharding-core/src/main/java/io/shardingjdbc/core/merger/show/ShowDatabasesResultSetMerger.java→sharding-core/src/main/java/io/shardingjdbc/core/merger/dal/show/ShowDatabasesResultSetMerger.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * </p>

 */



package io.shardingjdbc.core.merger.show;

package io.shardingjdbc.core.merger.dal.show;



import io.shardingjdbc.core.constant.ShardingConstant;

import io.shardingjdbc.core.merger.ResultSetMerger;

sharding-core/src/main/java/io/shardingjdbc/core/merger/show/ShowOtherResultSetMerger.java→sharding-core/src/main/java/io/shardingjdbc/core/merger/dal/show/ShowOtherResultSetMerger.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * </p>

 */



package io.shardingjdbc.core.merger.show;

package io.shardingjdbc.core.merger.dal.show;



import io.shardingjdbc.core.merger.ResultSetMerger;

import io.shardingjdbc.core.merger.QueryResult;

sharding-core/src/main/java/io/shardingjdbc/core/merger/show/ShowTablesResultSetMerger.java→sharding-core/src/main/java/io/shardingjdbc/core/merger/dal/show/ShowTablesResultSetMerger.java

+3 −3
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 
 * </p>

 */



package io.shardingjdbc.core.merger.show;

package io.shardingjdbc.core.merger.dal.show;



import com.google.common.base.Optional;

import io.shardingjdbc.core.constant.ShardingConstant;

import io.shardingjdbc.core.merger.QueryResult;

import io.shardingjdbc.core.merger.common.AbstractMemoryResultSetMerger;

import io.shardingjdbc.core.merger.common.MemoryResultSetRow;

import io.shardingjdbc.core.merger.dql.common.AbstractMemoryResultSetMerger;

import io.shardingjdbc.core.merger.dql.common.MemoryResultSetRow;

import io.shardingjdbc.core.rule.ShardingRule;

import io.shardingjdbc.core.rule.TableRule;