From 5192c4cac2289ae09a4b33dd4875bb39219e4390 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Wed, 21 Jul 2021 11:40:23 +0200
Subject: [PATCH] Fix #22925 by removing needless database writes (#23061)

The processor doesn't care whether the `ChangesetJob` is persisted or
not. Only the associations need to be in the database. So, let's avoid
hitting the database when we easily can.
---
 .../batches/background/bulk_processor_test.go | 28 +++++--------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/enterprise/internal/batches/background/bulk_processor_test.go b/enterprise/internal/batches/background/bulk_processor_test.go
index d0346dad1910..686337880e5f 100644
--- a/enterprise/internal/batches/background/bulk_processor_test.go
+++ b/enterprise/internal/batches/background/bulk_processor_test.go
@@ -49,15 +49,7 @@ func TestBulkProcessor(t *testing.T) {
 			tx:      bstore,
 			sourcer: sources.NewFakeSourcer(nil, fake),
 		}
-		job := &types.ChangesetJob{
-			JobType:     types.ChangesetJobTypeComment,
-			ChangesetID: changeset.ID,
-			UserID:      user.ID,
-		}
-		if err := bstore.CreateChangesetJob(ctx, job); err != nil {
-			t.Fatal(err)
-		}
-		job.JobType = types.ChangesetJobType("UNKNOWN")
+		job := &types.ChangesetJob{JobType: types.ChangesetJobType("UNKNOWN")}
 		err := bp.process(ctx, job)
 		if err == nil || err.Error() != `invalid job type "UNKNOWN"` {
 			t.Fatalf("unexpected error returned %s", err)
@@ -74,6 +66,7 @@ func TestBulkProcessor(t *testing.T) {
 			JobType:     types.ChangesetJobTypeComment,
 			ChangesetID: changeset.ID,
 			UserID:      user.ID,
+			Payload:     &btypes.ChangesetJobCommentPayload{},
 		}
 		if err := bstore.CreateChangesetJob(ctx, job); err != nil {
 			t.Fatal(err)
@@ -98,10 +91,9 @@ func TestBulkProcessor(t *testing.T) {
 			ChangesetID:   changeset.ID,
 			UserID:        user.ID,
 			BatchChangeID: batchChange.ID,
+			Payload:       &btypes.ChangesetJobDetachPayload{},
 		}
-		if err := bstore.CreateChangesetJob(ctx, job); err != nil {
-			t.Fatal(err)
-		}
+
 		err := bp.process(ctx, job)
 		if err != nil {
 			t.Fatal(err)
@@ -131,14 +123,12 @@ func TestBulkProcessor(t *testing.T) {
 			JobType:     types.ChangesetJobTypeReenqueue,
 			ChangesetID: changeset.ID,
 			UserID:      user.ID,
+			Payload:     &btypes.ChangesetJobReenqueuePayload{},
 		}
 		changeset.ReconcilerState = btypes.ReconcilerStateFailed
 		if err := bstore.UpdateChangeset(ctx, changeset); err != nil {
 			t.Fatal(err)
 		}
-		if err := bstore.CreateChangesetJob(ctx, job); err != nil {
-			t.Fatal(err)
-		}
 		err := bp.process(ctx, job)
 		if err != nil {
 			t.Fatal(err)
@@ -162,9 +152,7 @@ func TestBulkProcessor(t *testing.T) {
 			JobType:     types.ChangesetJobTypeMerge,
 			ChangesetID: changeset.ID,
 			UserID:      user.ID,
-		}
-		if err := bstore.CreateChangesetJob(ctx, job); err != nil {
-			t.Fatal(err)
+			Payload:     &btypes.ChangesetJobMergePayload{},
 		}
 		err := bp.process(ctx, job)
 		if err != nil {
@@ -185,9 +173,7 @@ func TestBulkProcessor(t *testing.T) {
 			JobType:     types.ChangesetJobTypeClose,
 			ChangesetID: changeset.ID,
 			UserID:      user.ID,
-		}
-		if err := bstore.CreateChangesetJob(ctx, job); err != nil {
-			t.Fatal(err)
+			Payload:     &btypes.ChangesetJobClosePayload{},
 		}
 		err := bp.process(ctx, job)
 		if err != nil {