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

Remove redundant and incorrect debug log event

This commit is contained in:
Tyler Neely 2024-03-24 20:20:51 +01:00
parent 3a87137aab
commit 2a888dbcae
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/leaf.rs
View File

@ -38,6 +38,10 @@ impl<const LEAF_FANOUT: usize> Default for Leaf<LEAF_FANOUT> {
}
impl<const LEAF_FANOUT: usize> Leaf<LEAF_FANOUT> {
pub(crate) const fn is_empty(&self) -> bool {
self.data.is_empty()
}
pub(crate) fn set_dirty_epoch(&mut self, epoch: FlushEpoch) {
if let Some(current_epoch) = self.dirty_flush_epoch {
assert!(current_epoch <= epoch);

44
src/tree.rs
View File

@ -1334,6 +1334,18 @@ impl<const LEAF_FANOUT: usize> Tree<LEAF_FANOUT> {
let old_dirty_epoch = leaf.dirty_flush_epoch.take().unwrap();
leaf.max_unflushed_epoch = Some(old_dirty_epoch);
// be extra-explicit about serialized bytes
let leaf_ref: &Leaf<LEAF_FANOUT> = &*leaf;
let serialized = leaf_ref
.serialize(self.cache.config.zstd_compression_level);
log::trace!(
"C adding node {} to dirty epoch {:?}",
node.object_id.0,
old_dirty_epoch
);
#[cfg(feature = "for-internal-testing-only")]
{
self.cache.event_verifier.mark(
@ -1349,18 +1361,6 @@ impl<const LEAF_FANOUT: usize> Tree<LEAF_FANOUT> {
);
}
// be extra-explicit about serialized bytes
let leaf_ref: &Leaf<LEAF_FANOUT> = &*leaf;
let serialized = leaf_ref
.serialize(self.cache.config.zstd_compression_level);
log::trace!(
"C adding node {} to dirty epoch {:?}",
node.object_id.0,
old_dirty_epoch
);
self.cache.install_dirty(
old_dirty_epoch,
node.object_id,
@ -1373,16 +1373,6 @@ impl<const LEAF_FANOUT: usize> Tree<LEAF_FANOUT> {
},
);
#[cfg(feature = "for-internal-testing-only")]
{
self.cache.event_verifier.mark(
node.object_id,
old_dirty_epoch,
event_verifier::State::Dirty,
concat!(file!(), ':', line!(), ":apply-batch"),
);
}
assert!(
old_flush_epoch < flush_epoch_guard.epoch(),
"flush epochs somehow became unlinked"
@ -1391,16 +1381,19 @@ impl<const LEAF_FANOUT: usize> Tree<LEAF_FANOUT> {
}
let mut splits: Vec<(InlineArray, Object<LEAF_FANOUT>)> = vec![];
let mut merges: BTreeMap<InlineArray, Object<LEAF_FANOUT>> =
BTreeMap::new();
// Insert and split when full
for (key, value_opt) in batch.writes {
let range = ..=&key;
let (_lo, (ref mut w, _id)) = acquired_locks
let (lo, (ref mut w, object)) = acquired_locks
.range_mut::<InlineArray, _>(range)
.next_back()
.unwrap();
let leaf = w.leaf.as_mut().unwrap();
assert_eq!(lo, &leaf.lo);
assert!(leaf.lo <= key);
if let Some(hi) = &leaf.hi {
assert!(hi > &key);
@ -1408,6 +1401,7 @@ impl<const LEAF_FANOUT: usize> Tree<LEAF_FANOUT> {
if let Some(value) = value_opt {
leaf.insert(key, value);
merges.remove(lo);
if let Some((split_key, rhs_node)) = leaf.split_if_full(
new_epoch,
@ -1422,6 +1416,10 @@ impl<const LEAF_FANOUT: usize> Tree<LEAF_FANOUT> {
}
} else {
leaf.remove(&key);
if leaf.is_empty() {
merges.insert(lo.clone(), object.clone());
}
}
}