From 63da722b9976857e79d766b4b0f181cc14ba238b Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Thu, 17 Aug 2023 01:38:53 +0300 Subject: [PATCH] refactor: remove now unused Layer imports --- pageserver/src/tenant/layer_map.rs | 1 - pageserver/src/tenant/timeline.rs | 2 +- pageserver/src/tenant/timeline/layer_manager.rs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pageserver/src/tenant/layer_map.rs b/pageserver/src/tenant/layer_map.rs index 59813b19d5..b8185da010 100644 --- a/pageserver/src/tenant/layer_map.rs +++ b/pageserver/src/tenant/layer_map.rs @@ -50,7 +50,6 @@ use crate::context::RequestContext; use crate::keyspace::KeyPartitioning; use crate::repository::Key; use crate::tenant::storage_layer::InMemoryLayer; -use crate::tenant::storage_layer::Layer; use anyhow::Result; use std::collections::VecDeque; use std::ops::Range; diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs index 5913686bfe..571e4cb072 100644 --- a/pageserver/src/tenant/timeline.rs +++ b/pageserver/src/tenant/timeline.rs @@ -95,7 +95,7 @@ use super::config::TenantConf; use super::remote_timeline_client::index::IndexPart; use super::remote_timeline_client::RemoteTimelineClient; use super::storage_layer::{ - AsLayerDesc, DeltaLayer, ImageLayer, Layer, LayerAccessStatsReset, PersistentLayerDesc, + AsLayerDesc, DeltaLayer, ImageLayer, LayerAccessStatsReset, PersistentLayerDesc, }; #[derive(Debug, PartialEq, Eq, Clone, Copy)] diff --git a/pageserver/src/tenant/timeline/layer_manager.rs b/pageserver/src/tenant/timeline/layer_manager.rs index 40212265cf..abeac55346 100644 --- a/pageserver/src/tenant/timeline/layer_manager.rs +++ b/pageserver/src/tenant/timeline/layer_manager.rs @@ -12,7 +12,7 @@ use crate::{ tenant::{ layer_map::{BatchedUpdates, LayerMap}, storage_layer::{ - AsLayerDesc, DeltaLayer, ImageLayer, InMemoryLayer, Layer, PersistentLayer, + AsLayerDesc, DeltaLayer, ImageLayer, InMemoryLayer, PersistentLayer, PersistentLayerDesc, PersistentLayerKey, RemoteLayer, }, timeline::compare_arced_layers,