fix(rustdb-storage): detect stale hint files using data file size metadata and add restart persistence regression tests
This commit is contained in:
@@ -198,14 +198,17 @@ impl KeyDir {
|
||||
|
||||
/// Persist the KeyDir to a hint file for fast restart.
|
||||
///
|
||||
/// `data_file_size` is the current size of data.rdb — stored in the hint header
|
||||
/// so that on next load we can detect if data.rdb changed (stale hint).
|
||||
///
|
||||
/// Hint file format (after the 64-byte file header):
|
||||
/// For each entry: [key_len:u32 LE][key bytes][offset:u64 LE][record_len:u32 LE][value_len:u32 LE][timestamp:u64 LE]
|
||||
pub fn persist_to_hint_file(&self, path: &Path) -> StorageResult<()> {
|
||||
pub fn persist_to_hint_file(&self, path: &Path, data_file_size: u64) -> StorageResult<()> {
|
||||
let file = std::fs::File::create(path)?;
|
||||
let mut writer = BufWriter::new(file);
|
||||
|
||||
// Write file header
|
||||
let hdr = FileHeader::new(FileType::Hint);
|
||||
// Write file header with data_file_size for staleness detection
|
||||
let hdr = FileHeader::new_hint(data_file_size);
|
||||
writer.write_all(&hdr.encode())?;
|
||||
|
||||
// Write entries
|
||||
@@ -225,7 +228,9 @@ impl KeyDir {
|
||||
}
|
||||
|
||||
/// Load a KeyDir from a hint file. Returns None if the file doesn't exist.
|
||||
pub fn load_from_hint_file(path: &Path) -> StorageResult<Option<Self>> {
|
||||
/// Returns `(keydir, stored_data_file_size)` where `stored_data_file_size` is the
|
||||
/// data.rdb size recorded when the hint was written (0 = old format, unknown).
|
||||
pub fn load_from_hint_file(path: &Path) -> StorageResult<Option<(Self, u64)>> {
|
||||
if !path.exists() {
|
||||
return Ok(None);
|
||||
}
|
||||
@@ -254,6 +259,7 @@ impl KeyDir {
|
||||
)));
|
||||
}
|
||||
|
||||
let stored_data_file_size = hdr.data_file_size;
|
||||
let keydir = KeyDir::new();
|
||||
|
||||
loop {
|
||||
@@ -292,7 +298,7 @@ impl KeyDir {
|
||||
);
|
||||
}
|
||||
|
||||
Ok(Some(keydir))
|
||||
Ok(Some((keydir, stored_data_file_size)))
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
@@ -517,9 +523,10 @@ mod tests {
|
||||
},
|
||||
);
|
||||
|
||||
kd.persist_to_hint_file(&hint_path).unwrap();
|
||||
let loaded = KeyDir::load_from_hint_file(&hint_path).unwrap().unwrap();
|
||||
kd.persist_to_hint_file(&hint_path, 12345).unwrap();
|
||||
let (loaded, stored_size) = KeyDir::load_from_hint_file(&hint_path).unwrap().unwrap();
|
||||
|
||||
assert_eq!(stored_size, 12345);
|
||||
assert_eq!(loaded.len(), 2);
|
||||
let e1 = loaded.get("doc1").unwrap();
|
||||
assert_eq!(e1.offset, 64);
|
||||
|
||||
Reference in New Issue
Block a user