Skip to content

Commit 5f5cdfd

Browse files
authored
[Storage] Use contiguous journal in adb::Immutable (#1916)
1 parent e5215d9 commit 5f5cdfd

9 files changed

Lines changed: 1030 additions & 1142 deletions

File tree

examples/sync/src/databases/immutable.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,11 @@ pub fn create_config() -> Config<Translator, ()> {
2727
mmr_metadata_partition: "mmr_metadata".into(),
2828
mmr_items_per_blob: NZU64!(4096),
2929
mmr_write_buffer: NZUsize!(1024),
30-
log_journal_partition: "log_journal".into(),
30+
log_partition: "log".into(),
3131
log_items_per_section: NZU64!(512),
3232
log_compression: None,
3333
log_codec_config: (),
3434
log_write_buffer: NZUsize!(1024),
35-
locations_journal_partition: "locations_journal".into(),
36-
locations_items_per_blob: NZU64!(4096),
3735
translator: commonware_storage::translator::EightCap,
3836
thread_pool: None,
3937
buffer_pool: commonware_runtime::buffer::PoolRef::new(NZUsize!(1024), NZUsize!(10)),

storage/fuzz/fuzz_targets/adb_immutable.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,11 @@ fn db_config(suffix: &str) -> Config<TwoCap, (RangeCfg<usize>, ())> {
103103
mmr_metadata_partition: format!("metadata_{suffix}"),
104104
mmr_items_per_blob: NZU64!(ITEMS_PER_BLOB),
105105
mmr_write_buffer: NZUsize!(1024),
106-
log_journal_partition: format!("log_journal_{suffix}"),
106+
log_partition: format!("log_{suffix}"),
107107
log_items_per_section: NZU64!(ITEMS_PER_SECTION),
108108
log_compression: None,
109109
log_codec_config: ((0..=10000).into(), ()),
110110
log_write_buffer: NZUsize!(1024),
111-
locations_journal_partition: format!("locations_journal_{suffix}"),
112-
locations_items_per_blob: NZU64!(7),
113111
translator: TwoCap,
114112
thread_pool: None,
115113
buffer_pool: PoolRef::new(NZUsize!(PAGE_SIZE), NZUsize!(PAGE_CACHE_SIZE)),

storage/src/adb/any/variable/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ use std::{
2929
};
3030
use tracing::{debug, warn};
3131

32-
pub mod sync;
33-
3432
/// The size of the read buffer to use for replaying the operations log when rebuilding the
3533
/// snapshot.
3634
const SNAPSHOT_READ_BUFFER_SIZE: usize = 1 << 16;

0 commit comments

Comments
 (0)