fix merge conflicts

Signed-off-by: Alex Chi <chi@neon.tech>

pageserver/src/tenant/layer_cache.rs

@@ -1,6 +1,7 @@
 use super::storage_layer::{PersistentLayer, PersistentLayerDesc, PersistentLayerKey, RemoteLayer};
 use super::Timeline;
-use crate::tenant::layer_map::{self, LayerMap};
+use crate::tenant::layer_map::{ LayerMap};
+use crate::tenant::timeline::compare_arced_layers;
 use anyhow::Result;
 use std::sync::{Mutex, Weak};
 use std::{collections::HashMap, sync::Arc};
@@ -114,7 +115,7 @@ impl LayerCache {
 
         if let Some(layer) = guard.get_mut(&expected.layer_desc().key()) {
             anyhow::ensure!(
-                layer_map::compare_arced_layers(&expected, layer),
+                compare_arced_layers(&expected, layer),
                 "replacing downloaded layer into layermap failed because another layer was found instead of expected, expected={expected:?}, new={new:?}",
                 expected = Arc::as_ptr(&expected),
                 new = Arc::as_ptr(layer),

pageserver/src/tenant/layer_map.rs

@@ -658,10 +658,6 @@ mod tests {
 
     mod l0_delta_layers_updated {
 
-        use crate::tenant::{
-            storage_layer::{PersistentLayer, PersistentLayerDesc},
-            timeline::LayerFileManager,
-        };
         use crate::tenant::storage_layer::{PersistentLayer, PersistentLayerDesc};
 
         use super::*;

pageserver/src/tenant/timeline.rs

@@ -123,7 +123,7 @@ impl PartialOrd for Hole {
 
 pub struct LayerFileManager(());
 
-impl LayerMapping {
+impl LayerFileManager {
     pub(crate) fn new() -> Self {
         Self(())
     }
@@ -152,7 +152,7 @@ pub struct Timeline {
 
     pub pg_version: u32,
 
-    pub(crate) layers: tokio::sync::RwLock<(LayerMap, LayerMapping)>,
+    pub(crate) layers: Arc<tokio::sync::RwLock<(LayerMap, LayerFileManager)>>,
 
     pub(super) lcache: LayerCache,