diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/merger/ResultSetMergeContext.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/merger/ResultSetMergeContext.java index b0d54d8c0e31b6b20dd80d1e9af5061544386ca7..8da4f0fbdcda3180d7781387693e900d69320571 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/merger/ResultSetMergeContext.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/merger/ResultSetMergeContext.java @@ -28,7 +28,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import lombok.Getter; -import java.sql.SQLException; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -47,7 +46,7 @@ public final class ResultSetMergeContext { private final List currentOrderByKeys; - public ResultSetMergeContext(final ShardingResultSets shardingResultSets, final SQLContext sqlContext) throws SQLException { + public ResultSetMergeContext(final ShardingResultSets shardingResultSets, final SQLContext sqlContext) { this.shardingResultSets = shardingResultSets; this.sqlContext = sqlContext; currentOrderByKeys = new LinkedList<>(); diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/SQLParser.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/SQLParser.java index bfd7d75d5137513b26a2b825b121ce0c953bfa11..c21da4bcc03ce613f564c69adb21c7d70272b0fb 100755 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/SQLParser.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/SQLParser.java @@ -31,7 +31,6 @@ import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.SQLContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.SelectItemContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.ShardingColumnContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.TableContext; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.TableToken; import com.dangdang.ddframe.rdb.sharding.parsing.parser.exception.SQLParsingUnsupportedException; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLExpr; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLIdentifierExpr; @@ -40,6 +39,7 @@ import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLNumberExpr; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLPlaceholderExpr; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLPropertyExpr; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLTextExpr; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.TableToken; import com.dangdang.ddframe.rdb.sharding.util.SQLUtil; import com.google.common.base.Optional; import lombok.Getter; @@ -151,10 +151,9 @@ public class SQLParser extends AbstractParser { } private void setTableToken(final SQLContext sqlContext, final int beginPosition, final SQLPropertyExpr propertyExpr) { - String tableName = sqlContext.getTables().get(0).getName(); String owner = propertyExpr.getOwner().getName(); - if (tableName.equalsIgnoreCase(SQLUtil.getExactlyValue(owner))) { - sqlContext.getSqlTokens().add(new TableToken(beginPosition - owner.length(), owner, tableName)); + if (sqlContext.getTables().get(0).getName().equalsIgnoreCase(SQLUtil.getExactlyValue(owner))) { + sqlContext.getSqlTokens().add(new TableToken(beginPosition - owner.length(), owner)); } } @@ -214,7 +213,7 @@ public class SQLParser extends AbstractParser { if (skipJoin()) { throw new UnsupportedOperationException("Cannot support Multiple-Table."); } - sqlContext.getSqlTokens().add(new TableToken(beginPosition, tableContext.getOriginalLiterals(), tableContext.getName())); + sqlContext.getSqlTokens().add(new TableToken(beginPosition, tableContext.getOriginalLiterals())); sqlContext.getTables().add(tableContext); } @@ -271,7 +270,7 @@ public class SQLParser extends AbstractParser { expression.append(value); getLexer().nextToken(); if (equalAny(Symbol.DOT)) { - sqlContext.getSqlTokens().add(new TableToken(position, value, SQLUtil.getExactlyValue(value))); + sqlContext.getSqlTokens().add(new TableToken(position, value)); } } return new CommonSelectItemContext(SQLUtil.getExactlyValue(expression.toString()), parseAlias(), false); diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/AbstractSQLContext.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/AbstractSQLContext.java index 24583bf9cc79c70506edcfcc9871456a9cb1cb1d..cecec2ca74c1d4a2c9562cd74c7328ce01439048 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/AbstractSQLContext.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/AbstractSQLContext.java @@ -21,6 +21,7 @@ import com.dangdang.ddframe.rdb.sharding.constant.SQLType; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLExpr; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLIdentifierExpr; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLPropertyExpr; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.SQLToken; import com.dangdang.ddframe.rdb.sharding.util.SQLUtil; import com.google.common.base.Optional; import lombok.Getter; diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/SQLContext.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/SQLContext.java index 25d6d519ce3c81221edc804e647c89d7a90679fa..7db3c8dbb716b85f7a1b36771cad4840e08f5889 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/SQLContext.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/SQLContext.java @@ -19,6 +19,7 @@ package com.dangdang.ddframe.rdb.sharding.parsing.parser.context; import com.dangdang.ddframe.rdb.sharding.constant.SQLType; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLExpr; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.SQLToken; import com.google.common.base.Optional; import java.util.List; diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLParser.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLParser.java index 73a758ee394b558aa7adbce1d053d987fb9e0df4..ea0366192b879626e02ec33aadc5b5e911144cbd 100755 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLParser.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLParser.java @@ -24,10 +24,10 @@ import com.dangdang.ddframe.rdb.sharding.parsing.lexer.token.Literals; import com.dangdang.ddframe.rdb.sharding.parsing.lexer.token.Symbol; import com.dangdang.ddframe.rdb.sharding.parsing.parser.SQLParser; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.LimitContext; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.OffsetLimitToken; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.RowCountLimitToken; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.SQLContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.exception.SQLParsingException; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.OffsetLimitToken; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.RowCountLimitToken; /** * MySQL解析器. diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/select/AbstractSelectParser.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/select/AbstractSelectParser.java index 5a90676b5fa25ef7996540c3707e4be6707273d7..6984355da09f8cd5c343292d7f4cd6dbc53300d0 100755 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/select/AbstractSelectParser.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/select/AbstractSelectParser.java @@ -21,13 +21,13 @@ import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.AggregationSelec import com.dangdang.ddframe.rdb.sharding.constant.AggregationType; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.CommonSelectItemContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.GroupByContext; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.ItemsToken; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.ItemsToken; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.OrderByContext; import com.dangdang.ddframe.rdb.sharding.constant.OrderType; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.SelectItemContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.SelectSQLContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.TableContext; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.TableToken; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.TableToken; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLExpr; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLIdentifierExpr; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLNumberExpr; @@ -314,7 +314,7 @@ public abstract class AbstractSelectParser implements SQLStatementParser { return; } // FIXME 根据shardingRule过滤table - sqlContext.getSqlTokens().add(new TableToken(beginPosition, literals, SQLUtil.getExactlyValue(literals))); + sqlContext.getSqlTokens().add(new TableToken(beginPosition, literals)); sqlContext.getTables().add(new TableContext(literals, SQLUtil.getExactlyValue(literals), getSqlParser().parseAlias())); } @@ -342,7 +342,7 @@ public abstract class AbstractSelectParser implements SQLStatementParser { SQLPropertyExpr sqlPropertyExpr = (SQLPropertyExpr) sqlExpr; for (TableContext each : sqlContext.getTables()) { if (each.getName().equalsIgnoreCase(SQLUtil.getExactlyValue(sqlPropertyExpr.getOwner().getName()))) { - sqlContext.getSqlTokens().add(new TableToken(startPosition, sqlPropertyExpr.getOwner().getName(), SQLUtil.getExactlyValue(sqlPropertyExpr.getOwner().getName()))); + sqlContext.getSqlTokens().add(new TableToken(startPosition, sqlPropertyExpr.getOwner().getName())); } } } diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/update/AbstractUpdateParser.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/update/AbstractUpdateParser.java index c1a8af94bd3ef6d460f1c30b3b9f2fba7e92558a..f1f222158d1b9cf3b793353a757658c7af44a53a 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/update/AbstractUpdateParser.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/update/AbstractUpdateParser.java @@ -20,7 +20,7 @@ package com.dangdang.ddframe.rdb.sharding.parsing.parser.statement.update; import com.dangdang.ddframe.rdb.sharding.parsing.lexer.token.DefaultKeyword; import com.dangdang.ddframe.rdb.sharding.parsing.lexer.token.Symbol; import com.dangdang.ddframe.rdb.sharding.parsing.parser.SQLParser; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.TableToken; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.TableToken; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.UpdateSQLContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.statement.SQLStatementParser; import com.dangdang.ddframe.rdb.sharding.util.SQLUtil; @@ -74,10 +74,9 @@ public abstract class AbstractUpdateParser implements SQLStatementParser { int beginPosition = sqlParser.getLexer().getCurrentToken().getEndPosition(); String literals = sqlParser.getLexer().getCurrentToken().getLiterals(); sqlParser.getLexer().nextToken(); - String tableName = sqlContext.getTables().get(0).getName(); if (sqlParser.skipIfEqual(Symbol.DOT)) { - if (tableName.equalsIgnoreCase(SQLUtil.getExactlyValue(literals))) { - sqlContext.getSqlTokens().add(new TableToken(beginPosition - literals.length(), literals, tableName)); + if (sqlContext.getTables().get(0).getName().equalsIgnoreCase(SQLUtil.getExactlyValue(literals))) { + sqlContext.getSqlTokens().add(new TableToken(beginPosition - literals.length(), literals)); } sqlParser.getLexer().nextToken(); } diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/ItemsToken.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/ItemsToken.java similarity index 93% rename from sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/ItemsToken.java rename to sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/ItemsToken.java index 20d58810bffdb2db6ea2721a16b57f76d78a0a60..762813a85bcf06272282e0dc6e48974e163d5c1b 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/ItemsToken.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/ItemsToken.java @@ -15,7 +15,7 @@ *

*/ -package com.dangdang.ddframe.rdb.sharding.parsing.parser.context; +package com.dangdang.ddframe.rdb.sharding.parsing.parser.token; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/OffsetLimitToken.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/OffsetLimitToken.java similarity index 93% rename from sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/OffsetLimitToken.java rename to sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/OffsetLimitToken.java index 0b54052c8a133dbc8a04820473c55d7a9e88af8c..7e863b0266f1af72830b27197240f386e123799b 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/OffsetLimitToken.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/OffsetLimitToken.java @@ -15,7 +15,7 @@ *

*/ -package com.dangdang.ddframe.rdb.sharding.parsing.parser.context; +package com.dangdang.ddframe.rdb.sharding.parsing.parser.token; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/RowCountLimitToken.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/RowCountLimitToken.java similarity index 93% rename from sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/RowCountLimitToken.java rename to sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/RowCountLimitToken.java index 55af7d8c289546e5dc431bbd566455963fcb4925..38c22fb3c5663d6f7a025ab3381d79f8e152bb7a 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/RowCountLimitToken.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/RowCountLimitToken.java @@ -15,7 +15,7 @@ *

*/ -package com.dangdang.ddframe.rdb.sharding.parsing.parser.context; +package com.dangdang.ddframe.rdb.sharding.parsing.parser.token; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/SQLToken.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/SQLToken.java similarity index 91% rename from sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/SQLToken.java rename to sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/SQLToken.java index 838076899c4cbee81a4e4e2741a26a44c039c932..4ecdebd986dd218fb0c72ecf57673b6a6cc2c9eb 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/SQLToken.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/SQLToken.java @@ -15,7 +15,7 @@ *

*/ -package com.dangdang.ddframe.rdb.sharding.parsing.parser.context; +package com.dangdang.ddframe.rdb.sharding.parsing.parser.token; /** * SQL标记对象. diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/TableToken.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/TableToken.java similarity index 75% rename from sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/TableToken.java rename to sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/TableToken.java index 7c8d00906db8eda29a564c5f5de944e5703917f0..c9e2d978ff3b057444f2374bb9d981762b541c38 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/context/TableToken.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/TableToken.java @@ -15,8 +15,9 @@ *

*/ -package com.dangdang.ddframe.rdb.sharding.parsing.parser.context; +package com.dangdang.ddframe.rdb.sharding.parsing.parser.token; +import com.dangdang.ddframe.rdb.sharding.util.SQLUtil; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -33,5 +34,12 @@ public final class TableToken implements SQLToken { private final String originalLiterals; - private final String tableName; + /** + * 获取表名称. + * + * @return 表名称 + */ + public String getTableName() { + return SQLUtil.getExactlyValue(originalLiterals); + } } diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/GenerateKeysUtils.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/GenerateKeysUtils.java index e0f78c058b573b6f10a36be3d5254c5e9d87176c..192b3a3fe3bc0913996d926790748dbd5f9d7fd9 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/GenerateKeysUtils.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/GenerateKeysUtils.java @@ -3,10 +3,10 @@ package com.dangdang.ddframe.rdb.sharding.rewrite; import com.dangdang.ddframe.rdb.sharding.api.rule.ShardingRule; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.ConditionContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.InsertSQLContext; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.ItemsToken; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.ShardingColumnContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLNumberExpr; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expr.SQLPlaceholderExpr; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.ItemsToken; import java.util.Collection; import java.util.List; diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/SQLBuilderContext.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/SQLBuilderContext.java index cda5790dd3d94b2282eae992bcd89ce8d7cb2c9a..0b36af0cc7ee4cbd3df7aef47d7a1c13a3cb24a3 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/SQLBuilderContext.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/SQLBuilderContext.java @@ -1,6 +1,6 @@ package com.dangdang.ddframe.rdb.sharding.rewrite; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.SQLToken; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.SQLToken; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/SQLRewriteEngine.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/SQLRewriteEngine.java index 12d867a3c9ffc9825a569a1b76b80344fbea827f..1e9f5034bb95dd195ed9b0cfe30334ac8880f7a1 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/SQLRewriteEngine.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/SQLRewriteEngine.java @@ -17,13 +17,14 @@ package com.dangdang.ddframe.rdb.sharding.rewrite; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.ItemsToken; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.OffsetLimitToken; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.RowCountLimitToken; + import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.SQLContext; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.SQLToken; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.TableContext; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.TableToken; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.ItemsToken; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.OffsetLimitToken; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.RowCountLimitToken; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.SQLToken; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.TableToken; import java.util.Collections; import java.util.Comparator; diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/router/SQLRouteEngine.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/router/SQLRouteEngine.java index 66f68a8ceec081d42d1fada8e72f89853b3a8945..d0f852ddade8718c8fc3bd31fb56d8a9523076b1 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/router/SQLRouteEngine.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/router/SQLRouteEngine.java @@ -27,13 +27,13 @@ import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.ConditionContext import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.DeleteSQLContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.InsertSQLContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.LimitContext; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.OffsetLimitToken; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.RowCountLimitToken; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.SQLContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.SelectSQLContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.TableContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.context.UpdateSQLContext; import com.dangdang.ddframe.rdb.sharding.parsing.parser.exception.SQLParsingException; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.OffsetLimitToken; +import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.RowCountLimitToken; import com.dangdang.ddframe.rdb.sharding.rewrite.GenerateKeysUtils; import com.dangdang.ddframe.rdb.sharding.rewrite.SQLBuilder; import com.dangdang.ddframe.rdb.sharding.rewrite.SQLRewriteEngine;