From 6b5253abb227a6b45eaad047984bbda97da613b6 Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian@neon.tech>
Date: Thu, 2 Feb 2023 11:33:59 +0100
Subject: [PATCH] strip `new_` prefix from  LayerAccessStats constructors

---
 pageserver/src/tenant/storage_layer.rs             | 4 ++--
 pageserver/src/tenant/storage_layer/delta_layer.rs | 4 ++--
 pageserver/src/tenant/storage_layer/image_layer.rs | 4 ++--
 pageserver/src/tenant/timeline.rs                  | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pageserver/src/tenant/storage_layer.rs b/pageserver/src/tenant/storage_layer.rs
index fd9c66f054..d40e87114a 100644
--- a/pageserver/src/tenant/storage_layer.rs
+++ b/pageserver/src/tenant/storage_layer.rs
@@ -212,13 +212,13 @@ impl LayerAccessStats {
     const LAST_ACCESSES_MAX_LEN: usize = 16;
     const LAST_RESIDENCE_CHANGES_MAX_LEN: usize = 16;
 
-    pub(crate) fn new_for_loading_layer(residence_status: LayerResidenceStatus) -> Self {
+    pub(crate) fn for_loading_layer(residence_status: LayerResidenceStatus) -> Self {
         let new = LayerAccessStats(Mutex::new(LayerAccessStatsInner::default()));
         new.record_residence_change(residence_status);
         new
     }
 
-    pub(crate) fn new_for_new_layer_file() -> Self {
+    pub(crate) fn for_new_layer_file() -> Self {
         let new = LayerAccessStats(Mutex::new(LayerAccessStatsInner::default()));
         new.record_residence_change(LayerResidenceStatus::created());
         new
diff --git a/pageserver/src/tenant/storage_layer/delta_layer.rs b/pageserver/src/tenant/storage_layer/delta_layer.rs
index fdbbc16cef..f23bb3a3ff 100644
--- a/pageserver/src/tenant/storage_layer/delta_layer.rs
+++ b/pageserver/src/tenant/storage_layer/delta_layer.rs
@@ -621,7 +621,7 @@ impl DeltaLayer {
             key_range: summary.key_range,
             lsn_range: summary.lsn_range,
             file_size: metadata.len(),
-            access_stats: LayerAccessStats::new_for_loading_layer(LayerResidenceStatus::resident()),
+            access_stats: LayerAccessStats::for_loading_layer(LayerResidenceStatus::resident()),
             inner: RwLock::new(DeltaLayerInner {
                 loaded: false,
                 file: None,
@@ -792,7 +792,7 @@ impl DeltaLayerWriterInner {
             key_range: self.key_start..key_end,
             lsn_range: self.lsn_range.clone(),
             file_size: metadata.len(),
-            access_stats: LayerAccessStats::new_for_new_layer_file(),
+            access_stats: LayerAccessStats::for_new_layer_file(),
             inner: RwLock::new(DeltaLayerInner {
                 loaded: false,
                 file: None,
diff --git a/pageserver/src/tenant/storage_layer/image_layer.rs b/pageserver/src/tenant/storage_layer/image_layer.rs
index 4219b8fc06..e834d31cb0 100644
--- a/pageserver/src/tenant/storage_layer/image_layer.rs
+++ b/pageserver/src/tenant/storage_layer/image_layer.rs
@@ -422,7 +422,7 @@ impl ImageLayer {
             key_range: summary.key_range,
             lsn: summary.lsn,
             file_size: metadata.len(),
-            access_stats: LayerAccessStats::new_for_loading_layer(LayerResidenceStatus::resident()),
+            access_stats: LayerAccessStats::for_loading_layer(LayerResidenceStatus::resident()),
             inner: RwLock::new(ImageLayerInner {
                 file: None,
                 loaded: false,
@@ -582,7 +582,7 @@ impl ImageLayerWriterInner {
             key_range: self.key_range.clone(),
             lsn: self.lsn,
             file_size: metadata.len(),
-            access_stats: LayerAccessStats::new_for_new_layer_file(),
+            access_stats: LayerAccessStats::for_new_layer_file(),
             inner: RwLock::new(ImageLayerInner {
                 loaded: false,
                 file: None,
diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs
index 662dd58a78..a59ee6ae2f 100644
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -1165,7 +1165,7 @@ impl Timeline {
                     self.tenant_id,
                     &imgfilename,
                     file_size,
-                    LayerAccessStats::new_for_loading_layer(LayerResidenceStatus::resident()),
+                    LayerAccessStats::for_loading_layer(LayerResidenceStatus::resident()),
                 );
 
                 trace!("found layer {}", layer.path().display());
@@ -1197,7 +1197,7 @@ impl Timeline {
                     self.tenant_id,
                     &deltafilename,
                     file_size,
-                    LayerAccessStats::new_for_loading_layer(LayerResidenceStatus::resident()),
+                    LayerAccessStats::for_loading_layer(LayerResidenceStatus::resident()),
                 );
 
                 trace!("found layer {}", layer.path().display());
@@ -1335,7 +1335,7 @@ impl Timeline {
                         self.timeline_id,
                         imgfilename,
                         &remote_layer_metadata,
-                        LayerAccessStats::new_for_loading_layer(LayerResidenceStatus::evicted()),
+                        LayerAccessStats::for_loading_layer(LayerResidenceStatus::evicted()),
                     );
                     let remote_layer = Arc::new(remote_layer);
 
@@ -1360,7 +1360,7 @@ impl Timeline {
                         self.timeline_id,
                         deltafilename,
                         &remote_layer_metadata,
-                        LayerAccessStats::new_for_loading_layer(LayerResidenceStatus::evicted()),
+                        LayerAccessStats::for_loading_layer(LayerResidenceStatus::evicted()),
                     );
                     let remote_layer = Arc::new(remote_layer);
                     updates.insert_historic(remote_layer);