fix test compile

Signed-off-by: Alex Chi Z <chi@neon.tech>
This commit is contained in:
Alex Chi Z
2023-07-20 16:40:52 -04:00
parent 91c7bbb230
commit f726063d2f
3 changed files with 14 additions and 10 deletions

View File

@@ -727,7 +727,7 @@ mod tests {
// and can remove it in the future.
let _map = LayerMap::default();
let mut mapping = TestLayerFileManager::new();
let mapping = TestLayerFileManager::new();
mapping
.replace_and_verify(not_found, new_version)
@@ -742,7 +742,7 @@ mod tests {
let downloaded = Arc::new(LayerObject::new(skeleton));
let mut map = LayerMap::default();
let mut mapping = LayerFileManager::new();
let mapping = LayerFileManager::new();
// two disjoint Arcs in different lifecycle phases. even if it seems they must be the
// same layer, we use LayerMap::compare_arced_layers as the identity of layers.

View File

@@ -2602,7 +2602,9 @@ impl Timeline {
Some(self.write_lock.lock().await)
};
let mut guard = self.layers.write().await;
guard.try_freeze_in_memory_layer(self.get_last_record_lsn(), &self.last_freeze_at).await;
guard
.try_freeze_in_memory_layer(self.get_last_record_lsn(), &self.last_freeze_at)
.await;
}
/// Layer flusher task's main loop.
@@ -2774,7 +2776,9 @@ impl Timeline {
self.metrics.persistent_bytes_written.inc_by(sz);
}
guard.finish_flush_l0_layer(delta_layer_to_add, &frozen_layer).await;
guard
.finish_flush_l0_layer(delta_layer_to_add, &frozen_layer)
.await;
// release lock on 'layers'
}

View File

@@ -509,7 +509,7 @@ pub struct LayerFileManager<T: AsLayerDesc + ?Sized = dyn PersistentLayer>(
);
impl<T: AsLayerDesc + ?Sized> LayerFileManager<T> {
fn get_from_desc(&self, desc: &PersistentLayerDesc) -> Arc<T> {
pub(crate) fn get_from_desc(&self, desc: &PersistentLayerDesc) -> Arc<T> {
// The assumption for the `expect()` is that all code maintains the following invariant:
// A layer's descriptor is present in the LayerMap => the LayerFileManager contains a layer for the descriptor.
self.0
@@ -519,22 +519,22 @@ impl<T: AsLayerDesc + ?Sized> LayerFileManager<T> {
.clone()
}
fn insert(&self, layer: Arc<T>) {
pub(crate) fn insert(&self, layer: Arc<T>) {
let present = self.0.insert(layer.layer_desc().key(), layer.clone());
if present.is_some() && cfg!(debug_assertions) {
panic!("overwriting a layer: {:?}", layer.layer_desc())
}
}
fn contains(&self, layer: &Arc<T>) -> bool {
pub(crate) fn contains(&self, layer: &Arc<T>) -> bool {
self.0.contains_key(&layer.layer_desc().key())
}
fn new() -> Self {
pub(crate) fn new() -> Self {
Self(DashMap::new())
}
fn remove(&self, layer: Arc<T>) {
pub(crate) fn remove(&self, layer: Arc<T>) {
let present = self.0.remove(&layer.layer_desc().key());
if present.is_none() && cfg!(debug_assertions) {
panic!(
@@ -544,7 +544,7 @@ impl<T: AsLayerDesc + ?Sized> LayerFileManager<T> {
}
}
fn replace_and_verify(&self, expected: Arc<T>, new: Arc<T>) -> Result<()> {
pub(crate) fn replace_and_verify(&self, expected: Arc<T>, new: Arc<T>) -> Result<()> {
let key = expected.layer_desc().key();
let other = new.layer_desc().key();