Xuanwo commented on code in PR #2006: URL: https://github.com/apache/incubator-opendal/pull/2006#discussion_r1167572818
########## core/src/layers/madsim.rs: ########## @@ -0,0 +1,358 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +use crate::ops::{OpList, OpRead, OpScan, OpWrite}; +use crate::raw::oio::Entry; +use crate::raw::{oio, Accessor, Layer, LayeredAccessor, RpList, RpRead, RpScan, RpWrite}; +use async_trait::async_trait; +use bytes::Bytes; +use madsim::net::Endpoint; +use madsim::net::Payload; +use std::collections::HashMap; +use std::fmt::Debug; +use std::io::Result; +use std::io::SeekFrom; +use std::net::SocketAddr; +use std::sync::Arc; +use std::sync::Mutex; +use std::task::{Context, Poll}; + +#[derive(Debug, Copy, Clone)] +pub struct MadsimLayer { + sim_server_socket: SocketAddr, +} + +impl MadsimLayer { + pub fn new(sim_server_socket: SocketAddr) -> Self { + Self { sim_server_socket } + } +} + +impl<A: Accessor> Layer<A> for MadsimLayer { + type LayeredAccessor = MadsimAccessor; + + fn layer(&self, _inner: A) -> Self::LayeredAccessor { + MadsimAccessor { + sim_server_socket: self.sim_server_socket, + } + } +} + +#[derive(Debug)] +pub struct MadsimAccessor { + sim_server_socket: SocketAddr, +} + +#[async_trait] +impl LayeredAccessor for MadsimAccessor { + type Inner = (); + type Reader = MadsimReader; + type BlockingReader = MadsimReader; + type Writer = MadsimWriter; + type BlockingWriter = MadsimWriter; + type Pager = MadsimPager; + type BlockingPager = MadsimPager; + + fn inner(&self) -> &Self::Inner { + &() + } + + async fn read(&self, path: &str, args: OpRead) -> crate::Result<(RpRead, Self::Reader)> { + let req = Request::Read(path.to_string(), args); + let ep = Endpoint::connect(self.sim_server_socket) + .await + .expect("fail to connect to sim server"); + let (tx, mut rx) = ep + .connect1(self.sim_server_socket) + .await + .expect("fail to connect1 to sim server"); + tx.send(Box::new(req)) + .await + .expect("fail to send request to sim server"); + let resp = rx + .recv() + .await + .expect("fail to recv response from sim server"); + let resp = resp + .downcast::<ReadResponse>() + .expect("fail to downcast response to ReadResponse"); + let content_length = resp.data.as_ref().map(|b| b.len()).unwrap_or(0); + Ok(( + RpRead::new(content_length as u64), + MadsimReader { data: resp.data }, + )) + } + + async fn write(&self, path: &str, args: OpWrite) -> crate::Result<(RpWrite, Self::Writer)> { + Ok(( + RpWrite::default(), + MadsimWriter { + path: path.to_string(), + args, + sim_server_socket: self.sim_server_socket, + }, + )) + } + + async fn list(&self, path: &str, args: OpList) -> crate::Result<(RpList, Self::Pager)> { + todo!() + } + + async fn scan(&self, path: &str, args: OpScan) -> crate::Result<(RpScan, Self::Pager)> { + todo!() + } + + fn blocking_read( + &self, + path: &str, + args: OpRead, + ) -> crate::Result<(RpRead, Self::BlockingReader)> { + panic!("blocking_read is not supported in MadsimLayer"); + } + + fn blocking_write( + &self, + path: &str, + args: OpWrite, + ) -> crate::Result<(RpWrite, Self::BlockingWriter)> { + panic!("blocking_write is not supported in MadsimLayer"); + } + + fn blocking_list( + &self, + path: &str, + args: OpList, + ) -> crate::Result<(RpList, Self::BlockingPager)> { + panic!("blocking_list is not supported in MadsimLayer"); + } + + fn blocking_scan( + &self, + path: &str, + args: OpScan, + ) -> crate::Result<(RpScan, Self::BlockingPager)> { + panic!("blocking_scan is not supported in MadsimLayer"); + } +} + +pub struct MadsimReader { + data: Option<Bytes>, +} + +impl oio::Read for MadsimReader { + fn poll_read(&mut self, _cx: &mut Context<'_>, buf: &mut [u8]) -> Poll<crate::Result<usize>> { + if let Some(ref data) = self.data { + let len = data.len(); + buf[..len].copy_from_slice(data); + Poll::Ready(Ok(len)) + } else { + Poll::Ready(Ok(0)) + } + } + + fn poll_seek(&mut self, cx: &mut Context<'_>, pos: SeekFrom) -> Poll<crate::Result<u64>> { + todo!() + } + + fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Option<crate::Result<Bytes>>> { + todo!() + } +} + +impl oio::BlockingRead for MadsimReader { + fn read(&mut self, buf: &mut [u8]) -> crate::Result<usize> { + todo!() + } + + fn seek(&mut self, pos: SeekFrom) -> crate::Result<u64> { + todo!() + } + + fn next(&mut self) -> Option<crate::Result<Bytes>> { + todo!() + } +} + +pub struct MadsimWriter { + path: String, + args: OpWrite, + sim_server_socket: SocketAddr, +} + +impl oio::BlockingWrite for MadsimWriter { + fn write(&mut self, bs: Bytes) -> crate::Result<()> { + todo!() + } + + fn append(&mut self, bs: Bytes) -> crate::Result<()> { + todo!() + } + + fn close(&mut self) -> crate::Result<()> { + todo!() + } +} + +#[async_trait] +impl oio::Write for MadsimWriter { + async fn write(&mut self, bs: Bytes) -> crate::Result<()> { + let req = Request::Write(self.path.to_string(), bs); + let ep = Endpoint::connect(self.sim_server_socket) + .await + .expect("fail to connect to sim server"); + let (tx, mut rx) = ep + .connect1(self.sim_server_socket) + .await + .expect("fail to connect1 to sim server"); + tx.send(Box::new(req)) + .await + .expect("fail to send request to sim server"); + rx.recv() + .await + .expect("fail to recv response from sim server"); + Ok(()) + } + + async fn append(&mut self, bs: Bytes) -> crate::Result<()> { + todo!() + } + + async fn abort(&mut self) -> crate::Result<()> { + todo!() + } + + async fn close(&mut self) -> crate::Result<()> { + Ok(()) + } +} + +pub struct MadsimPager {} + +#[async_trait] +impl oio::Page for MadsimPager { + async fn next(&mut self) -> crate::Result<Option<Vec<Entry>>> { + todo!() + } +} + +impl oio::BlockingPage for MadsimPager { + fn next(&mut self) -> crate::Result<Option<Vec<Entry>>> { + todo!() + } +} + +/// A simulated server. +#[derive(Default, Clone)] +pub struct SimServer; + +impl SimServer { + pub async fn serve(addr: SocketAddr) -> Result<()> { Review Comment: After a re-visit of madsim's code, I found that it's not required to use `madsim::net` for simlulation. Instead, we can implement `Simulator` trait directly. The `Simulator` is defined at https://github.com/madsim-rs/madsim/blob/main/madsim/src/sim/plugin.rs And a real example is `FsSim`: https://github.com/madsim-rs/madsim/blob/main/madsim/src/sim/fs.rs In `FsSim`, madsim use `Mutex<HashMap<NodeId, FsNodeHandle>>` for simlulation. ```rust impl Simulator for FsSim { fn new(_rand: &GlobalRng, _time: &TimeHandle, _config: &Config) -> Self { Default::default() } fn create_node(&self, id: NodeId) { let mut handles = self.handles.lock(); handles.insert(id, FsNodeHandle::new()); } fn reset_node(&self, id: NodeId) { self.power_fail(id); } } ``` I think we can borrow the idea here too. We can use a `Mutex<HashMap<String, (Metadata, Bytes)>>` for simulate a storage service. And implement `Simulator` for this. In this way, we don't need to play with `SimServer` anymore. ########## core/src/layers/mod.rs: ########## @@ -21,34 +21,55 @@ mod concurrent_limit; pub use concurrent_limit::ConcurrentLimitLayer; mod immutable_index; + Review Comment: Please remove all unrelated new line in this file. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
