Skip to content

Commit afe6c95

Browse files
authored
Fix typos in W3D5 writeup and code (#67)
1 parent 621d7a8 commit afe6c95

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

mini-lsm-book/src/week3-05-txn-occ.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ In this task, you will need to modify:
2727
src/txn.rs
2828
```
2929

30-
For `get`, you should first probe the local storage. If a value is found, return the value or `None` depending on whether it is a deletion marker. For `scan`, you will need to implement a `TxnLocalIterator` for the skiplist as in chapter 1.1 when you implement the iterator for a memtable without key timestamp. You will need to store a `TwoMergeIterator<TxnLocalIterator, FusedIterator<LsmIterator>>` in the `TxnLocalIterator`. And, lastly, given that the `TwoMergeIterator` will retain the deletion markers in the child iterators, you will need to modify your `TxnIterator` implementation to correctly handle deletions.
30+
For `get`, you should first probe the local storage. If a value is found, return the value or `None` depending on whether it is a deletion marker. For `scan`, you will need to implement a `TxnLocalIterator` for the skiplist as in chapter 1.1 when you implement the iterator for a memtable without key timestamp. You will need to store a `TwoMergeIterator<TxnLocalIterator, FusedIterator<LsmIterator>>` in the `TxnIterator`. And, lastly, given that the `TwoMergeIterator` will retain the deletion markers in the child iterators, you will need to modify your `TxnIterator` implementation to correctly handle deletions.
3131

3232
## Task 3: Commit
3333

mini-lsm-mvcc/src/mvcc/txn.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ type SkipMapRangeIter<'a> =
179179
pub struct TxnLocalIterator {
180180
/// Stores a reference to the skipmap.
181181
map: Arc<SkipMap<Bytes, Bytes>>,
182-
/// Stores a skipmap iterator that refers to the lifetime of `MemTableIterator` itself.
182+
/// Stores a skipmap iterator that refers to the lifetime of `TxnLocalIterator` itself.
183183
#[borrows(map)]
184184
#[not_covariant]
185185
iter: SkipMapRangeIter<'this>,

mini-lsm-starter/src/mvcc/txn.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ type SkipMapRangeIter<'a> =
6161
pub struct TxnLocalIterator {
6262
/// Stores a reference to the skipmap.
6363
map: Arc<SkipMap<Bytes, Bytes>>,
64-
/// Stores a skipmap iterator that refers to the lifetime of `MemTableIterator` itself.
64+
/// Stores a skipmap iterator that refers to the lifetime of `TxnLocalIterator` itself.
6565
#[borrows(map)]
6666
#[not_covariant]
6767
iter: SkipMapRangeIter<'this>,

0 commit comments

Comments
 (0)