test: add tests for the newly added support and fix a bug

Signed-off-by: Manan Gupta <manan@planetscale.com>
vitessio · Jan 31, 2024 · 71fd0e4 · 71fd0e4
1 parent bebdf6c
commit 71fd0e4
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 57 deletions.
diff --git a/go/test/endtoend/vtgate/foreignkey/fk_fuzz_test.go b/go/test/endtoend/vtgate/foreignkey/fk_fuzz_test.go
@@ -186,8 +186,12 @@ func (fz *fuzzer) generateSingleDeleteDMLQuery() string {
 	tableId := rand.Intn(len(fkTables))
 	idValue := 1 + rand.Intn(fz.maxValForId)
 	setVarFkChecksVal := fz.getSetVarFkChecksVal()
-	query := fmt.Sprintf("delete %vfrom %v where id = %v", setVarFkChecksVal, fkTables[tableId], idValue)
-	return query
+	delWithLimit := rand.Intn(2)
+	if delWithLimit == 0 {
+		return fmt.Sprintf("delete %vfrom %v where id = %v", setVarFkChecksVal, fkTables[tableId], idValue)
+	}
+	limitCount := rand.Intn(3)
+	return fmt.Sprintf("delete %vfrom %v order by id limit %v", setVarFkChecksVal, fkTables[tableId], limitCount)
 }
 
 // generateMultiDeleteDMLQuery generates a DELETE query using 2 tables from the parameters for the fuzzer.
@@ -604,61 +608,65 @@ func TestFkFuzzTest(t *testing.T) {
 		insertShare    int
 		deleteShare    int
 		updateShare    int
-	}{{
-		name:           "Single Thread - Only Inserts",
-		concurrency:    1,
-		timeForTesting: 5 * time.Second,
-		maxValForCol:   5,
-		maxValForId:    10,
-		insertShare:    100,
-		deleteShare:    0,
-		updateShare:    0,
-	}, {
-		name:           "Single Thread - Balanced Inserts and Deletes",
-		concurrency:    1,
-		timeForTesting: 5 * time.Second,
-		maxValForCol:   5,
-		maxValForId:    10,
-		insertShare:    50,
-		deleteShare:    50,
-		updateShare:    0,
-	}, {
-		name:           "Single Thread - Balanced Inserts and Updates",
-		concurrency:    1,
-		timeForTesting: 5 * time.Second,
-		maxValForCol:   5,
-		maxValForId:    10,
-		insertShare:    50,
-		deleteShare:    0,
-		updateShare:    50,
-	}, {
-		name:           "Single Thread - Balanced Inserts, Updates and Deletes",
-		concurrency:    1,
-		timeForTesting: 5 * time.Second,
-		maxValForCol:   5,
-		maxValForId:    10,
-		insertShare:    50,
-		deleteShare:    50,
-		updateShare:    50,
-	}, {
-		name:           "Multi Thread - Only Inserts",
-		concurrency:    30,
-		timeForTesting: 5 * time.Second,
-		maxValForCol:   5,
-		maxValForId:    30,
-		insertShare:    100,
-		deleteShare:    0,
-		updateShare:    0,
-	}, {
-		name:           "Multi Thread - Balanced Inserts, Updates and Deletes",
-		concurrency:    30,
-		timeForTesting: 5 * time.Second,
-		maxValForCol:   5,
-		maxValForId:    30,
-		insertShare:    50,
-		deleteShare:    50,
-		updateShare:    50,
-	}}
+	}{
+		//{
+		//	name:           "Single Thread - Only Inserts",
+		//	concurrency:    1,
+		//	timeForTesting: 5 * time.Second,
+		//	maxValForCol:   5,
+		//	maxValForId:    10,
+		//	insertShare:    100,
+		//	deleteShare:    0,
+		//	updateShare:    0,
+		//}, {
+		//	name:           "Single Thread - Balanced Inserts and Deletes",
+		//	concurrency:    1,
+		//	timeForTesting: 5 * time.Second,
+		//	maxValForCol:   5,
+		//	maxValForId:    10,
+		//	insertShare:    50,
+		//	deleteShare:    50,
+		//	updateShare:    0,
+		//}, {
+		//	name:           "Single Thread - Balanced Inserts and Updates",
+		//	concurrency:    1,
+		//	timeForTesting: 5 * time.Second,
+		//	maxValForCol:   5,
+		//	maxValForId:    10,
+		//	insertShare:    50,
+		//	deleteShare:    0,
+		//	updateShare:    50,
+		//},
+		{
+			name:           "Single Thread - Balanced Inserts, Updates and Deletes",
+			concurrency:    1,
+			timeForTesting: 5 * time.Second,
+			maxValForCol:   5,
+			maxValForId:    10,
+			insertShare:    50,
+			deleteShare:    50,
+			updateShare:    50,
+		},
+		//{
+		//	name:           "Multi Thread - Only Inserts",
+		//	concurrency:    30,
+		//	timeForTesting: 5 * time.Second,
+		//	maxValForCol:   5,
+		//	maxValForId:    30,
+		//	insertShare:    100,
+		//	deleteShare:    0,
+		//	updateShare:    0,
+		//}, {
+		//	name:           "Multi Thread - Balanced Inserts, Updates and Deletes",
+		//	concurrency:    30,
+		//	timeForTesting: 5 * time.Second,
+		//	maxValForCol:   5,
+		//	maxValForId:    30,
+		//	insertShare:    50,
+		//	deleteShare:    50,
+		//	updateShare:    50,
+		//},
+	}
 
 	valTrue := true
 	valFalse := false

