Skip to content

Commit

Permalink
Optimize FromRequest for Bytes
Browse files Browse the repository at this point in the history
… and introduce FromRequest for BytesMut.

The more complex implementation is _currently_ faster, but will likely
be simplified to use http-body-util helpers again once the performance
of those catches up.

Co-authored-by: Yann Simon <yann.simon@commercetools.com>
  • Loading branch information
jplatte and yanns committed Feb 22, 2024
1 parent 62324aa commit ab2b9e7
Showing 1 changed file with 72 additions and 7 deletions.
79 changes: 72 additions & 7 deletions axum-core/src/extract/request_parts.rs
@@ -1,8 +1,9 @@
use super::{rejection::*, FromRequest, FromRequestParts, Request};
use crate::{body::Body, RequestExt};
use async_trait::async_trait;
use bytes::Bytes;
use bytes::{Buf as _, BufMut, Bytes, BytesMut};
use http::{request::Parts, Extensions, HeaderMap, Method, Uri, Version};
use http_body::Body as _;
use http_body_util::BodyExt;
use std::convert::Infallible;

Expand Down Expand Up @@ -71,6 +72,37 @@ where
}
}

#[async_trait]
impl<S> FromRequest<S> for BytesMut
where
S: Send + Sync,
{
type Rejection = BytesRejection;

async fn from_request(req: Request, _: &S) -> Result<Self, Self::Rejection> {
let mut body = req.into_limited_body();
let mut bytes = BytesMut::new();
body_to_bytes_mut(&mut body, &mut bytes).await?;
Ok(bytes)
}
}

async fn body_to_bytes_mut(body: &mut Body, bytes: &mut BytesMut) -> Result<(), BytesRejection> {
while let Some(frame) = body
.frame()
.await
.transpose()
.map_err(FailedToBufferBody::from_err)?
{
let Ok(data) = frame.into_data() else {
return Ok(());
};
bytes.put(data);
}

Ok(())
}

#[async_trait]
impl<S> FromRequest<S> for Bytes
where
Expand All @@ -79,14 +111,47 @@ where
type Rejection = BytesRejection;

async fn from_request(req: Request, _: &S) -> Result<Self, Self::Rejection> {
let bytes = req
.into_limited_body()
.collect()
let mut body = req.into_limited_body();

// If there's only 1 chunk, we can just return Buf::to_bytes()
let first_chunk = if let Some(frame) = body
.frame()
.await
.transpose()
.map_err(FailedToBufferBody::from_err)?
.to_bytes();

Ok(bytes)
{
let Ok(first_chunk) = frame.into_data() else {
return Ok(Bytes::new());
};
first_chunk
} else {
return Ok(Bytes::new());
};

let mut bytes = if let Some(frame) = body
.frame()
.await
.transpose()
.map_err(FailedToBufferBody::from_err)?
{
let Ok(second_chunk) = frame.into_data() else {
return Ok(first_chunk);
};

let cap = first_chunk.remaining()
+ second_chunk.remaining()
+ body.size_hint().lower() as usize;

let mut bytes = BytesMut::with_capacity(cap);
bytes.put(first_chunk);
bytes.put(second_chunk);
bytes
} else {
return Ok(first_chunk);
};

body_to_bytes_mut(&mut body, &mut bytes).await?;
Ok(bytes.freeze())
}
}

Expand Down

0 comments on commit ab2b9e7

Please sign in to comment.