8000 optimize: rebuild the overlay index directly from mmap on reopen by nuskey8 · Pull Request #14 · nuskey8/lkv · GitHub
[go: up one dir, main page]
Skip to content

optimize: rebuild the overlay index directly from mmap on reopen #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nuskey8 merged 1 commit into from
Aug 12, 2026
Merged

optimize: rebuild the overlay index directly from mmap on reopen #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions lkv/src/database/mod.rs
View file
Open in desktop
45BF
Original file line number Diff line number Diff line change
Expand Up @@ -500,30 +500,44 @@ fn load_storage_state(
let superblock = superblock::read_latest_from(storage, storage_len)?;
let mapping = storage.load_immutable(superblock.base_offset(), superblock.base_size())?;
let mut base = ActiveBase::open(mapping, superblock, options.verification)?;
let overlay_scan = scan_overlay(storage, base.log_start, storage_len)?;
let initial_overlay_size = storage_len
.checked_sub(base.log_start)
.ok_or_else(|| Error::invalid_base("overlay range precedes active Base"))?;
let mut overlay_scan = if initial_overlay_size == 0 {
recovery::OverlayScan::empty(base.log_start)
} else if storage.is_memory() {
return Err(Error::invalid_base(
"in-memory database cannot contain a persisted Overlay",
));
} else {
let mapping = storage.load_immutable(base.log_start, initial_overlay_size)?;
scan_overlay(mapping, base.log_start)?
};
let valid_len = overlay_scan.valid_len();
if valid_len < storage_len {
// SetEndOfFile fails on Windows while any section of the file is mapped.
// Validate first, then temporarily release our Base mapping
// before discarding an incomplete Overlay tail.
overlay_scan.release_mapping();
drop(base);
storage.set_len(valid_len)?;
storage.sync_data()?;
let mapping = storage.load_immutable(superblock.base_offset(), superblock.base_size())?;
base = ActiveBase::open(mapping, superblock, options.verification)?;
}
let overlay_size = valid_len
.checked_sub(base.log_start)
.ok_or_else(|| Error::invalid_base("overlay range precedes active Base"))?;
let overlay = if storage.is_memory() {
OverlayState::new(OverlayMap::memory())
} else {
let overlay_mapping = if overlay_size == 0 {
let overlay_size = valid_len
.checked_sub(base.log_start)
.ok_or_else(|| Error::invalid_base("overlay range precedes active Base"))?;
let mapping = if overlay_size == 0 {
None
} else {
Some(storage.load_immutable(base.log_start, overlay_size)?)
};
let (index, memory) = overlay_scan.into_index(overlay_mapping, base.log_start)?;
overlay_scan.replace_mapping(mapping);
}
let overlay = if storage.is_memory() {
OverlayState::new(OverlayMap::memory())
} else {
let (index, memory) = overlay_scan.into_index();
OverlayState::with_memory(index, memory)
};
storage.seek(SeekFrom::End(0))?;
Expand Down
Loading
0