planner: support cross shard DELETE with LIMIT/ORDER BY

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

@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"vitess.io/vitess/go/test/endtoend/utils"
 )
@@ -78,3 +79,64 @@ func TestMultiTableDelete(t *testing.T) {
 	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("c")]]`)
 }
+
+// TestDeleteWithLimit executed delete queries with limit
+func TestDeleteWithLimit(t *testing.T) {
+	utils.SkipIfBinaryIsBelowVersion(t, 19, "vtgate")
+
+	mcmp, closer := start(t)
+	defer closer()
+
+	// initial rows
+	mcmp.Exec("insert into s_tbl(id, num) values (1,10), (2,10), (3,10), (4,20), (5,5), (6,15), (7,17), (8,80)")
+	mcmp.Exec("insert into order_tbl(region_id, oid, cust_no) values (1,1,4), (1,2,2), (2,3,5), (2,4,55)")
+
+	// check rows
+	mcmp.AssertMatches(`select id, num from s_tbl order by id`,
+		`[[INT64(1) INT64(10)] [INT64(2) INT64(10)] [INT64(3) INT64(10)] [INT64(4) INT64(20)] [INT64(5) INT64(5)] [INT64(6) INT64(15)] [INT64(7) INT64(17)] [INT64(8) INT64(80)]]`)
+	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)]]`)
+
+	// delete with limit
+	qr := mcmp.Exec(`delete from s_tbl order by num, id limit 3`)
+	require.EqualValues(t, 3, qr.RowsAffected)
+
+	qr = mcmp.Exec(`delete from order_tbl where region_id = 1 limit 1`)
+	require.EqualValues(t, 1, qr.RowsAffected)
+
+	// check rows
+	mcmp.AssertMatches(`select id, num from s_tbl order by id`,
+		`[[INT64(3) INT64(10)] [INT64(4) INT64(20)] [INT64(6) INT64(15)] [INT64(7) INT64(17)] [INT64(8) INT64(80)]]`)
+	// 2 rows matches but limit is 1, so any one of the row can remain in table.
+	mcmp.AssertMatchesAnyNoCompare(`select region_id, oid, cust_no from order_tbl order by oid`,
+		`[[INT64(1) INT64(2) INT64(2)] [INT64(2) INT64(3) INT64(5)] [INT64(2) INT64(4) INT64(55)]]`,
+		`[[INT64(1) INT64(1) INT64(4)] [INT64(2) INT64(3) INT64(5)] [INT64(2) INT64(4) INT64(55)]]`)
+
+	// delete with limit
+	qr = mcmp.Exec(`delete from s_tbl where num < 20 limit 2`)
+	require.EqualValues(t, 2, qr.RowsAffected)
+
+	qr = mcmp.Exec(`delete from order_tbl limit 5`)
+	require.EqualValues(t, 3, qr.RowsAffected)
+
+	// check rows
+	// 3 rows matches `num < 20` but limit is 2 so any one of them can remain in the table.
+	mcmp.AssertMatchesAnyNoCompare(`select id, num from s_tbl order by id`,
+		`[[INT64(4) INT64(20)] [INT64(7) INT64(17)] [INT64(8) INT64(80)]]`,
+		`[[INT64(3) INT64(10)] [INT64(4) INT64(20)] [INT64(8) INT64(80)]]`,
+		`[[INT64(4) INT64(20)] [INT64(6) INT64(15)] [INT64(8) INT64(80)]]`)
+	mcmp.AssertMatches(`select region_id, oid, cust_no from order_tbl order by oid`,
+		`[]`)
+
+	// remove all rows
+	mcmp.Exec(`delete from s_tbl`)
+	mcmp.Exec(`delete from order_tbl limit 5`)
+
+	// try with limit again on empty table.
+	qr = mcmp.Exec(`delete from s_tbl where num < 20 limit 2`)
+	require.EqualValues(t, 0, qr.RowsAffected)
+
+	qr = mcmp.Exec(`delete from order_tbl limit 5`)
+	require.EqualValues(t, 0, qr.RowsAffected)
+
+}

