kv: plumb MaxOffset into DeclareKeysFunc

This isn't needed until the next commit, but it's enough noise and code
movement that it's better to live on its own.

pkg/kv/kvserver/batcheval/cmd_barrier.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset"
@@ -24,7 +25,11 @@ func init() {
 }
 
 func declareKeysBarrier(
- _ ImmutableRangeState, _ *roachpb.Header, req roachpb.Request, latchSpans, _ *spanset.SpanSet,
+ _ ImmutableRangeState,
+ _ *roachpb.Header,
+ req roachpb.Request,
+ latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  // Barrier is special-cased in the concurrency manager to *not* actually
  // grab these latches. Instead, any conflicting latches with these are waited

pkg/kv/kvserver/batcheval/cmd_clear_range.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/keys"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
@@ -41,8 +42,9 @@ func declareKeysClearRange(
  header *roachpb.Header,
  req roachpb.Request,
  latchSpans, lockSpans *spanset.SpanSet,
+ maxOffset time.Duration,
 ) {
- DefaultDeclareIsolatedKeys(rs, header, req, latchSpans, lockSpans)
+ DefaultDeclareIsolatedKeys(rs, header, req, latchSpans, lockSpans, maxOffset)
  // We look up the range descriptor key to check whether the span
  // is equal to the entire range for fast stats updating.
  latchSpans.AddNonMVCC(spanset.SpanReadOnly, roachpb.Span{Key: keys.RangeDescriptorKey(rs.GetStartKey())})

pkg/kv/kvserver/batcheval/cmd_compute_checksum.go

@@ -28,7 +28,11 @@ func init() {
 }
 
 func declareKeysComputeChecksum(
- rs ImmutableRangeState, _ *roachpb.Header, _ roachpb.Request, latchSpans, _ *spanset.SpanSet,
+ rs ImmutableRangeState,
+ _ *roachpb.Header,
+ _ roachpb.Request,
+ latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  // The correctness of range merges depends on the lease applied index of a
  // range not being bumped while the RHS is subsumed. ComputeChecksum bumps a

pkg/kv/kvserver/batcheval/cmd_conditional_put.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset"
@@ -29,12 +30,13 @@ func declareKeysConditionalPut(
  header *roachpb.Header,
  req roachpb.Request,
  latchSpans, lockSpans *spanset.SpanSet,
+ maxOffset time.Duration,
 ) {
  args := req.(*roachpb.ConditionalPutRequest)
  if args.Inline {
- DefaultDeclareKeys(rs, header, req, latchSpans, lockSpans)
+ DefaultDeclareKeys(rs, header, req, latchSpans, lockSpans, maxOffset)
  } else {
- DefaultDeclareIsolatedKeys(rs, header, req, latchSpans, lockSpans)
+ DefaultDeclareIsolatedKeys(rs, header, req, latchSpans, lockSpans, maxOffset)
  }
 }
 

pkg/kv/kvserver/batcheval/cmd_delete_range.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset"
@@ -29,12 +30,13 @@ func declareKeysDeleteRange(
  header *roachpb.Header,
  req roachpb.Request,
  latchSpans, lockSpans *spanset.SpanSet,
+ maxOffset time.Duration,
 ) {
  args := req.(*roachpb.DeleteRangeRequest)
  if args.Inline {
- DefaultDeclareKeys(rs, header, req, latchSpans, lockSpans)
+ DefaultDeclareKeys(rs, header, req, latchSpans, lockSpans, maxOffset)
  } else {
- DefaultDeclareIsolatedKeys(rs, header, req, latchSpans, lockSpans)
+ DefaultDeclareIsolatedKeys(rs, header, req, latchSpans, lockSpans, maxOffset)
  }
 }
 

pkg/kv/kvserver/batcheval/cmd_end_transaction.go

@@ -16,6 +16,7 @@ import (
  "fmt"
  "math"
  "sync/atomic"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/keys"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/abortspan"
@@ -56,6 +57,7 @@ func declareKeysEndTxn(
  header *roachpb.Header,
  req roachpb.Request,
  latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  et := req.(*roachpb.EndTxnRequest)
  declareKeysWriteTransaction(rs, header, req, latchSpans)

pkg/kv/kvserver/batcheval/cmd_export.go

@@ -13,6 +13,7 @@ package batcheval
 import (
  "context"
  "fmt"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/keys"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
@@ -85,8 +86,9 @@ func declareKeysExport(
  header *roachpb.Header,
  req roachpb.Request,
  latchSpans, lockSpans *spanset.SpanSet,
+ maxOffset time.Duration,
 ) {
- DefaultDeclareIsolatedKeys(rs, header, req, latchSpans, lockSpans)
+ DefaultDeclareIsolatedKeys(rs, header, req, latchSpans, lockSpans, maxOffset)
  latchSpans.AddNonMVCC(spanset.SpanReadOnly, roachpb.Span{Key: keys.RangeGCThresholdKey(header.RangeID)})
 }
 

pkg/kv/kvserver/batcheval/cmd_gc.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/keys"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
@@ -30,6 +31,7 @@ func declareKeysGC(
  header *roachpb.Header,
  req roachpb.Request,
  latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  // Intentionally don't call DefaultDeclareKeys: the key range in the header
  // is usually the whole range (pending resolution of #7880).

pkg/kv/kvserver/batcheval/cmd_heartbeat_txn.go

@@ -13,6 +13,7 @@ package batcheval
 import (
  "context"
  "fmt"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/keys"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
@@ -31,6 +32,7 @@ func declareKeysHeartbeatTransaction(
  header *roachpb.Header,
  req roachpb.Request,
  latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  declareKeysWriteTransaction(rs, header, req, latchSpans)
 }

pkg/kv/kvserver/batcheval/cmd_lease_info.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/keys"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
@@ -25,7 +26,11 @@ func init() {
 }
 
 func declareKeysLeaseInfo(
- rs ImmutableRangeState, _ *roachpb.Header, _ roachpb.Request, latchSpans, _ *spanset.SpanSet,
+ rs ImmutableRangeState,
+ _ *roachpb.Header,
+ _ roachpb.Request,
+ latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  latchSpans.AddNonMVCC(spanset.SpanReadOnly, roachpb.Span{Key: keys.RangeLeaseKey(rs.GetRangeID())})
 }

pkg/kv/kvserver/batcheval/cmd_lease_request.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/keys"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
@@ -26,7 +27,11 @@ func init() {
 }
 
 func declareKeysRequestLease(
- rs ImmutableRangeState, _ *roachpb.Header, _ roachpb.Request, latchSpans, _ *spanset.SpanSet,
+ rs ImmutableRangeState,
+ _ *roachpb.Header,
+ _ roachpb.Request,
+ latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  // NOTE: RequestLease is run on replicas that do not hold the lease, so
  // acquiring latches would not help synchronize with other requests. As

pkg/kv/kvserver/batcheval/cmd_lease_transfer.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/readsummary/rspb"
@@ -26,7 +27,11 @@ func init() {
 }
 
 func declareKeysTransferLease(
- _ ImmutableRangeState, _ *roachpb.Header, _ roachpb.Request, latchSpans, _ *spanset.SpanSet,
+ _ ImmutableRangeState,
+ _ *roachpb.Header,
+ _ roachpb.Request,
+ latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  // TransferLease must not run concurrently with any other request so it uses
  // latches to synchronize with all other reads and writes on the outgoing

pkg/kv/kvserver/batcheval/cmd_migrate.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/clusterversion"
  "github.com/cockroachdb/cockroach/pkg/keys"
@@ -29,7 +30,11 @@ func init() {
 }
 
 func declareKeysMigrate(
- rs ImmutableRangeState, _ *roachpb.Header, _ roachpb.Request, latchSpans, _ *spanset.SpanSet,
+ rs ImmutableRangeState,
+ _ *roachpb.Header,
+ _ roachpb.Request,
+ latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  // TODO(irfansharif): This will eventually grow to capture the super set of
  // all keys accessed by all migrations defined here. That could get

pkg/kv/kvserver/batcheval/cmd_probe.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverpb"
@@ -21,7 +22,11 @@ import (
 )
 
 func declareKeysProbe(
- _ ImmutableRangeState, _ *roachpb.Header, _ roachpb.Request, _, _ *spanset.SpanSet,
+ _ ImmutableRangeState,
+ _ *roachpb.Header,
+ _ roachpb.Request,
+ _, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  // Declare no keys. This means that we're not even serializing with splits
  // (i.e. a probe could be directed at a key that will become the right-hand

pkg/kv/kvserver/batcheval/cmd_push_txn.go

@@ -13,6 +13,7 @@ package batcheval
 import (
  "bytes"
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/keys"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
@@ -30,7 +31,11 @@ func init() {
 }
 
 func declareKeysPushTransaction(
- rs ImmutableRangeState, _ *roachpb.Header, req roachpb.Request, latchSpans, _ *spanset.SpanSet,
+ rs ImmutableRangeState,
+ _ *roachpb.Header,
+ req roachpb.Request,
+ latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  pr := req.(*roachpb.PushTxnRequest)
  latchSpans.AddNonMVCC(spanset.SpanReadWrite, roachpb.Span{Key: keys.TransactionKey(pr.PusheeTxn.Key, pr.PusheeTxn.ID)})

pkg/kv/kvserver/batcheval/cmd_put.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset"
@@ -29,12 +30,13 @@ func declareKeysPut(
  header *roachpb.Header,
  req roachpb.Request,
  latchSpans, lockSpans *spanset.SpanSet,
+ maxOffset time.Duration,
 ) {
  args := req.(*roachpb.PutRequest)
  if args.Inline {
- DefaultDeclareKeys(rs, header, req, latchSpans, lockSpans)
+ DefaultDeclareKeys(rs, header, req, latchSpans, lockSpans, maxOffset)
  } else {
- DefaultDeclareIsolatedKeys(rs, header, req, latchSpans, lockSpans)
+ DefaultDeclareIsolatedKeys(rs, header, req, latchSpans, lockSpans, maxOffset)
  }
 }
 

pkg/kv/kvserver/batcheval/cmd_query_intent.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset"
@@ -27,7 +28,11 @@ func init() {
 }
 
 func declareKeysQueryIntent(
- _ ImmutableRangeState, _ *roachpb.Header, req roachpb.Request, latchSpans, _ *spanset.SpanSet,
+ _ ImmutableRangeState,
+ _ *roachpb.Header,
+ req roachpb.Request,
+ latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  // QueryIntent requests read the specified keys at the maximum timestamp in
  // order to read any intent present, if one exists, regardless of the

pkg/kv/kvserver/batcheval/cmd_query_txn.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/keys"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
@@ -27,7 +28,11 @@ func init() {
 }
 
 func declareKeysQueryTransaction(
- _ ImmutableRangeState, _ *roachpb.Header, req roachpb.Request, latchSpans, _ *spanset.SpanSet,
+ _ ImmutableRangeState,
+ _ *roachpb.Header,
+ req roachpb.Request,
+ latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  qr := req.(*roachpb.QueryTxnRequest)
  latchSpans.AddNonMVCC(spanset.SpanReadOnly, roachpb.Span{Key: keys.TransactionKey(qr.Txn.Key, qr.Txn.ID)})

pkg/kv/kvserver/batcheval/cmd_range_stats.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/keys"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
@@ -29,8 +30,9 @@ func declareKeysRangeStats(
  header *roachpb.Header,
  req roachpb.Request,
  latchSpans, lockSpans *spanset.SpanSet,
+ maxOffset time.Duration,
 ) {
- DefaultDeclareKeys(rs, header, req, latchSpans, lockSpans)
+ DefaultDeclareKeys(rs, header, req, latchSpans, lockSpans, maxOffset)
  // The request will return the descriptor and lease.
  latchSpans.AddNonMVCC(spanset.SpanReadOnly, roachpb.Span{Key: keys.RangeDescriptorKey(rs.GetStartKey())})
  latchSpans.AddNonMVCC(spanset.SpanReadOnly, roachpb.Span{Key: keys.RangeLeaseKey(rs.GetRangeID())})

pkg/kv/kvserver/batcheval/cmd_recompute_stats.go

@@ -12,6 +12,7 @@ package batcheval
 
 import (
  "context"
+ "time"
 
  "github.com/cockroachdb/cockroach/pkg/keys"
  "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
@@ -29,7 +30,11 @@ func init() {
 }
 
 func declareKeysRecomputeStats(
- rs ImmutableRangeState, _ *roachpb.Header, _ roachpb.Request, latchSpans, _ *spanset.SpanSet,
+ rs ImmutableRangeState,
+ _ *roachpb.Header,
+ _ roachpb.Request,
+ latchSpans, _ *spanset.SpanSet,
+ _ time.Duration,
 ) {
  // We don't declare any user key in the range. This is OK since all we're doing is computing a
  // stats delta, and applying this delta commutes with other operations on the same key space.