From 578b7f1668c30dbd23cffb1165bddbaf8dd22f4d Mon Sep 17 00:00:00 2001 From: Elizabeth Murray Date: Wed, 28 May 2025 13:10:09 -0700 Subject: [PATCH] Remove "pub" for module module in pageserver_page_api. --- pageserver/client_grpc/src/lib.rs | 7 +++---- pageserver/page_api/src/lib.rs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pageserver/client_grpc/src/lib.rs b/pageserver/client_grpc/src/lib.rs index d846d6e09f..00c4d9ebf4 100644 --- a/pageserver/client_grpc/src/lib.rs +++ b/pageserver/client_grpc/src/lib.rs @@ -13,7 +13,6 @@ use bytes::Bytes; use futures::{StreamExt}; use thiserror::Error; use tonic::metadata::AsciiMetadataValue; -use pageserver_page_api::model::*; use pageserver_page_api::proto; use pageserver_page_api::proto::PageServiceClient; use utils::shard::ShardIndex; @@ -29,7 +28,7 @@ pub enum PageserverClientError { #[error("could not perform request: {0}`")] RequestError(#[from] tonic::Status), #[error("protocol error: {0}")] - ProtocolError(#[from] ProtocolError), + ProtocolError(#[from] pageserver_page_api::ProtocolError), #[error("could not perform request: {0}`")] InvalidUri(#[from] http::uri::InvalidUri), #[error("could not perform request: {0}`")] @@ -73,7 +72,7 @@ impl PageserverClient { pub async fn get_page( &self, shard: ShardIndex, - request: GetPageRequest, + request: pageserver_page_api::GetPageRequest, ) -> Result, PageserverClientError> { // FIXME: calculate the shard number correctly let chan = self.get_client(shard).await?; @@ -100,7 +99,7 @@ impl PageserverClient { return Err(PageserverClientError::RequestError(status)); } Ok(resp) => { - let response: GetPageResponse = resp.try_into().unwrap(); + let response: pageserver_page_api::GetPageResponse = resp.try_into().unwrap(); return Ok(response.page_images.to_vec()); } } diff --git a/pageserver/page_api/src/lib.rs b/pageserver/page_api/src/lib.rs index 1f656deb80..f515f27f3e 100644 --- a/pageserver/page_api/src/lib.rs +++ b/pageserver/page_api/src/lib.rs @@ -18,6 +18,6 @@ pub mod proto { pub use page_service_server::{PageService, PageServiceServer}; } -pub mod model; +mod model; pub use model::*;