remove remaining Exprs

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

go/test/endtoend/vtgate/queries/random/query_gen.go

@@ -395,7 +395,7 @@ func (sg *selectGenerator) createJoin(tables []tableT) {
 
 // returns 1-3 random expressions based on the last two elements of tables
 // tables should have at least two elements
-func (sg *selectGenerator) createJoinPredicates(tables []tableT) sqlparser.Exprs {
+func (sg *selectGenerator) createJoinPredicates(tables []tableT) []sqlparser.Expr {
 	if len(tables) < 2 {
 		log.Fatalf("tables has %d elements, needs at least 2", len(tables))
 	}
@@ -527,7 +527,7 @@ func (sg *selectGenerator) createHavingPredicates(grouping []column) {
 }
 
 // returns between minExprs and maxExprs random expressions using generators
-func (sg *selectGenerator) createRandomExprs(minExprs, maxExprs int, generators ...sqlparser.ExprGenerator) (predicates sqlparser.Exprs) {
+func (sg *selectGenerator) createRandomExprs(minExprs, maxExprs int, generators ...sqlparser.ExprGenerator) (predicates []sqlparser.Expr) {
 	if minExprs > maxExprs {
 		log.Fatalf("minExprs is greater than maxExprs; minExprs: %d, maxExprs: %d\n", minExprs, maxExprs)
 	} else if maxExprs <= 0 {

go/vt/sqlparser/analyzer_test.go

@@ -195,7 +195,7 @@ func TestAndExpressions(t *testing.T) {
 	}
 	testcases := []struct {
 		name           string
-		expressions    Exprs
+		expressions    []Expr
 		expectedOutput Expr
 	}{
 		{
@@ -204,7 +204,7 @@ func TestAndExpressions(t *testing.T) {
 			expectedOutput: nil,
 		}, {
 			name: "two equal inputs",
-			expressions: Exprs{
+			expressions: []Expr{
 				greaterThanExpr,
 				equalExpr,
 				equalExpr,
@@ -216,7 +216,7 @@ func TestAndExpressions(t *testing.T) {
 		},
 		{
 			name: "two equal inputs",
-			expressions: Exprs{
+			expressions: []Expr{
 				equalExpr,
 				equalExpr,
 			},

go/vt/sqlparser/ast.go

@@ -3566,7 +3566,9 @@ func (*JSONObjectAgg) AggrName() string   { return "json_objectagg" }
 
 // Exprs represents a list of value expressions.
 // It's not a valid expression because it's not parenthesized.
-type Exprs []Expr
+type Exprs struct {
+	Exprs []Expr
+}
 
 func (ValTuple) iColTuple()  {}
 func (*Subquery) iColTuple() {}

go/vt/sqlparser/ast_format.go

@@ -1312,9 +1312,9 @@ func (node *Where) Format(buf *TrackedBuffer) {
 }
 
 // Format formats the node.
-func (node Exprs) Format(buf *TrackedBuffer) {
+func (node *Exprs) Format(buf *TrackedBuffer) {
 	var prefix string
-	for _, n := range node {
+	for _, n := range node.Exprs {
 		buf.astPrintf(node, "%s%v", prefix, n)
 		prefix = ", "
 	}
@@ -1499,7 +1499,7 @@ func (node *ColName) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (node ValTuple) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "(%v)", Exprs(node))
+	buf.astPrintf(node, "(%v)", NewExprs(node))
 }
 
 // Format formats the node.

go/vt/sqlparser/ast_funcs.go

@@ -2354,7 +2354,7 @@ func ContainsAggregation(e SQLNode) bool {
 }
 
 // setFuncArgs sets the arguments for the aggregation function, while checking that there is only one argument
-func setFuncArgs(aggr AggrFunc, exprs Exprs, name string) error {
+func setFuncArgs(aggr AggrFunc, exprs []Expr, name string) error {
 	if len(exprs) != 1 {
 		return vterrors.VT03001(name)
 	}
@@ -3071,3 +3071,7 @@ func NewFuncExpr(name string, exprs ...Expr) *FuncExpr {
 		Exprs: exprs,
 	}
 }
+
+func NewExprs(exprs ...Expr) *Exprs {
+	return &Exprs{Exprs: exprs}
+}

go/vt/sqlparser/predicate_rewriting.go

@@ -213,7 +213,7 @@ func simplifyAnd(expr *AndExpr) (Expr, bool) {
 // And rewrite that to WHERE (a, b) IN ((1,11), (2,12), (3,13))
 func ExtractINFromOR(expr *OrExpr) []Expr {
 	var varNames []*ColName
-	var values []Exprs
+	var values [][]Expr
 	orSlice := orToSlice(expr)
 	for _, expr := range orSlice {
 		andSlice := andToSlice(expr)

go/vt/sqlparser/random_expr.go

@@ -246,7 +246,9 @@ func (g *Generator) randomAggregate(genConfig ExprGeneratorConfig) Expr {
 
 	options := []exprF{
 		func() Expr { return &CountStar{} },
-		func() Expr { return &Count{Args: Exprs{g.Expression(genConfig.anyTypeConfig())}, Distinct: isDistinct} },
+		func() Expr {
+			return &Count{Args: []Expr{g.Expression(genConfig.anyTypeConfig())}, Distinct: isDistinct}
+		},
 		func() Expr { return &Sum{Arg: g.Expression(genConfig), Distinct: isDistinct} },
 		func() Expr { return &Min{Arg: g.Expression(genConfig), Distinct: isDistinct} },
 		func() Expr { return &Max{Arg: g.Expression(genConfig), Distinct: isDistinct} },
@@ -269,7 +271,7 @@ func (g *Generator) booleanExpr(genConfig ExprGeneratorConfig) Expr {
 		func() Expr { return g.orExpr(genConfig) },
 		func() Expr { return g.comparison(genConfig.intTypeConfig()) },
 		func() Expr { return g.comparison(genConfig.stringTypeConfig()) },
-		//func() Expr { return g.comparison(genConfig) }, // this is not accepted by the parser
+		// func() Expr { return g.comparison(genConfig) }, // this is not accepted by the parser
 		func() Expr { return g.inExpr(genConfig) },
 		func() Expr { return g.existsExpr(genConfig) },
 		func() Expr { return g.between(genConfig.intTypeConfig()) },
@@ -374,7 +376,7 @@ func (g *Generator) randomBool(prob float32) bool {
 }
 
 func (g *Generator) intLiteral() Expr {
-	t := fmt.Sprintf("%d", rand.IntN(100)-rand.IntN(100)) //nolint SA4000
+	t := fmt.Sprintf("%d", rand.IntN(100)-rand.IntN(100)) // nolint SA4000
 
 	return NewIntLiteral(t)
 }

go/vt/vtgate/evalengine/expr_env_test.go

@@ -42,7 +42,7 @@ func TestExpressionEnvTypeOf(t *testing.T) {
 		Type:   sqltypes.Unknown,
 		Offset: 1,
 		Original: &sqlparser.Count{
-			Args: sqlparser.Exprs{
+			Args: []sqlparser.Expr{
 				sqlparser.NewColName("l_discount"),
 			},
 		},