Skip to content

Commit

Permalink
Merge #109159
Browse files Browse the repository at this point in the history
109159: storage: Make noopCloseReader support ReaderWithMustIterators r=nvanbenschoten a=itsbilal

Prevents a panic in a cast in the MVCCIncrementalIterator creation path, which is the only path that requires a cast to ReaderWithMustIterators.

Fixes #109158.

Epic: CRDB-30807

Release note: None

Co-authored-by: Bilal Akhtar <[email protected]>
  • Loading branch information
craig[bot] and itsbilal committed Aug 21, 2023
2 parents eaf8717 + 053bbb6 commit 1679936
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/storage/mvcc_history_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2683,7 +2683,7 @@ func (i *iterWithCloser) Close() {

// noopCloseReader overrides Reader.Close() with a noop.
type noopCloseReader struct {
storage.Reader
storage.ReaderWithMustIterators
}

func (noopCloseReader) Close() {}

0 comments on commit 1679936

Please sign in to comment.