Skip to content

Add memchr and optimize resp2 decode #39

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add memchr and optimize resp2 decode #39

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ nom = { version = "7.1", default-features = false }
libm = { version = "0.2", optional = true }
hashbrown = { version = "0.14", optional = true }
tokio-util = { version = "0.7", features = ["codec"], optional = true }
memchr = "2.7.4"

[dev-dependencies]
rand = "0.8"
Expand Down Expand Up @@ -60,9 +61,9 @@ doctest = true
name = "redis_protocol"
test = true

#[[bench]]
#name = "resp2_decode"
#harness = false
[[bench]]
name = "resp2_decode"
harness = false

#[[bench]]
#name = "resp2_encode"
Expand Down
15 changes: 12 additions & 3 deletions src/resp2/decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ use crate::{
utils,
};
use alloc::vec::Vec;
use core::str;
use memchr::memchr;
use core::{num::NonZero, str};
use nom::{
bytes::streaming::{take as nom_take, take_until as nom_take_until},
multi::count as nom_count,
Expand Down Expand Up @@ -39,13 +40,20 @@ fn to_i64(s: &[u8]) -> Result<i64, RedisParseError<&[u8]>> {

fn d_read_to_crlf(input: (&[u8], usize)) -> DResult<usize> {
decode_log_str!(input.0, _input, "Parsing to CRLF. Remaining: {:?}", _input);
let (input_bytes, data) = nom_terminated(nom_take_until(CRLF.as_bytes()), nom_take(2_usize))(input.0)?;
// let (input_bytes, data) = nom_terminated(nom_take_until(CRLF.as_bytes()), nom_take(2_usize))(input.0)?;
let position = memchr(b'\r', input.0).ok_or_else(|| NomErr::Error(RedisParseError::Nom(input.0, nom::error::ErrorKind::CrLf)))?;
let (data, input_bytes) = input.0.split_at(position);
let (_, input_bytes) = input_bytes.split_at_checked(2).ok_or_else(|| NomErr::Error(RedisParseError::Nom(input.0, nom::error::ErrorKind::Eof)))?;
Ok(((input_bytes, input.1 + data.len() + 2), data.len()))
}

#[inline]
fn d_read_to_crlf_take(input: (&[u8], usize)) -> DResult<&[u8]> {
decode_log_str!(input.0, _input, "Parsing to CRLF. Remaining: {:?}", _input);
let (input_bytes, data) = nom_terminated(nom_take_until(CRLF.as_bytes()), nom_take(2_usize))(input.0)?;
// let (input_bytes, data) = nom_terminated(nom_take_until(CRLF.as_bytes()), nom_take(2_usize))(input.0)?;
let position = memchr(b'\r', input.0).ok_or_else(|| NomErr::Error(RedisParseError::Nom(input.0, nom::error::ErrorKind::CrLf)))?;
let (data, input_bytes) = input.0.split_at(position);
let (_, input_bytes) = input_bytes.split_at_checked(2).ok_or_else(|| NomErr::Error(RedisParseError::Nom(input.0, nom::error::ErrorKind::Eof)))?;
Ok(((input_bytes, input.1 + data.len() + 2), data))
}

Expand Down Expand Up @@ -100,6 +108,7 @@ fn d_parse_error(input: (&[u8], usize)) -> DResult<RangeFrame> {
Ok(((input, next_offset), RangeFrame::Error((offset, offset + len))))
}

#[inline]
fn d_parse_bulkstring(input: (&[u8], usize), len: usize) -> DResult<RangeFrame> {
let offset = input.1;
let (input, data) = nom_terminated(nom_take(len), nom_take(2_usize))(input.0)?;
Expand Down