From c5245a9e4fb1d908f9d567002de2b0b0ae7842b7 Mon Sep 17 00:00:00 2001
From: Konstantin Knizhnik <knizhnik@garret.ru>
Date: Thu, 6 Oct 2022 21:47:26 +0300
Subject: [PATCH] Make clippy happy

---
 pageserver/src/tenant.rs                | 14 +++++++-------
 pageserver/src/tenant/delta_layer.rs    |  2 +-
 pageserver/src/tenant/inmemory_layer.rs |  2 +-
 pageserver/src/tenant/layer_map.rs      |  5 +++--
 pageserver/src/tenant/timeline.rs       |  4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pageserver/src/tenant.rs b/pageserver/src/tenant.rs
index 320b6ffd4c..11290f895a 100644
--- a/pageserver/src/tenant.rs
+++ b/pageserver/src/tenant.rs
@@ -1741,7 +1741,7 @@ mod tests {
         drop(writer);
 
         tline.checkpoint(CheckpointConfig::Forced)?;
-        tline.compact()?;
+        tline.reconstruct()?;
 
         let writer = tline.writer();
         writer.put(*TEST_KEY, Lsn(0x20), &Value::Image(TEST_IMG("foo at 0x20")))?;
@@ -1749,7 +1749,7 @@ mod tests {
         drop(writer);
 
         tline.checkpoint(CheckpointConfig::Forced)?;
-        tline.compact()?;
+        tline.reconstruct()?;
 
         let writer = tline.writer();
         writer.put(*TEST_KEY, Lsn(0x30), &Value::Image(TEST_IMG("foo at 0x30")))?;
@@ -1757,7 +1757,7 @@ mod tests {
         drop(writer);
 
         tline.checkpoint(CheckpointConfig::Forced)?;
-        tline.compact()?;
+        tline.reconstruct()?;
 
         let writer = tline.writer();
         writer.put(*TEST_KEY, Lsn(0x40), &Value::Image(TEST_IMG("foo at 0x40")))?;
@@ -1765,7 +1765,7 @@ mod tests {
         drop(writer);
 
         tline.checkpoint(CheckpointConfig::Forced)?;
-        tline.compact()?;
+        tline.reconstruct()?;
 
         assert_eq!(tline.get(*TEST_KEY, Lsn(0x10))?, TEST_IMG("foo at 0x10"));
         assert_eq!(tline.get(*TEST_KEY, Lsn(0x1f))?, TEST_IMG("foo at 0x10"));
@@ -1813,7 +1813,7 @@ mod tests {
 
             tline.update_gc_info(Vec::new(), cutoff, Duration::ZERO)?;
             tline.checkpoint(CheckpointConfig::Forced)?;
-            tline.compact()?;
+            tline.reconstruct()?;
             tline.gc()?;
         }
 
@@ -1883,7 +1883,7 @@ mod tests {
             let cutoff = tline.get_last_record_lsn();
             tline.update_gc_info(Vec::new(), cutoff, Duration::ZERO)?;
             tline.checkpoint(CheckpointConfig::Forced)?;
-            tline.compact()?;
+            tline.reconstruct()?;
             tline.gc()?;
         }
 
@@ -1962,7 +1962,7 @@ mod tests {
             let cutoff = tline.get_last_record_lsn();
             tline.update_gc_info(Vec::new(), cutoff, Duration::ZERO)?;
             tline.checkpoint(CheckpointConfig::Forced)?;
-            tline.compact()?;
+            tline.reconstruct()?;
             tline.gc()?;
         }
 
diff --git a/pageserver/src/tenant/delta_layer.rs b/pageserver/src/tenant/delta_layer.rs
index 8dc8ca7743..f7814d612e 100644
--- a/pageserver/src/tenant/delta_layer.rs
+++ b/pageserver/src/tenant/delta_layer.rs
@@ -436,7 +436,7 @@ impl Layer for DeltaLayer {
             inner.index_root_blk,
             file,
         );
-        let search_key = DeltaKey::from_key_lsn(&key, Lsn(0));
+        let search_key = DeltaKey::from_key_lsn(key, Lsn(0));
         let mut found = false;
         reader.visit(
             &search_key.0,
diff --git a/pageserver/src/tenant/inmemory_layer.rs b/pageserver/src/tenant/inmemory_layer.rs
index 356dcc5f5c..54c3c3617d 100644
--- a/pageserver/src/tenant/inmemory_layer.rs
+++ b/pageserver/src/tenant/inmemory_layer.rs
@@ -238,7 +238,7 @@ impl Layer for InMemoryLayer {
 
     fn contains(&self, key: &Key) -> Result<bool> {
         let inner = self.inner.read().unwrap();
-        Ok(inner.index.get(&key).is_some())
+        Ok(inner.index.get(key).is_some())
     }
 }
 
diff --git a/pageserver/src/tenant/layer_map.rs b/pageserver/src/tenant/layer_map.rs
index 156459a754..5a5a396b10 100644
--- a/pageserver/src/tenant/layer_map.rs
+++ b/pageserver/src/tenant/layer_map.rs
@@ -276,11 +276,11 @@ impl LayerMap {
                 continue;
             }
             assert!(l.get_key_range().contains(&key));
-			/*
+            /*
             if !l.contains(&key)? {
                 continue;
             }
-			*/
+            */
             if l.get_lsn_range().start >= end_lsn {
                 info!(
                     "Candidate delta layer {}..{} is too new for lsn {}",
@@ -367,6 +367,7 @@ impl LayerMap {
     pub fn remove_historic(&mut self, layer: Arc<dyn Layer>) {
         if layer.get_key_range() == (Key::MIN..Key::MAX) {
             if let Some(latest_layer) = &self.latest_delta_layer {
+				#[allow(clippy::vtable_address_comparisons)]
                 if Arc::ptr_eq(&layer, latest_layer) {
                     self.latest_delta_layer = None;
                 }
diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs
index f716f4367c..bb84b83d5f 100644
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -1537,8 +1537,8 @@ impl Timeline {
         let mut new_layers = Vec::new();
         let mut last_key: Option<Key> = None;
         if let Some(last_delta_layer) = latest_delta_layer {
-			let end_lsn = last_delta_layer.get_lsn_range().end;
-			let lsn_range = end_lsn..end_lsn+1;
+            let end_lsn = last_delta_layer.get_lsn_range().end;
+            let lsn_range = end_lsn..end_lsn + 1;
             for (key, lsn, _) in last_delta_layer.key_iter(true) {
                 let value = self.get(key, lsn)?;
                 if let Some(curr_writer) = &writer {