diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/OffsetLimitToken.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/OffsetLimitToken.java index 7e863b0266f1af72830b27197240f386e123799b..2b64d6502c8aa571d7d1fc5de55c596208b915ab 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/OffsetLimitToken.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/OffsetLimitToken.java @@ -29,8 +29,6 @@ import lombok.RequiredArgsConstructor; @Getter public final class OffsetLimitToken implements SQLToken { - public static final String OFFSET_NAME = "limit_offset"; - private final int beginPosition; private final int offset; diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/RowCountLimitToken.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/RowCountLimitToken.java index 38c22fb3c5663d6f7a025ab3381d79f8e152bb7a..f954020aef79a657970dfdf74544fca135bfa10e 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/RowCountLimitToken.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/token/RowCountLimitToken.java @@ -29,8 +29,6 @@ import lombok.RequiredArgsConstructor; @Getter public final class RowCountLimitToken implements SQLToken { - public static final String COUNT_NAME = "limit_count"; - private final int beginPosition; private final int rowCount; diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/SQLBuilderToken.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/SQLBuilderToken.java index 1737cecad448601cf98098a51a37960bb6be9da7..a0aa6b2ed8b281f1338a00ca0c4535602f66c638 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/SQLBuilderToken.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/rewrite/SQLBuilderToken.java @@ -3,7 +3,6 @@ package com.dangdang.ddframe.rdb.sharding.rewrite; import com.google.common.base.Joiner; import lombok.AllArgsConstructor; import lombok.Getter; -import lombok.RequiredArgsConstructor; import lombok.Setter; /** @@ -12,7 +11,6 @@ import lombok.Setter; * @author zhangliang */ @AllArgsConstructor -@RequiredArgsConstructor @Getter @Setter public final class SQLBuilderToken { 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 a5fe8d27b5ca37973b0f2f2573c2e4dc04d7be2c..656f86db4ed6c2c4fcf057584b583caaa17d9064 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 @@ -120,16 +120,14 @@ public final class SQLRewriteEngine { } private void appendLimitRowCount(final SQLBuilder sqlBuilder, final RowCountLimitToken rowCountLimitToken, final int count, final List sqlTokens, final boolean isRewrite) { - String rowCount = isRewrite ? String.valueOf(rowCountLimitToken.getRowCount() + limit.getOffset()) : String.valueOf(rowCountLimitToken.getRowCount()); - sqlBuilder.append(new SQLBuilderToken(RowCountLimitToken.COUNT_NAME, rowCount)); + sqlBuilder.append(isRewrite ? String.valueOf(rowCountLimitToken.getRowCount() + limit.getOffset()) : String.valueOf(rowCountLimitToken.getRowCount())); int beginPosition = rowCountLimitToken.getBeginPosition() + String.valueOf(rowCountLimitToken.getRowCount()).length(); int endPosition = sqlTokens.size() - 1 == count ? originalSQL.length() : sqlTokens.get(count + 1).getBeginPosition(); sqlBuilder.append(originalSQL.substring(beginPosition, endPosition)); } private void appendLimitOffsetToken(final SQLBuilder sqlBuilder, final OffsetLimitToken offsetLimitToken, final int count, final List sqlTokens, final boolean isRewrite) { - String offset = isRewrite ? "0" : String.valueOf(offsetLimitToken.getOffset()); - sqlBuilder.append(new SQLBuilderToken(OffsetLimitToken.OFFSET_NAME, offset)); + sqlBuilder.append(isRewrite ? "0" : String.valueOf(offsetLimitToken.getOffset())); int beginPosition = offsetLimitToken.getBeginPosition() + String.valueOf(offsetLimitToken.getOffset()).length(); int endPosition = sqlTokens.size() - 1 == count ? originalSQL.length() : sqlTokens.get(count + 1).getBeginPosition(); sqlBuilder.append(originalSQL.substring(beginPosition, endPosition));