Skip to content

Commit 98f238f

Browse files
committed
kvserver: use StateEngine in replica.go
A few uses of replicated Range-local keys. Epic: none Release note: none
1 parent b059049 commit 98f238f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pkg/kv/kvserver/replica.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,7 +1810,7 @@ func (r *Replica) getQueueLastProcessed(ctx context.Context, queue string) (hlc.
18101810
key := keys.QueueLastProcessedKey(r.Desc().StartKey, queue)
18111811
var timestamp hlc.Timestamp
18121812
if r.store != nil {
1813-
_, err := storage.MVCCGetProto(ctx, r.store.TODOEngine(), key, hlc.Timestamp{}, &timestamp,
1813+
_, err := storage.MVCCGetProto(ctx, r.store.StateEngine(), key, hlc.Timestamp{}, &timestamp,
18141814
storage.MVCCGetOptions{})
18151815
if err != nil {
18161816
log.VErrEventf(ctx, 2, "last processed timestamp unavailable: %s", err)
@@ -2516,15 +2516,15 @@ func (r *Replica) maybeWatchForMergeLocked(ctx context.Context) (bool, error) {
25162516
// if one exists, regardless of what timestamp it is written at.
25172517
desc := r.descRLocked()
25182518
descKey := keys.RangeDescriptorKey(desc.StartKey)
2519-
intentRes, err := storage.MVCCGet(ctx, r.store.TODOEngine(), descKey, hlc.MaxTimestamp,
2519+
intentRes, err := storage.MVCCGet(ctx, r.store.StateEngine(), descKey, hlc.MaxTimestamp,
25202520
storage.MVCCGetOptions{Inconsistent: true})
25212521
if err != nil {
25222522
return false, err
25232523
} else if intentRes.Intent == nil {
25242524
return false, nil
25252525
}
25262526
valRes, err := storage.MVCCGetAsTxn(
2527-
ctx, r.store.TODOEngine(), descKey, intentRes.Intent.Txn.WriteTimestamp, intentRes.Intent.Txn)
2527+
ctx, r.store.StateEngine(), descKey, intentRes.Intent.Txn.WriteTimestamp, intentRes.Intent.Txn)
25282528
if err != nil {
25292529
return false, err
25302530
} else if valRes.Value != nil {

0 commit comments

Comments
 (0)