Merge pull request #8254 from planetscale/gen4-more-opcodes

gen4: plan more opcodes
vitessio · Jun 3, 2021 · 2988268 · 2988268
2 parents 236ddc4 + 2c6c50a
commit 2988268
Show file tree

Hide file tree

Showing 17 changed files with 246 additions and 80 deletions.
diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go
@@ -1794,8 +1794,8 @@ type (
 
 	// IsExpr represents an IS ... or an IS NOT ... expression.
 	IsExpr struct {
-		Operator IsExprOperator
-		Expr     Expr
+		Left  Expr
+		Right IsExprOperator
 	}
 
 	// IsExprOperator is an enum for IsExpr.Operator

diff --git a/go/vt/sqlparser/ast_clone.go b/go/vt/sqlparser/ast_clone.go
diff --git a/go/vt/sqlparser/ast_equals.go b/go/vt/sqlparser/ast_equals.go
diff --git a/go/vt/sqlparser/ast_format.go b/go/vt/sqlparser/ast_format.go
@@ -960,7 +960,7 @@ func (node *RangeCond) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (node *IsExpr) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "%v %s", node.Expr, node.Operator.ToString())
+	buf.astPrintf(node, "%v %s", node.Left, node.Right.ToString())
 }
 
 // Format formats the node.

diff --git a/go/vt/sqlparser/ast_format_fast.go b/go/vt/sqlparser/ast_format_fast.go
diff --git a/go/vt/sqlparser/ast_rewrite.go b/go/vt/sqlparser/ast_rewrite.go
diff --git a/go/vt/sqlparser/ast_visit.go b/go/vt/sqlparser/ast_visit.go
diff --git a/go/vt/sqlparser/cached_size.go b/go/vt/sqlparser/cached_size.go
diff --git a/go/vt/sqlparser/precedence_test.go b/go/vt/sqlparser/precedence_test.go
@@ -35,7 +35,7 @@ func readable(node Expr) string {
 	case *BinaryExpr:
 		return fmt.Sprintf("(%s %s %s)", readable(node.Left), node.Operator.ToString(), readable(node.Right))
 	case *IsExpr:
-		return fmt.Sprintf("(%s %s)", readable(node.Expr), node.Operator.ToString())
+		return fmt.Sprintf("(%s %s)", readable(node.Left), node.Right.ToString())
 	default:
 		return String(node)
 	}

diff --git a/go/vt/sqlparser/random_expr.go b/go/vt/sqlparser/random_expr.go
@@ -314,7 +314,7 @@ func (g *generator) isExpr() Expr {
 	ops := []IsExprOperator{IsNullOp, IsNotNullOp, IsTrueOp, IsNotTrueOp, IsFalseOp, IsNotFalseOp}
 
 	return &IsExpr{
-		Operator: ops[g.r.Intn(len(ops))],
-		Expr:     g.booleanExpr(),
+		Right: ops[g.r.Intn(len(ops))],
+		Left:  g.booleanExpr(),
 	}
 }
diff --git a/go/vt/sqlparser/sql.go b/go/vt/sqlparser/sql.go
diff --git a/go/vt/sqlparser/sql.y b/go/vt/sqlparser/sql.y
@@ -3513,7 +3513,7 @@ expression:
   }
 | expression IS is_suffix
   {
-    $$ = &IsExpr{Operator: $3, Expr: $1}
+    $$ = &IsExpr{Left: $1, Right: $3}
   }
 | value_expression
   {

diff --git a/go/vt/vtgate/planbuilder/route.go b/go/vt/vtgate/planbuilder/route.go
@@ -668,11 +668,11 @@ func (rb *route) computeEqualPlan(pb *primitiveBuilder, comparison *sqlparser.Co
 // computeIS computes the plan for an equality constraint.
 func (rb *route) computeISPlan(pb *primitiveBuilder, comparison *sqlparser.IsExpr) (opcode engine.RouteOpcode, vindex vindexes.SingleColumn, expr sqlparser.Expr) {
 	// we only handle IS NULL correct. IsExpr can contain other expressions as well
-	if comparison.Operator != sqlparser.IsNullOp {
+	if comparison.Right != sqlparser.IsNullOp {
 		return engine.SelectScatter, nil, nil
 	}
 
-	vindex = pb.st.Vindex(comparison.Expr, rb)
+	vindex = pb.st.Vindex(comparison.Left, rb)
 	// fallback to scatter gather if there is no vindex
 	if vindex == nil {
 		return engine.SelectScatter, nil, nil