wip

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

go/vt/vtgate/planbuilder/operators/horizon_expanding.go

@@ -115,16 +115,19 @@ func expandSelectHorizon(ctx *plancontext.PlanningContext, horizon *Horizon, sel
 }
 
 func expandOrderBy(ctx *plancontext.PlanningContext, op Operator, qp *QueryProjection) Operator {
-	proj := newAliasedProjection(op)
 	var newOrder []OrderBy
 	sqc := &SubQueryBuilder{}
+	proj, ok := op.(*Projection)
 	for _, expr := range qp.OrderExprs {
 		newExpr, subqs := sqc.pullOutValueSubqueries(ctx, expr.SimplifiedExpr, TableID(op), false)
 		if newExpr == nil {
 			// no subqueries found, let's move on
 			newOrder = append(newOrder, expr)
 			continue
 		}
+		if !ok {
+			panic(vterrors.VT12001("subquery with aggregation in order by"))
+		}
 		proj.addSubqueryExpr(aeWrap(newExpr), newExpr, subqs...)
 		newOrder = append(newOrder, OrderBy{
 			Inner: &sqlparser.Order{
@@ -135,13 +138,9 @@ func expandOrderBy(ctx *plancontext.PlanningContext, op Operator, qp *QueryProje
 		})
 
 	}
-
-	if len(proj.Columns.GetColumns()) > 0 {
-		// if we had to project columns for the ordering,
-		// we need the projection as source
-		op = proj
+	if proj != nil {
+		proj.Source = sqc.getRootOperator(proj.Source, nil)
 	}
-
 	return &Ordering{
 		Source: op,
 		Order:  newOrder,

go/vt/vtgate/planbuilder/operators/query_planning.go

@@ -371,6 +371,15 @@ func tryPushOrdering(ctx *plancontext.PlanningContext, in *Ordering) (Operator,
 				return in, NoRewrite
 			}
 		}
+		ap, ok := src.Columns.(AliasedProjections)
+		if !ok {
+			return in, NoRewrite
+		}
+		for _, projExpr := range ap {
+			if projExpr.Info != nil {
+				return in, NoRewrite
+			}
+		}
 		return Swap(in, src, "push ordering under projection")
 	case *Aggregator:
 		if !src.QP.AlignGroupByAndOrderBy(ctx) && !overlaps(ctx, in.Order, src.Grouping) {
@@ -390,11 +399,12 @@ func tryPushOrdering(ctx *plancontext.PlanningContext, in *Ordering) (Operator,
 		return src, Rewrote("push ordering into outer side of subquery")
 	case *SubQuery:
 		outerTableID := TableID(src.Outer)
-		for _, order := range in.Order {
+		for idx, order := range in.Order {
 			deps := ctx.SemTable.RecursiveDeps(order.Inner.Expr)
 			if !deps.IsSolvedBy(outerTableID) {
 				return in, NoRewrite
 			}
+			in.Order[idx].SimplifiedExpr = rewriteColNameToArgument(ctx, order.SimplifiedExpr, src., src.originalSubquery)
 		}
 		src.Outer, in.Source = in, src.Outer
 		return src, Rewrote("push ordering into outer side of subquery")

go/vt/vtgate/planbuilder/testdata/onecase.json

@@ -1,7 +1,7 @@
 [
   {
     "comment": "Add your test case here for debugging and run go test -run=One.",
-    "query": "",
+    "query": "select 1 from user order by (select col from user)+(select col2 from user)",
     "plan": {
 
     }