storage/batcheval: test requests that modify the AbortSpan

Up until this point, we had no testing around this. For instance, not a single test would catch it if we removed the deletion path from SetAbortSpan.
cockroachdb · Nov 26, 2019 · 7a31ef2 · 7a31ef2
1 parent 6b43bda
commit 7a31ef2
Show file tree

Hide file tree

Showing 2 changed files with 705 additions and 2 deletions.
diff --git a/pkg/storage/batcheval/cmd_resolve_intent_test.go b/pkg/storage/batcheval/cmd_resolve_intent_test.go
@@ -200,7 +200,7 @@ func TestDeclareKeysResolveIntent(t *testing.T) {
 				rir.Key = ri.Key
 				rir.EndKey = roachpb.Key("c")
 
-				ac := abortspan.New(desc.RangeID)
+				as := abortspan.New(desc.RangeID)
 
 				var spans spanset.SpanSet
 				batch := engine.NewBatch()
@@ -211,7 +211,7 @@ func TestDeclareKeysResolveIntent(t *testing.T) {
 				h.RangeID = desc.RangeID
 
 				cArgs := CommandArgs{Header: h}
-				cArgs.EvalCtx = &mockEvalCtx{abortSpan: ac}
+				cArgs.EvalCtx = &mockEvalCtx{abortSpan: as}
 
 				if !ranged {
 					cArgs.Args = &ri