From 6243b44dea61efec7961ef7fd4e01447b250bd22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arpad=20M=C3=BCller?= Date: Wed, 6 Sep 2023 20:54:57 +0200 Subject: [PATCH] Remove Virtual from FileBlockReaderVirtual variant name (#5225) With #5181, the generics for `FileBlockReader` have been removed, so having a `Virtual` postfix makes less sense now. --- pageserver/src/tenant/block_io.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pageserver/src/tenant/block_io.rs b/pageserver/src/tenant/block_io.rs index abb636579d..ab5b5e9fca 100644 --- a/pageserver/src/tenant/block_io.rs +++ b/pageserver/src/tenant/block_io.rs @@ -71,7 +71,7 @@ impl<'a> Deref for BlockLease<'a> { /// /// Unlike traits, we also support the read function to be async though. pub(crate) enum BlockReaderRef<'a> { - FileBlockReaderVirtual(&'a FileBlockReader), + FileBlockReader(&'a FileBlockReader), EphemeralFile(&'a EphemeralFile), Adapter(Adapter<&'a DeltaLayerInner>), #[cfg(test)] @@ -85,7 +85,7 @@ impl<'a> BlockReaderRef<'a> { async fn read_blk(&self, blknum: u32) -> Result { use BlockReaderRef::*; match self { - FileBlockReaderVirtual(r) => r.read_blk(blknum).await, + FileBlockReader(r) => r.read_blk(blknum).await, EphemeralFile(r) => r.read_blk(blknum).await, Adapter(r) => r.read_blk(blknum).await, #[cfg(test)] @@ -124,7 +124,7 @@ impl<'a> BlockCursor<'a> { // Needed by cli pub fn new_fileblockreader(reader: &'a FileBlockReader) -> Self { BlockCursor { - reader: BlockReaderRef::FileBlockReaderVirtual(reader), + reader: BlockReaderRef::FileBlockReader(reader), } } @@ -197,7 +197,7 @@ impl FileBlockReader { impl BlockReader for FileBlockReader { fn block_cursor(&self) -> BlockCursor<'_> { - BlockCursor::new(BlockReaderRef::FileBlockReaderVirtual(self)) + BlockCursor::new(BlockReaderRef::FileBlockReader(self)) } }