Skip to content

fix(oio::BlockWrite): fix write_once case #3953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xuanwo merged 1 commit into from
Jan 9, 2024
Merged

fix(oio::BlockWrite): fix write_once case #3953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions core/src/raw/oio/write/block_write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,11 @@ where
match &mut self.state {
State::Idle => {
if self.futures.has_remaining() {
// Fill cache with the first write.
if self.cache.is_none() {
let size = self.fill_cache(bs);
return Poll::Ready(Ok(size));
}
let cache = self.cache.take().expect("pending write must exist");
let block_id = uuid::Uuid::new_v4().to_string();
self.block_ids.push(block_id.clone());
Expand Down Expand Up @@ -185,6 +190,26 @@ where
State::Idle => {
let w = self.w.clone();
let block_ids = self.block_ids.clone();

if self.block_ids.is_empty() {
match &self.cache {
Some(cache) => {
let w = self.w.clone();
let bs = cache.clone();
self.state = State::Close(Box::pin(async move {
let size = bs.len();
w.write_once(size as u64, AsyncBody::ChunkedBytes(bs)).await
}));
}
None => {
let w = self.w.clone();
// Call write_once if there is no data in cache.
self.state = State::Close(Box::pin(async move {
w.write_once(0, AsyncBody::Empty).await
}));
}
}
}
if self.futures.is_empty() && self.cache.is_none() {
self.state =
State::Close(Box::pin(
Expand Down