Merge pull request #169 from ongardie-ebay/iter

Fix reverse iteration from a given key
master
Tyler Neely 7 years ago committed by GitHub
commit 08a25606c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      src/db.rs
  2. 9
      tests/test_iterator.rs

@ -466,10 +466,13 @@ impl DBIterator {
self.raw.seek_to_last();
self.direction = Direction::Reverse;
}
IteratorMode::From(key, dir) => {
// TODO: Should use seek_for_prev when reversing
IteratorMode::From(key, Direction::Forward) => {
self.raw.seek(key);
self.direction = dir;
self.direction = Direction::Forward;
}
IteratorMode::From(key, Direction::Reverse) => {
self.raw.seek_for_prev(key);
self.direction = Direction::Reverse;
}
};

@ -122,6 +122,11 @@ pub fn test_iterator() {
let expected = vec![(cba(&k2), cba(&v2)), (cba(&k1), cba(&v1))];
assert_eq!(iterator1.collect::<Vec<_>>(), expected);
}
{
let iterator1 = db.iterator(IteratorMode::From(b"zz", Direction::Reverse));
let expected = vec![(cba(&k4), cba(&v4)), (cba(&k3), cba(&v3))];
assert_eq!(iterator1.take(2).collect::<Vec<_>>(), expected);
}
{
let iterator1 = db.iterator(IteratorMode::From(b"k0", Direction::Forward));
assert!(iterator1.valid());
@ -132,13 +137,13 @@ pub fn test_iterator() {
let iterator4 = db.iterator(IteratorMode::From(b"k5", Direction::Forward));
assert!(!iterator4.valid());
let iterator5 = db.iterator(IteratorMode::From(b"k0", Direction::Reverse));
assert!(iterator5.valid());
assert!(!iterator5.valid());
let iterator6 = db.iterator(IteratorMode::From(b"k1", Direction::Reverse));
assert!(iterator6.valid());
let iterator7 = db.iterator(IteratorMode::From(b"k11", Direction::Reverse));
assert!(iterator7.valid());
let iterator8 = db.iterator(IteratorMode::From(b"k5", Direction::Reverse));
assert!(!iterator8.valid());
assert!(iterator8.valid());
}
{
let mut iterator1 = db.iterator(IteratorMode::From(b"k4", Direction::Forward));

Loading…
Cancel
Save