fail aggregation inside of derived tables

Signed-off-by: Andres Taylor <[email protected]>

go/vt/vtgate/planbuilder/jointree_transformers.go

@@ -29,7 +29,7 @@ import (
 	"vitess.io/vitess/go/vt/vterrors"
 )
 
-func transformToLogicalPlan(tree joinTree, semTable *semantics.SemTable, processing func(plan logicalPlan, sel *sqlparser.Select) (logicalPlan, error)) (logicalPlan, error) {
+func transformToLogicalPlan(tree joinTree, semTable *semantics.SemTable, processing *postProcessor) (logicalPlan, error) {
 	switch n := tree.(type) {
 	case *routePlan:
 		return transformRoutePlan(n)
@@ -42,10 +42,12 @@ func transformToLogicalPlan(tree joinTree, semTable *semantics.SemTable, process
 		if err != nil {
 			return nil, err
 		}
-		plan, err = processing(plan, n.query)
+		processing.inDerived = true
+		plan, err = processing.planHorizon(plan, n.query)
 		if err != nil {
 			return nil, err
 		}
+		processing.inDerived = false
 
 		rb, isRoute := plan.(*route)
 		if !isRoute {
@@ -66,7 +68,7 @@ func transformToLogicalPlan(tree joinTree, semTable *semantics.SemTable, process
 	return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "[BUG] unknown type encountered: %T", tree)
 }
 
-func transformJoinPlan(n *joinPlan, semTable *semantics.SemTable, processing func(plan logicalPlan, sel *sqlparser.Select) (logicalPlan, error)) (logicalPlan, error) {
+func transformJoinPlan(n *joinPlan, semTable *semantics.SemTable, processing *postProcessor) (logicalPlan, error) {
 	lhs, err := transformToLogicalPlan(n.lhs, semTable, processing)
 	if err != nil {
 		return nil, err

go/vt/vtgate/planbuilder/route_planning.go

@@ -62,6 +62,34 @@ func gen4Planner(_ string) func(sqlparser.Statement, *sqlparser.ReservedVars, Co
 	}
 }
 
+type postProcessor struct {
+	inDerived bool
+	semTable  *semantics.SemTable
+	vschema   ContextVSchema
+}
+
+func (pp *postProcessor) planHorizon(plan logicalPlan, sel *sqlparser.Select) (logicalPlan, error) {
+	hp := horizonPlanning{
+		sel:       sel,
+		plan:      plan,
+		semTable:  pp.semTable,
+		vschema:   pp.vschema,
+		inDerived: pp.inDerived,
+	}
+
+	plan, err := hp.planHorizon()
+	if err != nil {
+		return nil, err
+	}
+
+	plan, err = planLimit(sel.Limit, plan)
+	if err != nil {
+		return nil, err
+	}
+	return plan, nil
+
+}
+
 func newBuildSelectPlan(sel *sqlparser.Select, reservedVars *sqlparser.ReservedVars, vschema ContextVSchema) (logicalPlan, error) {
 	directives := sqlparser.ExtractCommentDirectives(sel.Comments)
 	if len(directives) > 0 {
@@ -91,32 +119,16 @@ func newBuildSelectPlan(sel *sqlparser.Select, reservedVars *sqlparser.ReservedV
 		return nil, err
 	}
 
-	postProcessing := func(plan logicalPlan, sel *sqlparser.Select) (logicalPlan, error) {
-		hp := horizonPlanning{
-			sel:      sel,
-			plan:     plan,
-			semTable: semTable,
-			vschema:  vschema,
-		}
-
-		plan, err = hp.planHorizon()
-		if err != nil {
-			return nil, err
-		}
-
-		plan, err = planLimit(sel.Limit, plan)
-		if err != nil {
-			return nil, err
-		}
-		return plan, nil
+	postProcessing := &postProcessor{
+		semTable:  semTable,
+		vschema:   vschema,
 	}
-
 	plan, err := transformToLogicalPlan(tree, semTable, postProcessing)
 	if err != nil {
 		return nil, err
 	}
 
-	plan, err = postProcessing(plan, sel)
+	plan, err = postProcessing.planHorizon(plan, sel)
 	if err != nil {
 		return nil, err
 	}
@@ -201,6 +213,7 @@ type horizonPlanning struct {
 	semTable        *semantics.SemTable
 	vschema         ContextVSchema
 	qp              *abstract.QueryProjection
+	inDerived       bool
 	needsTruncation bool
 	vtgateGrouping  bool
 }
@@ -211,6 +224,14 @@ func (hp *horizonPlanning) planHorizon() (logicalPlan, error) {
 		return nil, hp.semTable.ProjectionErr
 	}
 
+	if hp.inDerived {
+		for _, expr := range hp.sel.SelectExprs {
+			if sqlparser.ContainsAggregation(expr) {
+				return nil, semantics.Gen4NotSupportedF("aggregation inside of derived table")
+			}
+		}
+	}
+
 	if ok && rb.isSingleShard() {
 		createSingleShardRoutePlan(hp.sel, rb)
 		return hp.plan, nil