Merge #71053

71053: kvserver: QueryResolvedTimestamp should declare lock table keys r=shralex a=shralex Release note: None Co-authored-by: shralex <[email protected]>
cockroachdb · Oct 4, 2021 · 0dcfa15 · 0dcfa15
2 parents 95affc1 + e6dd076
commit 0dcfa15
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/pkg/kv/kvserver/replica_read.go b/pkg/kv/kvserver/replica_read.go
@@ -14,6 +14,7 @@ import (
 	"context"
 	"sync"
 
+	"github.com/cockroachdb/cockroach/pkg/keys"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency"
@@ -63,7 +64,18 @@ func (r *Replica) executeReadOnlyBatch(
 		panic("expected consistent iterators")
 	}
 	if util.RaceEnabled {
-		rw = spanset.NewReadWriterAt(rw, spans, ba.Timestamp)
+		// To account for direct access to separated intents in the lock table,
+		// add on corresponding lock table spans for all latches.
+		assertSpans := spans.Copy()
+		spans.Iterate(func(sa spanset.SpanAccess, _ spanset.SpanScope, span spanset.Span) {
+			ltKey, _ := keys.LockTableSingleKey(span.Key, nil)
+			var ltEndKey roachpb.Key
+			if span.EndKey != nil {
+				ltEndKey, _ = keys.LockTableSingleKey(span.EndKey, nil)
+			}
+			assertSpans.AddNonMVCC(sa, roachpb.Span{Key: ltKey, EndKey: ltEndKey})
+		})
+		rw = spanset.NewReadWriterAt(rw, assertSpans, ba.Timestamp)
 	}
 	defer rw.Close()