mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-01-09 14:20:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

rename orderedGroupby->aggregate

Browse Source
This commit is contained in:
yanhuqing
2019-03-25 13:43:00 +08:00
parent 5fef501dba
commit 8cd6b0feb4
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/actiontech/dble/backend/mysql/nio/handler/builder/BaseHandlerBuilder.java
View File

@@ -10,7 +10,7 @@ import com.actiontech.dble.backend.mysql.nio.handler.builder.sqlvisitor.GlobalVi
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 @@ public abstract class BaseHandlerBuilder {
} 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);
}

6
src/main/java/com/actiontech/dble/backend/mysql/nio/handler/query/impl/groupby/OrderedGroupByHandler.java → src/main/java/com/actiontech/dble/backend/mysql/nio/handler/query/impl/groupby/AggregateHandler.java
View File

@@ -33,8 +33,8 @@ import java.util.concurrent.locks.ReentrantLock;
/**
* 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;

6
src/main/java/com/actiontech/dble/plan/util/ComplexQueryPlanUtil.java
View File

@@ -9,7 +9,7 @@ import com.actiontech.dble.backend.mysql.nio.handler.builder.BaseHandlerBuilder;
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 @@ public final class ComplexQueryPlanUtil {
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) {