refine boolean logic

pingcap · Mar 10, 2021 · 8a4c0e1 · 8a4c0e1
1 parent e8e85c2
commit 8a4c0e1
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/planner/core/exhaust_physical_plans.go b/planner/core/exhaust_physical_plans.go
@@ -2324,17 +2324,13 @@ func (la *LogicalAggregation) getHashAggs(prop *property.PhysicalProperty) []Phy
 	if la.ctx.GetSessionVars().AllowBCJ {
 		taskTypes = append(taskTypes, property.CopTiFlashLocalReadTaskType)
 	}
-	if la.ctx.GetSessionVars().AllowMPPExecution && la.checkCanPushDownToMPP() {
+	canPushDownToMPP := la.ctx.GetSessionVars().AllowMPPExecution && la.checkCanPushDownToMPP()
+	if canPushDownToMPP {
 		taskTypes = append(taskTypes, property.MppTaskType)
 	}
 	if la.HasDistinct() {
-		// TODO: remove AllowDistinctAggPushDown after the cost estimation of distinct pushdown is implemented.
-		// If AllowDistinctAggPushDown is set to true, we should not consider RootTask.
-		considerRootTask := !la.ctx.GetSessionVars().AllowDistinctAggPushDown
-		// If aggregation can be pushed down to MPP, we should not consider RootTask.
-		considerRootTask = considerRootTask && !(la.ctx.GetSessionVars().AllowMPPExecution && la.checkCanPushDownToMPP())
-
-		if considerRootTask {
+		// TODO: remove after the cost estimation of distinct pushdown is implemented.
+		if !la.ctx.GetSessionVars().AllowDistinctAggPushDown && !canPushDownToMPP {
 			taskTypes = []property.TaskType{property.RootTaskType}
 		}
 	} else if !la.aggHints.preferAggToCop {