rust
/
sled
mirror of https://github.com/spacejam/sled
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'main' into tyler_simplify_before_rewrite

This commit is contained in:
Tyler Neely 2022-10-02 11:03:41 +02:00 committed by GitHub
parent 9b5b00e4db 96b2170a50
commit b19e34db30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -9,7 +9,7 @@
</tr>
<tr>
<td><a href="https://github.com/sponsors/spacejam">buy a coffee for us to convert into databases</a></td>
<td><a href="https://github.com/sponsors/spacejam"><img src="https://img.shields.io/opencollective/backers/sled"></a></td>
<td><a href="https://github.com/sponsors/spacejam"><img src="https://img.shields.io/github/sponsors/spacejam"></a></td>
</tr>
<tr>
<td><a href="https://docs.rs/sled">documentation</a></td>

28
src/node.rs
View File

@ -412,10 +412,9 @@ impl<'a> Iterator for Iter<'a> {
(Some((_, Some(_))), None) => {
log::trace!("src/node.rs:114");
log::trace!("iterator returning {:?}", self.next_a);
return self
.next_a
.take()
.map(|(k, v)| (KeyRef::Slice(k), v.unwrap().as_ref()));
return self.next_a.take().map(|(k, v)| {
(KeyRef::Slice(k), v.unwrap().as_ref())
});
}
(Some((k_a, v_a_opt)), Some((k_b, _))) => {
let cmp = KeyRef::Slice(k_a).cmp(&k_b);
@ -512,10 +511,9 @@ impl<'a> DoubleEndedIterator for Iter<'a> {
(Some((_, Some(_))), None) => {
log::trace!("src/node.rs:483");
log::trace!("iterator returning {:?}", self.next_back_a);
return self
.next_back_a
.take()
.map(|(k, v)| (KeyRef::Slice(k), v.unwrap().as_ref()));
return self.next_back_a.take().map(|(k, v)| {
(KeyRef::Slice(k), v.unwrap().as_ref())
});
}
(Some((k_a, Some(_))), Some((k_b, _))) if k_b > *k_a => {
log::trace!("src/node.rs:508");
@ -524,20 +522,18 @@ impl<'a> DoubleEndedIterator for Iter<'a> {
}
(Some((k_a, Some(_))), Some((k_b, _))) if k_b < *k_a => {
log::trace!("iterator returning {:?}", self.next_back_a);
return self
.next_back_a
.take()
.map(|(k, v)| (KeyRef::Slice(k), v.unwrap().as_ref()));
return self.next_back_a.take().map(|(k, v)| {
(KeyRef::Slice(k), v.unwrap().as_ref())
});
}
(Some((k_a, Some(_))), Some((k_b, _))) if k_b == *k_a => {
// prefer overlay, discard node value
self.next_back_b.take();
log::trace!("src/node.rs:520");
log::trace!("iterator returning {:?}", self.next_back_a);
return self
.next_back_a
.take()
.map(|(k, v)| (KeyRef::Slice(k), v.unwrap().as_ref()));
return self.next_back_a.take().map(|(k, v)| {
(KeyRef::Slice(k), v.unwrap().as_ref())
});
}
_ => unreachable!(
"did not expect combination a: {:?} b: {:?}",