Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions crates/async-compression/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ tokio = { version = "1.38.2", default-features = false, features = [
"macros",
"rt-multi-thread",
"io-std",
"fs",
] }
tokio-util = { version = "0.7", default-features = false, features = ["io"] }

Expand Down Expand Up @@ -131,6 +132,10 @@ required-features = ["zstd", "tokio"]
name = "zstd-window-size"
required-features = ["zstd", "tokio"]

[[test]]
name = "zstd-bufread"
required-features = ["zstd", "tokio"]

[[example]]
name = "zlib_tokio_write"
required-features = ["zlib", "tokio"]
Expand Down
Binary file not shown.
13 changes: 13 additions & 0 deletions crates/async-compression/tests/zstd-bufread.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
use async_compression::tokio::bufread::ZstdDecoder;

#[tokio::test]
async fn multiple_frames() {
let llvm_as = tokio::fs::File::open("tests/artifacts/llvm-as.zstd")
.await
.unwrap();
let buffered = tokio::io::BufReader::new(llvm_as);
let mut decoder = ZstdDecoder::new(buffered);
let mut out = Vec::new();
tokio::io::copy(&mut decoder, &mut out).await.unwrap();
assert_eq!(out.len(), 4401672)
}
7 changes: 6 additions & 1 deletion crates/compression-codecs/src/zstd/decoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ impl Decode for ZstdDecoder {
.run_on_buffers(input.unwritten(), output.unwritten_mut())?;
input.advance(status.bytes_read);
output.advance(status.bytes_written);
Ok(status.remaining == 0)

// See docs on remaining field
let finished_frame = status.remaining == 0;
// ... && "no more data"
let done = finished_frame && status.bytes_read == 0;
Ok(done)
}

fn flush(
Expand Down
Loading