Skip to content

Commit 0240c1d

Browse files
committed
kvserver: rm unnecessary parameter
Epic: none Release note: none
1 parent 6358d24 commit 0240c1d

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkg/kv/kvserver/snapshot_apply_prepare.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (s *snapWriteBuilder) prepareSnapApply(ctx context.Context) error {
4646
return err
4747
}
4848
_ = applySnapshotTODO // 3.2 + 2.1 + 2.2 + 2.3
49-
return s.clearSubsumedReplicaDiskData(ctx, s.todoEng)
49+
return s.clearSubsumedReplicaDiskData(ctx)
5050
}
5151

5252
// rewriteRaftState clears and rewrites the unreplicated rangeID-local key space
@@ -97,9 +97,10 @@ func (s *snapWriteBuilder) rewriteRaftState(ctx context.Context, w storage.Write
9797
// (i.e. Reader was instantiated after all raftMu were acquired).
9898
//
9999
// NB: does nothing if subsumedDescs is empty.
100-
func (s *snapWriteBuilder) clearSubsumedReplicaDiskData(
101-
ctx context.Context, reader storage.Reader,
102-
) error {
100+
func (s *snapWriteBuilder) clearSubsumedReplicaDiskData(ctx context.Context) error {
101+
// TODO(sep-raft-log): need different readers for raft and state engine.
102+
reader := storage.Reader(s.todoEng)
103+
103104
// NB: we don't clear RangeID local key spans here. That happens
104105
// via the call to DestroyReplica.
105106
getKeySpans := func(d *roachpb.RangeDescriptor) []roachpb.Span {

0 commit comments

Comments
 (0)