diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs index c21d5a6acc..ebcff1f2ac 100644 --- a/pageserver/src/page_service.rs +++ b/pageserver/src/page_service.rs @@ -494,22 +494,22 @@ impl PageServerHandler { PagestreamFeMessage::Exists(req) => SMGR_QUERY_TIME .with_label_values(&["get_rel_exists", &tenant_id, &timeline_id]) .observe_closure_duration(|| { - self.handle_get_rel_exists_request(timeline.as_ref(), &req) + self.handle_get_rel_exists_request(&timeline, &req) }), PagestreamFeMessage::Nblocks(req) => SMGR_QUERY_TIME .with_label_values(&["get_rel_size", &tenant_id, &timeline_id]) .observe_closure_duration(|| { - self.handle_get_nblocks_request(timeline.as_ref(), &req) + self.handle_get_nblocks_request(&timeline, &req) }), PagestreamFeMessage::GetPage(req) => SMGR_QUERY_TIME .with_label_values(&["get_page_at_lsn", &tenant_id, &timeline_id]) .observe_closure_duration(|| { - self.handle_get_page_at_lsn_request(timeline.as_ref(), &req) + self.handle_get_page_at_lsn_request(&timeline, &req) }), PagestreamFeMessage::DbSize(req) => SMGR_QUERY_TIME .with_label_values(&["get_db_size", &tenant_id, &timeline_id]) .observe_closure_duration(|| { - self.handle_db_size_request(timeline.as_ref(), &req) + self.handle_db_size_request(&timeline, &req) }), }; diff --git a/pageserver/src/pgdatadir_mapping.rs b/pageserver/src/pgdatadir_mapping.rs index 0ace850a82..0f0bb1ed53 100644 --- a/pageserver/src/pgdatadir_mapping.rs +++ b/pageserver/src/pgdatadir_mapping.rs @@ -1391,7 +1391,7 @@ fn is_slru_block_key(key: Key) -> bool { #[cfg(test)] pub fn create_test_timeline( - repo: crate::layered_repository::Repository, + repo: &crate::layered_repository::Repository, timeline_id: utils::zid::ZTimelineId, ) -> Result> { let tline = repo.create_empty_timeline(timeline_id, Lsn(8))?; diff --git a/pageserver/src/walingest.rs b/pageserver/src/walingest.rs index f3789d43e3..c0965e7a22 100644 --- a/pageserver/src/walingest.rs +++ b/pageserver/src/walingest.rs @@ -1062,7 +1062,7 @@ mod tests { #[test] fn test_relsize() -> Result<()> { let repo = RepoHarness::create("test_relsize")?.load(); - let tline = create_test_timeline(repo, TIMELINE_ID)?; + let tline = create_test_timeline(&repo, TIMELINE_ID)?; let mut walingest = init_walingest_test(&*tline)?; let mut m = tline.begin_modification(Lsn(0x20)); @@ -1190,7 +1190,7 @@ mod tests { #[test] fn test_drop_extend() -> Result<()> { let repo = RepoHarness::create("test_drop_extend")?.load(); - let tline = create_test_timeline(repo, TIMELINE_ID)?; + let tline = create_test_timeline(&repo, TIMELINE_ID)?; let mut walingest = init_walingest_test(&*tline)?; let mut m = tline.begin_modification(Lsn(0x20)); @@ -1230,7 +1230,7 @@ mod tests { #[test] fn test_truncate_extend() -> Result<()> { let repo = RepoHarness::create("test_truncate_extend")?.load(); - let tline = create_test_timeline(repo, TIMELINE_ID)?; + let tline = create_test_timeline(&repo, TIMELINE_ID)?; let mut walingest = init_walingest_test(&*tline)?; // Create a 20 MB relation (the size is arbitrary) @@ -1318,7 +1318,7 @@ mod tests { #[test] fn test_large_rel() -> Result<()> { let repo = RepoHarness::create("test_large_rel")?.load(); - let tline = create_test_timeline(repo, TIMELINE_ID)?; + let tline = create_test_timeline(&repo, TIMELINE_ID)?; let mut walingest = init_walingest_test(&*tline)?; let mut lsn = 0x10;