Merge pull request #1736 from tuohai666/dev

#1722, fix parameters rewriting when single routing

sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/context/limit/Limit.java

@@ -65,10 +65,11 @@ public final class Limit {
      * @param parameters parameters
      * @param isFetchAll is fetch all data or not
      * @param databaseType database type
+     * @param isSingleRouting is single routing or not
      */
-    public void processParameters(final List<Object> parameters, final boolean isFetchAll, final DatabaseType databaseType) {
+    public void processParameters(final List<Object> parameters, final boolean isFetchAll, final DatabaseType databaseType, final boolean isSingleRouting) {
         fill(parameters);
-        rewrite(parameters, isFetchAll, databaseType);
+        rewrite(parameters, isFetchAll, databaseType, isSingleRouting);
     }
     
     private void fill(final List<Object> parameters) {
@@ -87,17 +88,17 @@ public final class Limit {
         }
     }
     
-    private void rewrite(final List<Object> parameters, final boolean isFetchAll, final DatabaseType databaseType) {
+    private void rewrite(final List<Object> parameters, final boolean isFetchAll, final DatabaseType databaseType, final boolean isSingleRouting) {
         int rewriteOffset = 0;
         int rewriteRowCount;
         if (isFetchAll) {
             rewriteRowCount = Integer.MAX_VALUE;
-        } else if (isNeedRewriteRowCount(databaseType)) {
+        } else if (isNeedRewriteRowCount(databaseType) && !isSingleRouting) {
             rewriteRowCount = null == rowCount ? -1 : getOffsetValue() + rowCount.getValue();
         } else {
             rewriteRowCount = rowCount.getValue();
         }
-        if (null != offset && offset.getIndex() > -1) {
+        if (null != offset && offset.getIndex() > -1 && !isSingleRouting) {
             parameters.set(offset.getIndex(), rewriteOffset);
         }
         if (null != rowCount && rowCount.getIndex() > -1) {

sharding-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java

@@ -101,11 +101,12 @@ public final class ParsingSQLRouter implements ShardingRouter {
             mergeShardingValues(shardingConditions);
         }
         RoutingResult routingResult = RoutingEngineFactory.newInstance(shardingRule, shardingMetaData.getDataSource(), sqlStatement, shardingConditions).route();
+        boolean isSingleRouting = routingResult.isSingleRouting();
         SQLRewriteEngine rewriteEngine = new SQLRewriteEngine(shardingRule, logicSQL, databaseType, sqlStatement, shardingConditions, parameters);
         if (sqlStatement instanceof SelectStatement && null != ((SelectStatement) sqlStatement).getLimit()) {
-            processLimit(parameters, (SelectStatement) sqlStatement);
+            processLimit(parameters, (SelectStatement) sqlStatement, isSingleRouting);
         }
-        SQLBuilder sqlBuilder = rewriteEngine.rewrite(routingResult.isSingleRouting());
+        SQLBuilder sqlBuilder = rewriteEngine.rewrite(isSingleRouting);
         for (TableUnit each : routingResult.getTableUnits().getTableUnits()) {
             result.getRouteUnits().add(new RouteUnit(each.getDataSourceName(), rewriteEngine.generateSQL(each, sqlBuilder, shardingMetaData.getDataSource())));
         }
@@ -246,8 +247,8 @@ public final class ParsingSQLRouter implements ShardingRouter {
         }
     }
     
-    private void processLimit(final List<Object> parameters, final SelectStatement selectStatement) {
+    private void processLimit(final List<Object> parameters, final SelectStatement selectStatement, final boolean isSingleRouting) {
         boolean isNeedFetchAll = (!selectStatement.getGroupByItems().isEmpty() || !selectStatement.getAggregationSelectItems().isEmpty()) && !selectStatement.isSameGroupByAndOrderByItems();
-        selectStatement.getLimit().processParameters(parameters, isNeedFetchAll, databaseType);
+        selectStatement.getLimit().processParameters(parameters, isNeedFetchAll, databaseType, isSingleRouting);
     }
 }