Skip to content

Commit

Permalink
feat(core): implement IoBuf for Buffer (#4532)
Browse files Browse the repository at this point in the history
* feat(core): implement compio buf traits for Buffer

* remove BufVectoredIo impl

* style:fix fmt

* refactor: move into core

* doc: add license header

* style: fix fmt

* fix test
  • Loading branch information
George-Miao authored Apr 25, 2024
1 parent cdaf737 commit 95e6a0e
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 1 deletion.
1 change: 1 addition & 0 deletions core/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ hdfs-native = { version = "0.6.0", optional = true }
# for services-surrealdb
surrealdb = { version = "1.3.0", optional = true, features = ["protocol-http"] }
# for services-compfs
compio = { version = "0.10.0", optional = true, features = ["runtime"] }
compio = { version = "0.10.0", optional = true, features = ["runtime", "bytes", "polling"] }

# Layers
# for layers-async-backtrace
Expand Down
109 changes: 109 additions & 0 deletions core/src/services/compfs/core.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
// 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 compio::buf::IoBuf;

use crate::Buffer;

unsafe impl IoBuf for Buffer {
fn as_buf_ptr(&self) -> *const u8 {
self.current().as_ptr()
}

fn buf_len(&self) -> usize {
self.current().len()
}

fn buf_capacity(&self) -> usize {
// `Bytes` doesn't expose uninitialized capacity, so treat it as the same as `len`
self.current().len()
}
}

// TODO: impl IoVectoredBuf for Buffer
// impl IoVectoredBuf for Buffer {
// fn as_dyn_bufs(&self) -> impl Iterator<Item = &dyn IoBuf> {}
//
// fn owned_iter(self) -> Result<OwnedIter<impl OwnedIterator<Inner = Self>>, Self> {
// Ok(OwnedIter::new(BufferIter {
// current: self.current(),
// buf: self,
// }))
// }
// }

// #[derive(Debug, Clone)]
// struct BufferIter {
// buf: Buffer,
// current: Bytes,
// }

// impl IntoInner for BufferIter {
// type Inner = Buffer;
//
// fn into_inner(self) -> Self::Inner {
// self.buf
// }
// }

// impl OwnedIterator for BufferIter {
// fn next(mut self) -> Result<Self, Self::Inner> {
// let Some(current) = self.buf.next() else {
// return Err(self.buf);
// };
// self.current = current;
// Ok(self)
// }
//
// fn current(&self) -> &dyn IoBuf {
// &self.current
// }
// }

#[cfg(test)]
mod tests {
use super::*;
use bytes::{Buf, Bytes};
use rand::{thread_rng, Rng};

fn setup_buffer() -> (Buffer, usize, Bytes) {
let mut rng = thread_rng();

let bs = (0..100)
.map(|_| {
let len = rng.gen_range(1..100);
let mut buf = vec![0; len];
rng.fill(&mut buf[..]);
Bytes::from(buf)
})
.collect::<Vec<_>>();

let total_size = bs.iter().map(|b| b.len()).sum::<usize>();
let total_content = bs.iter().flatten().copied().collect::<Bytes>();
let buf = Buffer::from(bs);

(buf, total_size, total_content)
}

#[test]
fn test_io_buf() {
let (buf, _len, _bytes) = setup_buffer();
let slice = IoBuf::as_slice(&buf);

assert_eq!(slice, buf.current().chunk())
}
}
2 changes: 2 additions & 0 deletions core/src/services/compfs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

mod core;

0 comments on commit 95e6a0e

Please sign in to comment.