Mercurial > lbo > hg > leveldb-rs
changeset 439:7835f1fbb7cf
cleanup: formatting
| author | Lewin Bormann <lbo@spheniscida.de> |
|---|---|
| date | Sun, 17 Dec 2017 17:59:46 +0100 |
| parents | 4ae2a643666d |
| children | d4879ef9fe75 |
| files | src/db_impl.rs src/key_types.rs src/merging_iter.rs src/skipmap.rs src/version.rs |
| diffstat | 5 files changed, 21 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/db_impl.rs Sun Dec 17 17:59:00 2017 +0100 +++ b/src/db_impl.rs Sun Dec 17 17:59:46 2017 +0100 @@ -950,7 +950,6 @@ let mut builder = TableBuilder::new(opt.clone(), f); while from.advance() { assert!(from.current(&mut kbuf, &mut vbuf)); - i += 1; if firstkey.is_none() { firstkey = Some(kbuf.clone()); }
--- a/src/key_types.rs Sun Dec 17 17:59:00 2017 +0100 +++ b/src/key_types.rs Sun Dec 17 17:59:46 2017 +0100 @@ -147,24 +147,24 @@ /// cmp_memtable_key efficiently compares two memtable keys by only parsing what's actually needed. pub fn cmp_memtable_key<'a, 'b>(ucmp: &Cmp, a: MemtableKey<'a>, b: MemtableKey<'b>) -> Ordering { - let (alen, aoff): (usize, usize) = VarInt::decode_var(&a); - let (blen, boff): (usize, usize) = VarInt::decode_var(&b); - let userkey_a = &a[aoff..aoff + alen - 8]; - let userkey_b = &b[boff..boff + blen - 8]; + let (alen, aoff): (usize, usize) = VarInt::decode_var(&a); + let (blen, boff): (usize, usize) = VarInt::decode_var(&b); + let userkey_a = &a[aoff..aoff + alen - 8]; + let userkey_b = &b[boff..boff + blen - 8]; - match ucmp.cmp(userkey_a, userkey_b) { - Ordering::Less => Ordering::Less, - Ordering::Greater => Ordering::Greater, - Ordering::Equal => { - let atag = FixedInt::decode_fixed(&a[aoff+alen-8..aoff+alen]); - let btag = FixedInt::decode_fixed(&b[boff+blen-8..boff+blen]); - let (_, aseq) = parse_tag(atag); - let (_, bseq) = parse_tag(btag); + match ucmp.cmp(userkey_a, userkey_b) { + Ordering::Less => Ordering::Less, + Ordering::Greater => Ordering::Greater, + Ordering::Equal => { + let atag = FixedInt::decode_fixed(&a[aoff + alen - 8..aoff + alen]); + let btag = FixedInt::decode_fixed(&b[boff + blen - 8..boff + blen]); + let (_, aseq) = parse_tag(atag); + let (_, bseq) = parse_tag(btag); - // reverse! - bseq.cmp(&aseq) - } + // reverse! + bseq.cmp(&aseq) } + } } /// Parse a key in InternalKey format.
--- a/src/merging_iter.rs Sun Dec 17 17:59:00 2017 +0100 +++ b/src/merging_iter.rs Sun Dec 17 17:59:46 2017 +0100 @@ -39,7 +39,9 @@ for i in 0..self.iters.len() { self.iters[i].reset(); self.iters[i].advance(); - assert!(self.iters[i].valid()); + if !self.iters[i].valid() { + self.iters[i].reset() + } } self.find_smallest(); } @@ -139,7 +141,7 @@ if let Some(current) = self.current { self.update_direction(Direction::Forward); if !self.iters[current].advance() { - // Take this iterator out of rotation; this will return None + // Take this iterator out of rotation; this will return false // for every call to current() and thus it will be ignored // from here on. self.iters[current].reset();
--- a/src/skipmap.rs Sun Dec 17 17:59:00 2017 +0100 +++ b/src/skipmap.rs Sun Dec 17 17:59:46 2017 +0100 @@ -195,7 +195,7 @@ // Keeping track of skip entries that will need to be updated let mut prevs: [Option<*mut Node>; MAX_HEIGHT] = [None; MAX_HEIGHT]; let new_height = self.random_height(); - let mut prevs = &mut prevs[0..new_height]; + let prevs = &mut prevs[0..new_height]; let mut level = MAX_HEIGHT - 1; let mut current = self.head.as_mut() as *mut Node;