rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-15 09:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename LayerMapping -> LayerFileManager

Browse Source 
Signed-off-by: Alex Chi <chi@neon.tech>
This commit is contained in:
Alex Chi
2023-06-23 15:52:09 -04:00
parent 2b4f96345b
commit 4c4a531d5e
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pageserver/src/tenant/layer_map.rs
View File

@@ -660,7 +660,7 @@ mod tests {
use crate::tenant::{
storage_layer::{PersistentLayer, PersistentLayerDesc},
timeline::LayerMapping,
timeline::LayerFileManager,
};
use super::*;
@@ -712,7 +712,7 @@ mod tests {
// and can remove it in the future.
let _map = LayerMap::default();
let mut mapping = LayerMapping::new();
let mut mapping = LayerFileManager::new();
mapping
.replace_and_verify(not_found, new_version)
@@ -727,7 +727,7 @@ mod tests {
let downloaded = Arc::new(skeleton);
let mut map = LayerMap::default();
let mut mapping = LayerMapping::new();
let mut 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.

16
pageserver/src/tenant/timeline.rs
View File

@@ -120,12 +120,12 @@ impl PartialOrd for Hole {
}
}
pub struct LayerMapping(HashMap<PersistentLayerKey, Arc<dyn PersistentLayer>>);
pub struct LayerFileManager(HashMap<PersistentLayerKey, Arc<dyn PersistentLayer>>);
impl LayerMapping {
impl LayerFileManager {
fn get_from_desc(&self, desc: &PersistentLayerDesc) -> Arc<dyn PersistentLayer> {
// The assumption for the `expect()` is that all code maintains the following invariant:
// A layer's descriptor is present in the LayerMap => the LayerMapping contains a layer for the descriptor.
// A layer's descriptor is present in the LayerMap => the LayerFileManager contains a layer for the descriptor.
self.0.get(&desc.key()).expect("not found").clone()
}
@@ -216,7 +216,7 @@ pub struct Timeline {
pub pg_version: u32,
pub(crate) layers: tokio::sync::RwLock<(LayerMap, LayerMapping)>,
pub(crate) layers: tokio::sync::RwLock<(LayerMap, LayerFileManager)>,
/// Set of key ranges which should be covered by image layers to
/// allow GC to remove old layers. This set is created by GC and its cutoff LSN is also stored.
@@ -1285,7 +1285,7 @@ impl Timeline {
_layer_removal_cs: &tokio::sync::MutexGuard<'_, ()>,
local_layer: &Arc<dyn PersistentLayer>,
batch_updates: &mut BatchedUpdates<'_>,
mapping: &mut LayerMapping,
mapping: &mut LayerFileManager,
) -> anyhow::Result<bool> {
if local_layer.is_remote_layer() {
// TODO(issue #3851): consider returning an err here instead of false,
@@ -1504,7 +1504,7 @@ impl Timeline {
timeline_id,
tenant_id,
pg_version,
layers: tokio::sync::RwLock::new((LayerMap::default(), LayerMapping::new())),
layers: tokio::sync::RwLock::new((LayerMap::default(), LayerFileManager::new())),
wanted_image_layers: Mutex::new(None),
walredo_mgr,
@@ -2379,7 +2379,7 @@ impl Timeline {
_layer_removal_cs: Arc<tokio::sync::OwnedMutexGuard<()>>,
layer: Arc<PersistentLayerDesc>,
updates: &mut BatchedUpdates<'_>,
mapping: &mut LayerMapping,
mapping: &mut LayerFileManager,
) -> anyhow::Result<()> {
let layer = mapping.get_from_desc(&layer);
if !layer.is_remote_layer() {
@@ -3007,7 +3007,7 @@ impl Timeline {
fail_point!("flush-frozen-before-sync");
// The new on-disk layers are now in the layer map. We can remove the
// in-memory layer from the map now. We do not modify `LayerMapping` because
// in-memory layer from the map now. We do not modify `LayerFileManager` because
// it only contains persistent layers. The flushed layer is stored in
// the mapping in `create_delta_layer`.
{