berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename to ChunkedContentEncoder.

This commit is contained in:
Yury Yarashevich 2023-10-18 13:00:32 +02:00
parent e3adb45f55
commit 3f518e0001
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
actix-http/src/encoding/encoder.rs
View File

@ -28,7 +28,7 @@ pin_project! {
pub struct Encoder<B> { pub struct Encoder<B> {
#[pin] #[pin]
body: EncoderBody<B>, body: EncoderBody<B>,
encoder: Option<Box<SelectedContentEncoder>>, encoder: Option<Box<ChunkedContentEncoder>>,
eof: bool, eof: bool,
} }
} }
@ -268,14 +268,14 @@ enum ContentEncoder {
Zstd(ZstdEncoder<'static, Writer>), Zstd(ZstdEncoder<'static, Writer>),
} }
struct SelectedContentEncoder { struct ChunkedContentEncoder {
content_encoder: ContentEncoder, content_encoder: ContentEncoder,
preferred_chunk_size: usize, preferred_chunk_size: usize,
chunk_ready_to_encode: Option<Bytes>, chunk_ready_to_encode: Option<Bytes>,
} }
impl ContentEncoder { impl ContentEncoder {
fn select(encoding: ContentEncoding) -> Option<Box<SelectedContentEncoder>> { fn select(encoding: ContentEncoding) -> Option<Box<ChunkedContentEncoder>> {
// Chunk size picked as max chunk size which took less that 50 µs to compress on "cargo bench --bench compression-chunk-size" // Chunk size picked as max chunk size which took less that 50 µs to compress on "cargo bench --bench compression-chunk-size"
// Rust 1.72 linux/arm64 in Docker on Apple M2 Pro: "time to compress chunk/deflate-16384" time: [39.114 µs 39.283 µs 39.457 µs] // Rust 1.72 linux/arm64 in Docker on Apple M2 Pro: "time to compress chunk/deflate-16384" time: [39.114 µs 39.283 µs 39.457 µs]
@ -289,7 +289,7 @@ impl ContentEncoder {
match encoding { match encoding {
#[cfg(feature = "compress-gzip")] #[cfg(feature = "compress-gzip")]
ContentEncoding::Deflate => Some(Box::new(SelectedContentEncoder { ContentEncoding::Deflate => Some(Box::new(ChunkedContentEncoder {
content_encoder: ContentEncoder::Deflate(ZlibEncoder::new( content_encoder: ContentEncoder::Deflate(ZlibEncoder::new(
Writer::new(), Writer::new(),
flate2::Compression::fast(), flate2::Compression::fast(),
@ -299,7 +299,7 @@ impl ContentEncoder {
})), })),
#[cfg(feature = "compress-gzip")] #[cfg(feature = "compress-gzip")]
ContentEncoding::Gzip => Some(Box::new(SelectedContentEncoder { ContentEncoding::Gzip => Some(Box::new(ChunkedContentEncoder {
content_encoder: ContentEncoder::Gzip(GzEncoder::new( content_encoder: ContentEncoder::Gzip(GzEncoder::new(
Writer::new(), Writer::new(),
flate2::Compression::fast(), flate2::Compression::fast(),
@ -309,7 +309,7 @@ impl ContentEncoder {
})), })),
#[cfg(feature = "compress-brotli")] #[cfg(feature = "compress-brotli")]
ContentEncoding::Brotli => Some(Box::new(SelectedContentEncoder { ContentEncoding::Brotli => Some(Box::new(ChunkedContentEncoder {
content_encoder: ContentEncoder::Brotli(new_brotli_compressor()), content_encoder: ContentEncoder::Brotli(new_brotli_compressor()),
preferred_chunk_size: MAX_BROTLI_CHUNK_SIZE, preferred_chunk_size: MAX_BROTLI_CHUNK_SIZE,
chunk_ready_to_encode: None, chunk_ready_to_encode: None,
@ -318,7 +318,7 @@ impl ContentEncoder {
#[cfg(feature = "compress-zstd")] #[cfg(feature = "compress-zstd")]
ContentEncoding::Zstd => { ContentEncoding::Zstd => {
let encoder = ZstdEncoder::new(Writer::new(), 3).ok()?; let encoder = ZstdEncoder::new(Writer::new(), 3).ok()?;
Some(Box::new(SelectedContentEncoder { Some(Box::new(ChunkedContentEncoder {
content_encoder: ContentEncoder::Zstd(encoder), content_encoder: ContentEncoder::Zstd(encoder),
preferred_chunk_size: MAX_ZSTD_CHUNK_SIZE, preferred_chunk_size: MAX_ZSTD_CHUNK_SIZE,
chunk_ready_to_encode: None, chunk_ready_to_encode: None,