diff --git a/src/disk_store/meta_store.rs b/src/disk_store/meta_store.rs index 2edb0bf..dabcf6f 100644 --- a/src/disk_store/meta_store.rs +++ b/src/disk_store/meta_store.rs @@ -47,7 +47,7 @@ impl MetaStore { pub fn serialize(&self) -> Vec { let mut builder = ::capnp::message::Builder::new_default(); let mut dbmeta = builder.init_root::(); - dbmeta.set_next_wal_id(self.next_wal_id); + dbmeta.set_next_wal_id(self.earliest_uncommited_wal_id); let total_partitions = self.partitions.values().map(|x| x.len()).sum::(); assert!(total_partitions < std::u32::MAX as usize); diff --git a/src/disk_store/storage.rs b/src/disk_store/storage.rs index d4f0765..f867c9a 100644 --- a/src/disk_store/storage.rs +++ b/src/disk_store/storage.rs @@ -140,8 +140,8 @@ impl Storage { }; let mut wal_segments = Vec::new(); - let next_wal_id = meta_store.next_wal_id; - log::info!("Recovering from wal checkpoint {}", next_wal_id); + let earliest_uncommited_wal_id = meta_store.earliest_uncommited_wal_id; + log::info!("Recovering from wal checkpoint {}", earliest_uncommited_wal_id); let wal_files = writer.list(wal_dir).unwrap(); log::info!("Found {} wal segments", wal_files.len()); for wal_file in wal_files { @@ -155,7 +155,7 @@ impl Storage { wal_segment.data.tables.values().map(|t| t.len).sum::(), wal_segment.data.tables.len(), ); - if wal_segment.id < next_wal_id { + if wal_segment.id < earliest_uncommited_wal_id { if readonly { log::info!("Skipping wal segment {}", wal_file.display()); } else {