diff --git a/go/test/endtoend/vtgate/foreignkey/fk_test.go b/go/test/endtoend/vtgate/foreignkey/fk_test.go
@@ -687,6 +687,36 @@ func TestFkScenarios(t *testing.T) {
 				"select * from fk_t17 order by id",
 				"select * from fk_t19 order by id",
 			},
+		}, {
+			name: "Delete with limit success",
+			dataQueries: []string{
+				"insert into fk_t15(id, col) values (1, 7), (2, 9)",
+				"insert into fk_t16(id, col) values (1, 7), (2, 9)",
+				"insert into fk_t17(id, col) values (1, 7)",
+				"insert into fk_t19(id, col) values (1, 7)",
+			},
+			dmlQuery: "delete from fk_t15 order by id limit 1",
+			assertionQueries: []string{
+				"select * from fk_t15 order by id",
+				"select * from fk_t16 order by id",
+				"select * from fk_t17 order by id",
+				"select * from fk_t19 order by id",
+			},
+		}, {
+			name: "Delete with limit 0 success",
+			dataQueries: []string{
+				"insert into fk_t15(id, col) values (1, 7), (2, 9)",
+				"insert into fk_t16(id, col) values (1, 7), (2, 9)",
+				"insert into fk_t17(id, col) values (1, 7)",
+				"insert into fk_t19(id, col) values (1, 7)",
+			},
+			dmlQuery: "delete from fk_t15 order by id limit 0",
+			assertionQueries: []string{
+				"select * from fk_t15 order by id",
+				"select * from fk_t16 order by id",
+				"select * from fk_t17 order by id",
+				"select * from fk_t19 order by id",
+			},
 		},
 	}
 

diff --git a/go/vt/vtgate/engine/delete_with_input.go b/go/vt/vtgate/engine/delete_with_input.go
@@ -62,6 +62,9 @@ func (del *DeleteWithInput) TryExecute(ctx context.Context, vcursor VCursor, bin
 	if err != nil {
 		return nil, err
 	}
+	if inputRes == nil || len(inputRes.Rows) == 0 {
+		return &sqltypes.Result{}, nil
+	}
 
 	var bv *querypb.BindVariable
 	if len(del.OutputCols) == 1 {