rename orderedGroupby->aggregate

actiontech · Mar 25, 2019 · 8cd6b0f · 8cd6b0f
1 parent 5fef501
commit 8cd6b0f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/builder/BaseHandlerBuilder.java b/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/builder/BaseHandlerBuilder.java
@@ -10,7 +10,7 @@
 import com.actiontech.dble.backend.mysql.nio.handler.query.DMLResponseHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.query.impl.*;
 import com.actiontech.dble.backend.mysql.nio.handler.query.impl.groupby.DirectGroupByHandler;
-import com.actiontech.dble.backend.mysql.nio.handler.query.impl.groupby.OrderedGroupByHandler;
+import com.actiontech.dble.backend.mysql.nio.handler.query.impl.groupby.AggregateHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.query.impl.subquery.AllAnySubQueryHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.query.impl.subquery.InSubQueryHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.query.impl.subquery.SingleRowSubQueryHandler;
@@ -218,13 +218,13 @@ protected void buildCommon() {
                 } else {
                     OrderByHandler oh = new OrderByHandler(getSequenceId(), session, node.getGroupBys());
                     addHandler(oh);
-                    OrderedGroupByHandler gh = new OrderedGroupByHandler(getSequenceId(), session, node.getGroupBys(),
+                    AggregateHandler gh = new AggregateHandler(getSequenceId(), session, node.getGroupBys(),
                             sumRefs);
                     addHandler(gh);
                 }
             } else { // @bug 1052 canDirectGroupby condition we use
                 // directgroupby already
-                OrderedGroupByHandler gh = new OrderedGroupByHandler(getSequenceId(), session, node.getGroupBys(),
+                AggregateHandler gh = new AggregateHandler(getSequenceId(), session, node.getGroupBys(),
                         sumRefs);
                 addHandler(gh);
             }

diff --git a/...y/impl/groupby/OrderedGroupByHandler.java → .../query/impl/groupby/AggregateHandler.java b/...y/impl/groupby/OrderedGroupByHandler.java → .../query/impl/groupby/AggregateHandler.java
@@ -33,8 +33,8 @@
 /**
  * 1.executed the ordered result of group by 2. group by of Aggregator_distinct
  */
-public class OrderedGroupByHandler extends BaseDMLHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(OrderedGroupByHandler.class);
+public class AggregateHandler extends BaseDMLHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AggregateHandler.class);
     private List<Order> groupBys;
     private List<ItemSum> referredSumFunctions;
 
@@ -63,7 +63,7 @@ public class OrderedGroupByHandler extends BaseDMLHandler {
      * @param groupBys
      * @param referredSumFunctions
      */
-    public OrderedGroupByHandler(long id, NonBlockingSession session, List<Order> groupBys, List<ItemSum> referredSumFunctions) {
+    public AggregateHandler(long id, NonBlockingSession session, List<Order> groupBys, List<ItemSum> referredSumFunctions) {
         super(id, session);
         this.groupBys = groupBys;
         this.referredSumFunctions = referredSumFunctions;

diff --git a/src/main/java/com/actiontech/dble/plan/util/ComplexQueryPlanUtil.java b/src/main/java/com/actiontech/dble/plan/util/ComplexQueryPlanUtil.java
@@ -9,7 +9,7 @@
 import com.actiontech.dble.backend.mysql.nio.handler.query.DMLResponseHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.query.impl.*;
 import com.actiontech.dble.backend.mysql.nio.handler.query.impl.groupby.DirectGroupByHandler;
-import com.actiontech.dble.backend.mysql.nio.handler.query.impl.groupby.OrderedGroupByHandler;
+import com.actiontech.dble.backend.mysql.nio.handler.query.impl.groupby.AggregateHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.query.impl.join.JoinHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.query.impl.join.NotInHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.query.impl.subquery.AllAnySubQueryHandler;
@@ -167,8 +167,8 @@ private static String getAllNodesFromLeaf(DMLResponseHandler handler, Map<String
 
 
     private static String getTypeName(DMLResponseHandler handler) {
-        if (handler instanceof OrderedGroupByHandler) {
-            return "ORDERED_GROUP";
+        if (handler instanceof AggregateHandler) {
+            return "AGGREGATE";
         } else if (handler instanceof DistinctHandler) {
             return "DISTINCT";
         } else if (handler instanceof LimitHandler) {