to AppendOrderByItems or not

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/optimizer/select/SelectOptimizer.java

@@ -49,6 +49,7 @@ public final class SelectOptimizer implements SQLStatementOptimizer {
     
     @Override
     public void optimize(final SQLStatement sqlStatement, final ShardingTableMetaData shardingTableMetaData) {
+        
         appendDerivedColumns((SelectStatement) sqlStatement, shardingTableMetaData);
         appendDerivedOrderBy((SelectStatement) sqlStatement);
         addSubqueryCondition(sqlStatement);
@@ -170,6 +171,7 @@ public final class SelectOptimizer implements SQLStatementOptimizer {
     private void appendDerivedOrderBy(final SelectStatement selectStatement) {
         if (!selectStatement.getGroupByItems().isEmpty() && selectStatement.getOrderByItems().isEmpty()) {
             selectStatement.getOrderByItems().addAll(selectStatement.getGroupByItems());
+            selectStatement.setToAppendOrderByItems(true);
         }
     }
     

sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/sql/statement/dml/SelectStatement.java

@@ -61,6 +61,8 @@ public final class SelectStatement extends DQLStatement {
     
     private final List<OrderByItemSegment> orderByItems = new LinkedList<>();
     
+    private boolean toAppendOrderByItems;
+    
     private boolean containStar;
     
     private int firstSelectItemStartIndex;
@@ -69,7 +71,7 @@ public final class SelectStatement extends DQLStatement {
     
     private int groupByLastIndex;
     
-    private LimitSegment limit;
+    private LimitSegment limit; 
     
     private SelectStatement parentStatement;
     

sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/generator/OrderByTokenGenerator.java

@@ -35,7 +35,7 @@ public final class OrderByTokenGenerator implements OptionalSQLTokenGenerator<Sh
         if (!(sqlStatement instanceof SelectStatement)) {
             return Optional.absent();
         }
-        if (!((SelectStatement) sqlStatement).getGroupByItems().isEmpty() && ((SelectStatement) sqlStatement).getOrderByItems().isEmpty()) {
+        if (((SelectStatement) sqlStatement).isToAppendOrderByItems()) {
             return Optional.of(new OrderByToken(((SelectStatement) sqlStatement).getGroupByLastIndex() + 1));
         }
         return Optional.absent();