Mercurial > lbo > hg > leveldb-rs
changeset 390:deff4aa09832
version: Make overlap_in_level public; smaller cleanups
author | Lewin Bormann <lbo@spheniscida.de> |
---|---|
date | Mon, 09 Oct 2017 21:58:52 +0200 |
parents | 1830ed8d7737 |
children | b27d1c73b0d7 |
files | src/version.rs |
diffstat | 1 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.rs Mon Oct 09 21:58:34 2017 +0200 +++ b/src/version.rs Mon Oct 09 21:58:52 2017 +0200 @@ -246,11 +246,11 @@ /// overlap_in_level returns true if the specified level's files overlap the range [smallest; /// largest]. - fn overlap_in_level<'a, 'b>(&self, - level: usize, - smallest: UserKey<'a>, - largest: UserKey<'a>) - -> bool { + pub fn overlap_in_level<'a, 'b>(&self, + level: usize, + smallest: UserKey<'a>, + largest: UserKey<'a>) + -> bool { assert!(level < NUM_LEVELS); if level == 0 { some_file_overlaps_range_disjoint(&InternalKeyCmp(self.user_cmp.clone()), @@ -296,8 +296,8 @@ let mut inputs = vec![]; for f_ in myself.files[level].iter() { let f = f_.borrow(); - let ((_, _, fsmallest), (_, _, flargest)) = (parse_internal_key(&f.smallest), - parse_internal_key(&f.largest)); + let (fsmallest, flargest) = (parse_internal_key(&f.smallest).2, + parse_internal_key(&f.largest).2); // Skip files that are not overlapping. if !ubegin.is_empty() && myself.user_cmp.cmp(flargest, &ubegin) == Ordering::Less { continue; @@ -322,7 +322,6 @@ } (None, inputs) } - } /// new_concat_iter returns an iterator that iterates over the files in a level. Note that this