Merge pull request #8359 from planetscale/gen4-fail-more

gen4: Fail all queries not handled well by gen4

go/vt/sqlparser/ast.go

@@ -201,9 +201,9 @@ type (
 		Distinct         bool
 		StraightJoinHint bool
 		SQLCalcFoundRows bool
+		From             []TableExpr
 		Comments         Comments
 		SelectExprs      SelectExprs
-		From             TableExprs
 		Where            *Where
 		GroupBy          GroupBy
 		Having           *Where

go/vt/sqlparser/ast_format.go

@@ -43,9 +43,16 @@ func (node *Select) Format(buf *TrackedBuffer) {
 		buf.WriteString(SQLCalcFoundRowsStr)
 	}
 
-	buf.astPrintf(node, "%v from %v%v%v%v%v%v%s%v",
-		node.SelectExprs,
-		node.From, node.Where,
+	buf.astPrintf(node, "%v from ", node.SelectExprs)
+
+	prefix := ""
+	for _, expr := range node.From {
+		buf.astPrintf(node, "%s%v", prefix, expr)
+		prefix = ", "
+	}
+
+	buf.astPrintf(node, "%v%v%v%v%v%s%v",
+		node.Where,
 		node.GroupBy, node.Having, node.OrderBy,
 		node.Limit, node.Lock.ToString(), node.Into)
 }

go/vt/sqlparser/ast_funcs.go

@@ -1339,3 +1339,15 @@ func handleUnaryMinus(expr Expr) Expr {
 func encodeSQLString(val string) string {
 	return sqltypes.EncodeStringSQL(val)
 }
+
+// ToString prints the list of table expressions as a string
+// To be used as an alternate for String for []TableExpr
+func ToString(exprs []TableExpr) string {
+	buf := NewTrackedBuffer(nil)
+	prefix := ""
+	for _, expr := range exprs {
+		buf.astPrintf(nil, "%s%v", prefix, expr)
+		prefix = ", "
+	}
+	return buf.String()
+}

go/vt/sqlparser/impossible_query.go

@@ -27,7 +27,13 @@ package sqlparser
 func FormatImpossibleQuery(buf *TrackedBuffer, node SQLNode) {
 	switch node := node.(type) {
 	case *Select:
-		buf.Myprintf("select %v from %v where 1 != 1", node.SelectExprs, node.From)
+		buf.Myprintf("select %v from ", node.SelectExprs)
+		var prefix string
+		for _, n := range node.From {
+			buf.Myprintf("%s%v", prefix, n)
+			prefix = ", "
+		}
+		buf.Myprintf(" where 1 != 1")
 		if node.GroupBy != nil {
 			node.GroupBy.Format(buf)
 		}

go/vt/vtctl/workflow/vexec/vexec.go

@@ -265,7 +265,7 @@ func extractTableName(stmt sqlparser.Statement) (string, error) {
 	case *sqlparser.Insert:
 		return sqlparser.String(stmt.Table), nil
 	case *sqlparser.Select:
-		return sqlparser.String(stmt.From), nil
+		return sqlparser.ToString(stmt.From), nil
 	}
 
 	return "", fmt.Errorf("%w: %+v", ErrUnsupportedQuery, sqlparser.String(stmt))

go/vt/vtgate/planbuilder/joinGen4.go

@@ -17,7 +17,9 @@ limitations under the License.
 package planbuilder
 
 import (
+	vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
 	"vitess.io/vitess/go/vt/sqlparser"
+	"vitess.io/vitess/go/vt/vterrors"
 	"vitess.io/vitess/go/vt/vtgate/engine"
 	"vitess.io/vitess/go/vt/vtgate/semantics"
 )
@@ -91,12 +93,17 @@ func (j *joinGen4) Primitive() engine.Primitive {
 
 // Inputs implements the logicalPlan interface
 func (j *joinGen4) Inputs() []logicalPlan {
-	panic("implement me")
+	return []logicalPlan{j.Left, j.Right}
 }
 
 // Rewrite implements the logicalPlan interface
 func (j *joinGen4) Rewrite(inputs ...logicalPlan) error {
-	panic("implement me")
+	if len(inputs) != 2 {
+		return vterrors.New(vtrpcpb.Code_INTERNAL, "wrong number of children")
+	}
+	j.Left = inputs[0]
+	j.Right = inputs[1]
+	return nil
 }
 
 // ContainsTables implements the logicalPlan interface

go/vt/vtgate/planbuilder/route_planning.go

@@ -261,13 +261,10 @@ func planHorizon(sel *sqlparser.Select, plan logicalPlan, semTable *semantics.Se
 		return plan, nil
 	}
 
-	// TODO real horizon planning to be done
-	if sel.Distinct {
-		return nil, semantics.Gen4NotSupportedF("DISTINCT")
-	}
-	if sel.GroupBy != nil {
-		return nil, semantics.Gen4NotSupportedF("GROUP BY")
+	if err := checkUnsupportedConstructs(sel); err != nil {
+		return nil, err
 	}
+
 	qp, err := createQPFromSelect(sel)
 	if err != nil {
 		return nil, err
@@ -278,6 +275,16 @@ func planHorizon(sel *sqlparser.Select, plan logicalPlan, semTable *semantics.Se
 		}
 	}
 
+	for _, expr := range qp.aggrExprs {
+		funcExpr, ok := expr.Expr.(*sqlparser.FuncExpr)
+		if !ok {
+			return nil, vterrors.New(vtrpcpb.Code_INTERNAL, "expected an aggregation here")
+		}
+		if funcExpr.Distinct {
+			return nil, semantics.Gen4NotSupportedF("distinct aggregation")
+		}
+	}
+
 	if len(qp.aggrExprs) > 0 {
 		plan, err = planAggregations(qp, plan, semTable)
 		if err != nil {
@@ -308,6 +315,19 @@ func createSingleShardRoutePlan(sel *sqlparser.Select, rb *route) {
 	}
 }
 
+func checkUnsupportedConstructs(sel *sqlparser.Select) error {
+	if sel.Distinct {
+		return semantics.Gen4NotSupportedF("DISTINCT")
+	}
+	if sel.GroupBy != nil {
+		return semantics.Gen4NotSupportedF("GROUP BY")
+	}
+	if sel.Having != nil {
+		return semantics.Gen4NotSupportedF("HAVING")
+	}
+	return nil
+}
+
 func pushJoinPredicate(exprs []sqlparser.Expr, tree joinTree, semTable *semantics.SemTable) (joinTree, error) {
 	switch node := tree.(type) {
 	case *routePlan:

go/vt/vtgate/planbuilder/symtab.go

@@ -172,7 +172,7 @@ func (st *symtab) AddTable(t *table) error {
 		st.singleRoute = nil
 	}
 	if _, ok := st.tables[t.alias]; ok {
-		return fmt.Errorf("duplicate symbol: %s", sqlparser.String(t.alias))
+		return vterrors.NewErrorf(vtrpcpb.Code_INVALID_ARGUMENT, vterrors.NonUniqTable, "Not unique table/alias: '%s'", t.alias.Name.String())
 	}
 	st.tables[t.alias] = t
 	st.tableNames = append(st.tableNames, t.alias)

go/vt/vtgate/planbuilder/testdata/aggr_cases.txt

@@ -1342,3 +1342,4 @@ Gen4 plan same as above
 # syntax error detected by planbuilder
 "select count(distinct *) from user"
 "syntax error: count(distinct *)"
+Gen4 plan same as above