go/vt/vtgate/engine/delete_with_input.go

@@ -0,0 +1,121 @@
+/*
+Copyright 2023 The Vitess Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package engine
+
+import (
+	"context"
+
+	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
+	"vitess.io/vitess/go/vt/vterrors"
+
+	"vitess.io/vitess/go/sqltypes"
+	querypb "vitess.io/vitess/go/vt/proto/query"
+)
+
+var _ Primitive = (*DeleteWithInput)(nil)
+
+const DmVals = "dm_vals"
+
+// DeleteWithInput represents the instructions to perform a delete operation based on the input result.
+type DeleteWithInput struct {
+	Delete Primitive
+	Input  Primitive
+
+	OutputCols []int
+
+	txNeeded
+}
+
+func (del *DeleteWithInput) RouteType() string {
+	return "DeleteWithInput"
+}
+
+func (del *DeleteWithInput) GetKeyspaceName() string {
+	return del.Input.GetKeyspaceName()
+}
+
+func (del *DeleteWithInput) GetTableName() string {
+	return del.Input.GetTableName()
+}
+
+func (del *DeleteWithInput) Inputs() ([]Primitive, []map[string]any) {
+	return []Primitive{del.Input, del.Delete}, nil
+}
+
+// TryExecute performs a non-streaming exec.
+func (del *DeleteWithInput) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, _ bool) (*sqltypes.Result, error) {
+	inputRes, err := vcursor.ExecutePrimitive(ctx, del.Input, bindVars, false)
+	if err != nil {
+		return nil, err
+	}
+
+	var bv *querypb.BindVariable
+	if len(del.OutputCols) == 1 {
+		bv = getBVSingle(inputRes, del.OutputCols[0])
+	} else {
+		bv = getBVMulti(inputRes, del.OutputCols)
+	}
+
+	bindVars[DmVals] = bv
+	return vcursor.ExecutePrimitive(ctx, del.Delete, bindVars, false)
+}
+
+func getBVSingle(res *sqltypes.Result, offset int) *querypb.BindVariable {
+	bv := &querypb.BindVariable{Type: querypb.Type_TUPLE}
+	for _, row := range res.Rows {
+		bv.Values = append(bv.Values, sqltypes.ValueToProto(row[offset]))
+	}
+	return bv
+}
+
+func getBVMulti(res *sqltypes.Result, offsets []int) *querypb.BindVariable {
+	bv := &querypb.BindVariable{Type: querypb.Type_TUPLE}
+	outputVals := make([]sqltypes.Value, 0, len(offsets))
+	for _, row := range res.Rows {
+		for _, offset := range offsets {
+			outputVals = append(outputVals, row[offset])
+		}
+		bv.Values = append(bv.Values, sqltypes.TupleToProto(outputVals))
+		outputVals = outputVals[:0]
+	}
+	return bv
+}
+
+// TryStreamExecute performs a streaming exec.
+func (del *DeleteWithInput) TryStreamExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool, callback func(*sqltypes.Result) error) error {
+	res, err := del.TryExecute(ctx, vcursor, bindVars, wantfields)
+	if err != nil {
+		return err
+	}
+	return callback(res)
+}
+
+// GetFields fetches the field info.
+func (del *DeleteWithInput) GetFields(context.Context, VCursor, map[string]*querypb.BindVariable) (*sqltypes.Result, error) {
+	return nil, vterrors.VT13001("unreachable code for MULTI DELETE")
+}
+
+func (del *DeleteWithInput) description() PrimitiveDescription {
+	other := map[string]any{
+		"Offset": del.OutputCols,
+	}
+	return PrimitiveDescription{
+		OperatorType:     "DeleteWithInput",
+		TargetTabletType: topodatapb.TabletType_PRIMARY,
+		Other:            other,
+	}
+}