Add support for multi table update with non literal value

go/test/endtoend/vtgate/queries/dml/dml_test.go

@@ -366,6 +366,37 @@ func TestMultiTargetUpdate(t *testing.T) {
 		`[[INT64(1) VARCHAR("a")] [INT64(2) VARCHAR("xyz")] [INT64(3) VARCHAR("a")] [INT64(4) VARCHAR("a")]]`)
 }
 
+// TestMultiTargetNonLiteralUpdate executed multi-target update queries with non-literal values.
+func TestMultiTargetNonLiteralUpdate(t *testing.T) {
+	utils.SkipIfBinaryIsBelowVersion(t, 20, "vtgate")
+
+	mcmp, closer := start(t)
+	defer closer()
+
+	// initial rows
+	mcmp.Exec("insert into order_tbl(region_id, oid, cust_no) values (1,1,4), (1,2,2), (2,3,5), (2,4,55)")
+	mcmp.Exec("insert into oevent_tbl(oid, ename) values (1,'a'), (2,'b'), (3,'a'), (4,'c')")
+
+	// multi target update
+	qr := mcmp.Exec(`update order_tbl o join oevent_tbl ev on o.oid = ev.oid set ev.ename = o.cust_no where ev.oid > 3`)
+	assert.EqualValues(t, 1, qr.RowsAffected)
+
+	// check rows
+	mcmp.AssertMatches(`select region_id, oid, cust_no from order_tbl order by oid`,
+		`[[INT64(1) INT64(1) INT64(4)] [INT64(1) INT64(2) INT64(2)] [INT64(2) INT64(3) INT64(5)] [INT64(2) INT64(4) INT64(55)]]`)
+	mcmp.AssertMatches(`select oid, ename from oevent_tbl order by oid`,
+		`[[INT64(1) VARCHAR("a")] [INT64(2) VARCHAR("b")] [INT64(3) VARCHAR("a")] [INT64(4) VARCHAR("55")]]`)
+
+	qr = mcmp.Exec(`update order_tbl o, oevent_tbl ev set ev.ename = 'xyz', o.oid = ev.oid + 40 where o.cust_no = ev.oid and ev.ename = 'b'`)
+	assert.EqualValues(t, 2, qr.RowsAffected)
+
+	// check rows
+	mcmp.AssertMatches(`select region_id, oid, cust_no from order_tbl order by oid, region_id`,
+		`[[INT64(1) INT64(1) INT64(4)] [INT64(2) INT64(3) INT64(5)] [INT64(2) INT64(4) INT64(55)] [INT64(1) INT64(42) INT64(2)]]`)
+	mcmp.AssertMatches(`select oid, ename from oevent_tbl order by oid`,
+		`[[INT64(1) VARCHAR("a")] [INT64(2) VARCHAR("xyz")] [INT64(3) VARCHAR("a")] [INT64(4) VARCHAR("55")]]`)
+}
+
 // TestDMLInUnique for update/delete statement using an IN clause with the Vindexes,
 // the query is correctly split according to the corresponding values in the IN list.
 func TestDMLInUnique(t *testing.T) {

go/vt/vtgate/engine/dml_with_input.go

@@ -39,6 +39,7 @@ type DMLWithInput struct {
 
 	DMLs       []Primitive
 	OutputCols [][]int
+	BVList     []map[string]int
 }
 
 func (dml *DMLWithInput) RouteType() string {
@@ -69,18 +70,16 @@ func (dml *DMLWithInput) TryExecute(ctx context.Context, vcursor VCursor, bindVa
 
 	var res *sqltypes.Result
 	for idx, prim := range dml.DMLs {
-		var bv *querypb.BindVariable
-		if len(dml.OutputCols[idx]) == 1 {
-			bv = getBVSingle(inputRes, dml.OutputCols[idx][0])
+		var qr *sqltypes.Result
+		if len(dml.BVList) == 0 || len(dml.BVList[idx]) == 0 {
+			qr, err = executeLiteralUpdate(ctx, vcursor, bindVars, prim, inputRes, dml.OutputCols[idx])
 		} else {
-			bv = getBVMulti(inputRes, dml.OutputCols[idx])
+			qr, err = executeNonLiteralUpdate(ctx, vcursor, bindVars, prim, inputRes, dml.OutputCols[idx], dml.BVList[idx])
 		}
-
-		bindVars[DmlVals] = bv
-		qr, err := vcursor.ExecutePrimitive(ctx, prim, bindVars, false)
 		if err != nil {
 			return nil, err
 		}
+
 		if res == nil {
 			res = qr
 		} else {
@@ -90,18 +89,30 @@ func (dml *DMLWithInput) TryExecute(ctx context.Context, vcursor VCursor, bindVa
 	return res, nil
 }
 
-func getBVSingle(res *sqltypes.Result, offset int) *querypb.BindVariable {
+func executeLiteralUpdate(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, prim Primitive, inputRes *sqltypes.Result, outputCols []int) (*sqltypes.Result, error) {
+	var bv *querypb.BindVariable
+	if len(outputCols) == 1 {
+		bv = getBVSingle(inputRes.Rows, outputCols[0])
+	} else {
+		bv = getBVMulti(inputRes.Rows, outputCols)
+	}
+
+	bindVars[DmlVals] = bv
+	return vcursor.ExecutePrimitive(ctx, prim, bindVars, false)
+}
+
+func getBVSingle(rows []sqltypes.Row, offset int) *querypb.BindVariable {
 	bv := &querypb.BindVariable{Type: querypb.Type_TUPLE}
-	for _, row := range res.Rows {
+	for _, row := range rows {
 		bv.Values = append(bv.Values, sqltypes.ValueToProto(row[offset]))
 	}
 	return bv
 }
 
-func getBVMulti(res *sqltypes.Result, offsets []int) *querypb.BindVariable {
+func getBVMulti(rows []sqltypes.Row, offsets []int) *querypb.BindVariable {
 	bv := &querypb.BindVariable{Type: querypb.Type_TUPLE}
 	outputVals := make([]sqltypes.Value, 0, len(offsets))
-	for _, row := range res.Rows {
+	for _, row := range rows {
 		for _, offset := range offsets {
 			outputVals = append(outputVals, row[offset])
 		}
@@ -111,6 +122,32 @@ func getBVMulti(res *sqltypes.Result, offsets []int) *querypb.BindVariable {
 	return bv
 }
 
+func executeNonLiteralUpdate(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, prim Primitive, inputRes *sqltypes.Result, outputCols []int, vars map[string]int) (qr *sqltypes.Result, err error) {
+	var res *sqltypes.Result
+	for _, row := range inputRes.Rows {
+		var bv *querypb.BindVariable
+		if len(outputCols) == 1 {
+			bv = getBVSingle([]sqltypes.Row{row}, outputCols[0])
+		} else {
+			bv = getBVMulti([]sqltypes.Row{row}, outputCols)
+		}
+		bindVars[DmlVals] = bv
+		for k, v := range vars {
+			bindVars[k] = sqltypes.ValueBindVariable(row[v])
+		}
+		qr, err = vcursor.ExecutePrimitive(ctx, prim, bindVars, false)
+		if err != nil {
+			return nil, err
+		}
+		if res == nil {
+			res = qr
+		} else {
+			res.RowsAffected += res.RowsAffected
+		}
+	}
+	return res, nil
+}
+
 // TryStreamExecute performs a streaming exec.
 func (dml *DMLWithInput) TryStreamExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool, callback func(*sqltypes.Result) error) error {
 	res, err := dml.TryExecute(ctx, vcursor, bindVars, wantfields)
@@ -133,6 +170,16 @@ func (dml *DMLWithInput) description() PrimitiveDescription {
 	other := map[string]any{
 		"Offset": offsets,
 	}
+	var bvList []string
+	for idx, vars := range dml.BVList {
+		if len(vars) == 0 {
+			continue
+		}
+		bvList = append(bvList, fmt.Sprintf("%d:%v", idx, vars))
+	}
+	if len(bvList) > 0 {
+		other["BindVars"] = bvList
+	}
 	return PrimitiveDescription{
 		OperatorType:     "DMLWithInput",
 		TargetTabletType: topodatapb.TabletType_PRIMARY,

go/vt/vtgate/planbuilder/dml_with_input.go

@@ -25,6 +25,7 @@ type dmlWithInput struct {
 	dmls  []logicalPlan
 
 	outputCols [][]int
+	bvList     []map[string]int
 }
 
 var _ logicalPlan = (*dmlWithInput)(nil)
@@ -40,5 +41,6 @@ func (d *dmlWithInput) Primitive() engine.Primitive {
 		DMLs:       dels,
 		Input:      inp,
 		OutputCols: d.outputCols,
+		BVList:     d.bvList,
 	}
 }

go/vt/vtgate/planbuilder/operator_transformers.go

@@ -100,6 +100,7 @@ func transformDMLWithInput(ctx *plancontext.PlanningContext, op *operators.DMLWi
 		input:      input,
 		dmls:       dmls,
 		outputCols: op.Offsets,
+		bvList:     op.BvList,
 	}, nil
 }
 

go/vt/vtgate/planbuilder/operators/aggregation_pushing.go

@@ -513,7 +513,7 @@ func splitGroupingToLeftAndRight(
 			rhs.addGrouping(ctx, groupBy)
 			columns.addRight(groupBy.Inner)
 		case deps.IsSolvedBy(lhs.tableID.Merge(rhs.tableID)):
-			jc := breakExpressionInLHSandRHSForApplyJoin(ctx, groupBy.Inner, lhs.tableID)
+			jc := breakExpressionInLHSandRHS(ctx, groupBy.Inner, lhs.tableID)
 			for _, lhsExpr := range jc.LHSExprs {
 				e := lhsExpr.Expr
 				lhs.addGrouping(ctx, NewGroupBy(e))

go/vt/vtgate/planbuilder/operators/apply_join.go

@@ -160,7 +160,7 @@ func (aj *ApplyJoin) AddJoinPredicate(ctx *plancontext.PlanningContext, expr sql
 	rhs := aj.RHS
 	predicates := sqlparser.SplitAndExpression(nil, expr)
 	for _, pred := range predicates {
-		col := breakExpressionInLHSandRHSForApplyJoin(ctx, pred, TableID(aj.LHS))
+		col := breakExpressionInLHSandRHS(ctx, pred, TableID(aj.LHS))
 		aj.JoinPredicates.add(col)
 		ctx.AddJoinPredicates(pred, col.RHSExpr)
 		rhs = rhs.AddPredicate(ctx, col.RHSExpr)
@@ -202,7 +202,7 @@ func (aj *ApplyJoin) getJoinColumnFor(ctx *plancontext.PlanningContext, orig *sq
 	case deps.IsSolvedBy(rhs):
 		col.RHSExpr = e
 	case deps.IsSolvedBy(both):
-		col = breakExpressionInLHSandRHSForApplyJoin(ctx, e, TableID(aj.LHS))
+		col = breakExpressionInLHSandRHS(ctx, e, TableID(aj.LHS))
 	default:
 		panic(vterrors.VT13002(sqlparser.String(e)))
 	}

go/vt/vtgate/planbuilder/operators/ast_to_op.go

@@ -136,7 +136,7 @@ func (jpc *joinPredicateCollector) inspectPredicate(
 	// then we can use this predicate to connect the subquery to the outer query
 	if !deps.IsSolvedBy(jpc.subqID) && deps.IsSolvedBy(jpc.totalID) {
 		jpc.predicates = append(jpc.predicates, predicate)
-		jc := breakExpressionInLHSandRHSForApplyJoin(ctx, predicate, jpc.outerID)
+		jc := breakExpressionInLHSandRHS(ctx, predicate, jpc.outerID)
 		jpc.joinColumns = append(jpc.joinColumns, jc)
 		pred = jc.RHSExpr
 	}

go/vt/vtgate/planbuilder/operators/delete.go

@@ -207,9 +207,9 @@ func createDeleteOpWithTarget(ctx *plancontext.PlanningContext, target semantics
 		Where:      sqlparser.NewWhere(sqlparser.WhereClause, compExpr),
 	}
 	return dmlOp{
-		createOperatorFromDelete(ctx, del),
-		vTbl,
-		cols,
+		op:   createOperatorFromDelete(ctx, del),
+		vTbl: vTbl,
+		cols: cols,
 	}
 }
 

go/vt/vtgate/planbuilder/operators/dml_planning.go

@@ -39,11 +39,12 @@ type TargetTable struct {
 	Name   sqlparser.TableName
 }
 
-// dmlOp stores intermediary value for Update/Delete Operator with the vindexes.Table for ordering.
+// dmlOp stores intermediary value for Update/Delete Operator with the vindexes. Table for ordering.
 type dmlOp struct {
-	op   Operator
-	vTbl *vindexes.Table
-	cols []*sqlparser.ColName
+	op      Operator
+	vTbl    *vindexes.Table
+	cols    []*sqlparser.ColName
+	updList updList
 }
 
 // sortDmlOps sort the operator based on sharding vindex type.

go/vt/vtgate/planbuilder/operators/dml_with_input.go

@@ -32,6 +32,9 @@ type DMLWithInput struct {
 	cols    [][]*sqlparser.ColName
 	Offsets [][]int
 
+	updList []updList
+	BvList  []map[string]int
+
 	noColumns
 	noPredicates
 }
@@ -86,6 +89,7 @@ func (d *DMLWithInput) GetOrdering(ctx *plancontext.PlanningContext) []OrderBy {
 }
 
 func (d *DMLWithInput) planOffsets(ctx *plancontext.PlanningContext) Operator {
+	// go through the primary key columns to get offset from the input
 	offsets := make([][]int, len(d.cols))
 	for idx, columns := range d.cols {
 		for _, col := range columns {
@@ -94,6 +98,22 @@ func (d *DMLWithInput) planOffsets(ctx *plancontext.PlanningContext) Operator {
 		}
 	}
 	d.Offsets = offsets
+
+	// go through the update list and get offset for input columns
+	bvList := make([]map[string]int, len(d.updList))
+	for idx, ul := range d.updList {
+		vars := make(map[string]int)
+		for _, updCol := range ul {
+			for _, bvExpr := range updCol.jc.LHSExprs {
+				offset := d.Source.AddColumn(ctx, true, false, aeWrap(bvExpr.Expr))
+				vars[bvExpr.Name] = offset
+			}
+		}
+		if len(vars) > 0 {
+			bvList[idx] = vars
+		}
+	}
+	d.BvList = bvList
 	return d
 }
 

go/vt/vtgate/planbuilder/operators/expressions.go

@@ -22,9 +22,9 @@ import (
 	"vitess.io/vitess/go/vt/vtgate/semantics"
 )
 
-// breakExpressionInLHSandRHSForApplyJoin takes an expression and
+// breakExpressionInLHSandRHS takes an expression and
 // extracts the parts that are coming from one of the sides into `ColName`s that are needed
-func breakExpressionInLHSandRHSForApplyJoin(
+func breakExpressionInLHSandRHS(
 	ctx *plancontext.PlanningContext,
 	expr sqlparser.Expr,
 	lhs semantics.TableSet,

go/vt/vtgate/planbuilder/operators/subquery.go

@@ -100,7 +100,7 @@ func (sq *SubQuery) GetJoinColumns(ctx *plancontext.PlanningContext, outer Opera
 	}
 	sq.outerID = outerID
 	mapper := func(in sqlparser.Expr) (applyJoinColumn, error) {
-		return breakExpressionInLHSandRHSForApplyJoin(ctx, in, outerID), nil
+		return breakExpressionInLHSandRHS(ctx, in, outerID), nil
 	}
 	joinPredicates, err := slice.MapWithError(sq.Predicates, mapper)
 	if err != nil {

go/vt/vtgate/planbuilder/operators/subquery_planning.go

@@ -263,7 +263,7 @@ func extractLHSExpr(
 	lhs semantics.TableSet,
 ) func(expr sqlparser.Expr) sqlparser.Expr {
 	return func(expr sqlparser.Expr) sqlparser.Expr {
-		col := breakExpressionInLHSandRHSForApplyJoin(ctx, expr, lhs)
+		col := breakExpressionInLHSandRHS(ctx, expr, lhs)
 		if col.IsPureLeft() {
 			panic(vterrors.VT13001("did not expect to find any predicates that do not need data from the inner here"))
 		}