Merge pull request #1478 from trrrrrys/fix/touch

Fix MySQL WriteRelationships query
authzed · Aug 7, 2023 · 082cc1b · 082cc1b
2 parents 8d02a63 + 476337b
commit 082cc1b
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 1 deletion.
diff --git a/internal/datastore/mysql/readwrite.go b/internal/datastore/mysql/readwrite.go
@@ -102,7 +102,10 @@ func (rwt *mysqlReadWriteTXN) WriteRelationships(ctx context.Context, mutations
 	}
 
 	if len(clauses) > 0 {
-		query, args, err := selectForUpdateQuery.Where(clauses).ToSql()
+		query, args, err := selectForUpdateQuery.
+			Where(clauses).
+			Where(sq.GtOrEq{colDeletedTxn: rwt.newTxnID}).
+			ToSql()
 		if err != nil {
 			return fmt.Errorf(errUnableToWriteRelationships, err)
 		}

diff --git a/pkg/datastore/test/datastore.go b/pkg/datastore/test/datastore.go
@@ -84,6 +84,8 @@ func AllWithExceptions(t *testing.T, tester DatastoreTester, except Categories)
 	t.Run("TestWriteDeleteWrite", func(t *testing.T) { WriteDeleteWriteTest(t, tester) })
 	t.Run("TestCreateAlreadyExisting", func(t *testing.T) { CreateAlreadyExistingTest(t, tester) })
 	t.Run("TestTouchAlreadyExisting", func(t *testing.T) { TouchAlreadyExistingTest(t, tester) })
+	t.Run("TestCreateDeleteTouchTest", func(t *testing.T) { CreateDeleteTouchTest(t, tester) })
+	t.Run("TestCreateTouchDeleteTouchTest", func(t *testing.T) { CreateTouchDeleteTouchTest(t, tester) })
 	t.Run("TestTouchAlreadyExistingCaveated", func(t *testing.T) { TouchAlreadyExistingCaveatedTest(t, tester) })
 
 	t.Run("TestMultipleReadsInRWT", func(t *testing.T) { MultipleReadsInRWTTest(t, tester) })

diff --git a/pkg/datastore/test/tuples.go b/pkg/datastore/test/tuples.go
@@ -598,6 +598,69 @@ func TouchAlreadyExistingTest(t *testing.T, tester DatastoreTester) {
 	ensureTuples(ctx, require, ds, tpl1, tpl2, tpl3)
 }
 
+// CreateDeleteTouchTest tests writing a relationship, deleting it, and then touching it.
+func CreateDeleteTouchTest(t *testing.T, tester DatastoreTester) {
+	require := require.New(t)
+
+	rawDS, err := tester.New(0, veryLargeGCInterval, veryLargeGCWindow, 1)
+	require.NoError(err)
+
+	ds, _ := testfixtures.StandardDatastoreWithData(rawDS, require)
+	ctx := context.Background()
+
+	tpl1 := makeTestTuple("foo", "tom")
+	tpl2 := makeTestTuple("foo", "sarah")
+
+	_, err = common.WriteTuples(ctx, ds, core.RelationTupleUpdate_CREATE, tpl1, tpl2)
+	require.NoError(err)
+
+	ensureTuples(ctx, require, ds, tpl1, tpl2)
+
+	_, err = common.WriteTuples(ctx, ds, core.RelationTupleUpdate_DELETE, tpl1, tpl2)
+	require.NoError(err)
+
+	ensureNotTuples(ctx, require, ds, tpl1, tpl2)
+
+	_, err = common.WriteTuples(ctx, ds, core.RelationTupleUpdate_TOUCH, tpl1, tpl2)
+	require.NoError(err)
+
+	ensureTuples(ctx, require, ds, tpl1, tpl2)
+}
+
+// CreateTouchDeleteTouchTest tests writing a relationship, touching it, deleting it, and then touching it.
+func CreateTouchDeleteTouchTest(t *testing.T, tester DatastoreTester) {
+	require := require.New(t)
+
+	rawDS, err := tester.New(0, veryLargeGCInterval, veryLargeGCWindow, 1)
+	require.NoError(err)
+
+	ds, _ := testfixtures.StandardDatastoreWithData(rawDS, require)
+	ctx := context.Background()
+
+	tpl1 := makeTestTuple("foo", "tom")
+	tpl2 := makeTestTuple("foo", "sarah")
+
+	_, err = common.WriteTuples(ctx, ds, core.RelationTupleUpdate_CREATE, tpl1, tpl2)
+	require.NoError(err)
+
+	ensureTuples(ctx, require, ds, tpl1, tpl2)
+
+	_, err = common.WriteTuples(ctx, ds, core.RelationTupleUpdate_TOUCH, tpl1, tpl2)
+	require.NoError(err)
+
+	ensureTuples(ctx, require, ds, tpl1, tpl2)
+
+	_, err = common.WriteTuples(ctx, ds, core.RelationTupleUpdate_DELETE, tpl1, tpl2)
+	require.NoError(err)
+
+	ensureNotTuples(ctx, require, ds, tpl1, tpl2)
+
+	_, err = common.WriteTuples(ctx, ds, core.RelationTupleUpdate_TOUCH, tpl1, tpl2)
+	require.NoError(err)
+
+	ensureTuples(ctx, require, ds, tpl1, tpl2)
+}
+
 // TouchAlreadyExistingCaveatedTest tests touching a relationship twice.
 func TouchAlreadyExistingCaveatedTest(t *testing.T, tester DatastoreTester) {
 	require := require.New(t)