This commit is contained in:
Peter Zhang 2025-07-01 23:00:27 +08:00
parent 75b05c38fd
commit 68f2168bbd
5 changed files with 5 additions and 6 deletions

View File

@ -15,7 +15,7 @@ mod zgs_grpc;
use crate::miner::RpcServer as MinerRpcServer; use crate::miner::RpcServer as MinerRpcServer;
use crate::types::SegmentWithProof; use crate::types::SegmentWithProof;
use crate::zgs_grpc::zgs_grpc::ZgsGrpcServiceImpl; use crate::zgs_grpc::r#impl::ZgsGrpcServiceImpl;
use crate::zgs_grpc_proto::zgs_grpc_service_server::ZgsGrpcServiceServer; use crate::zgs_grpc_proto::zgs_grpc_service_server::ZgsGrpcServiceServer;
use admin::RpcServer as AdminRpcServer; use admin::RpcServer as AdminRpcServer;
use chunk_pool::MemoryChunkPool; use chunk_pool::MemoryChunkPool;

View File

@ -129,13 +129,13 @@ impl TryFrom<zgs_grpc_proto::SegmentWithProof> for SegmentWithProof {
type Error = GrpcStatus; type Error = GrpcStatus;
fn try_from(grpc_segment: zgs_grpc_proto::SegmentWithProof) -> Result<Self, GrpcStatus> { fn try_from(grpc_segment: zgs_grpc_proto::SegmentWithProof) -> Result<Self, GrpcStatus> {
let root = grpc_segment.root.unwrap().try_into().map_err(|e| e)?; let root = grpc_segment.root.unwrap().try_into()?;
let data = grpc_segment.data; let data = grpc_segment.data;
// index is u64 in proto, usize in app // index is u64 in proto, usize in app
let index = grpc_segment.index.try_into().map_err(|_| { let index = grpc_segment.index.try_into().map_err(|_| {
GrpcStatus::invalid_argument(format!("Invalid segment index: {}", grpc_segment.index)) GrpcStatus::invalid_argument(format!("Invalid segment index: {}", grpc_segment.index))
})?; })?;
let proof = grpc_segment.proof.unwrap().try_into().map_err(|e| e)?; let proof = grpc_segment.proof.unwrap().try_into()?;
let file_size = grpc_segment.file_size.try_into().map_err(|_| { let file_size = grpc_segment.file_size.try_into().map_err(|_| {
GrpcStatus::invalid_argument(format!("Invalid file size: {}", grpc_segment.file_size)) GrpcStatus::invalid_argument(format!("Invalid file size: {}", grpc_segment.file_size))
})?; })?;

View File

@ -75,8 +75,7 @@ impl RpcServer for RpcServerImpl {
let maybe_tx = self.ctx.log_store.get_tx_by_seq_number(tx_seq).await?; let maybe_tx = self.ctx.log_store.get_tx_by_seq_number(tx_seq).await?;
for segment in segments.into_iter() { for segment in segments.into_iter() {
match rpc_helper::put_segment_with_maybe_tx(&self.ctx, segment, maybe_tx.clone()) match rpc_helper::put_segment_with_maybe_tx(&self.ctx, segment, maybe_tx.clone()).await
.await
{ {
Ok(()) => {} // success Ok(()) => {} // success
Err(e) Err(e)

View File

@ -1 +1 @@
pub mod zgs_grpc; pub mod r#impl;