Skip to content

Commit c1563e3

Browse files
committed
fixup! Integrate TierStore into NodeBuilder
remove dynstore prefactor as it's not relevant for type-erased stores yet
1 parent 6b987a8 commit c1563e3

1 file changed

Lines changed: 1 addition & 8 deletions

File tree

src/builder.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -856,16 +856,8 @@ impl NodeBuilder {
856856
/// [`set_backup_storage_dir_path`]: Self::set_backup_storage_dir_path
857857
pub fn build_with_store<S: SyncAndAsyncKVStore + Send + Sync + 'static>(
858858
&self, node_entropy: NodeEntropy, kv_store: S,
859-
) -> Result<Node, BuildError> {
860-
let primary_store: Arc<DynStore> = Arc::new(DynStoreWrapper(kv_store));
861-
self.build_with_dynstore(node_entropy, primary_store)
862-
}
863-
864-
fn build_with_dynstore(
865-
&self, node_entropy: NodeEntropy, primary_store: Arc<DynStore>,
866859
) -> Result<Node, BuildError> {
867860
let logger = setup_logger(&self.log_writer_config, &self.config)?;
868-
869861
self.build_with_store_and_logger(node_entropy, kv_store, logger)
870862
}
871863

@@ -882,6 +874,7 @@ impl NodeBuilder {
882874
};
883875

884876
let ts_config = self.tier_store_config.as_ref();
877+
let primary_store = Arc::new(DynStoreWrapper(kv_store));
885878
let mut tier_store = TierStore::new(primary_store, Arc::clone(&logger));
886879
if let Some(config) = ts_config {
887880
config.ephemeral.as_ref().map(|s| tier_store.set_ephemeral_store(Arc::clone(s)));

0 commit comments

Comments
 (0)