Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 8 additions & 9 deletions src/store.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::{address::Address, hash::hash, index::Index, log::Log};
use crate::{address::Address, hash::hash, index::Index, log::Log, record::RecordRef};

pub struct Store {
index: Index,
Expand All @@ -15,8 +15,7 @@ impl Store {

pub fn get(&self, key: &[u8]) -> Option<&[u8]> {
let hash = hash(key);
let address = self.find_address(hash, key)?;
let record = self.log.read(address);
let (_, record) = self.find_record(hash, key)?;

if record.is_tombstone() {
None
Expand All @@ -36,30 +35,30 @@ impl Store {
pub fn delete(&mut self, key: &[u8]) -> bool {
let hash = hash(key);

let Some(current) = self.find_address(hash, key) else {
let Some((_, record)) = self.find_record(hash, key) else {
return false;
};

if self.log.read(current).is_tombstone() {
if record.is_tombstone() {
return false;
}

let previous = self.index.head(hash);
let address = self.log.append_tombstone(previous, key);
let tombstone = self.log.append_tombstone(previous, key);

self.index.set_head(hash, address);
self.index.set_head(hash, tombstone);

true
}

fn find_address(&self, hash: u64, key: &[u8]) -> Option<Address> {
fn find_record(&self, hash: u64, key: &[u8]) -> Option<(Address, RecordRef<'_>)> {
let mut address = self.index.head(hash);

while address != Address::INVALID {
let record = self.log.read(address);

if record.key == key {
return Some(address);
return Some((address, record));
}

address = record.previous();
Expand Down