Skip to content
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

opt: optimize skip number #121

Merged
merged 1 commit into from
Nov 6, 2024
Merged

opt: optimize skip number #121

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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ itoa = "1.0"
ryu = "1.0"
serde = { version = "1.0", features = ["rc", "derive"] }
simdutf8 = "0.1"
thiserror = "1.0"
thiserror = "2.0"

[dev-dependencies]
bytes = { version = "1.4", features = ["serde"] }
Expand Down
40 changes: 17 additions & 23 deletions src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,9 +1248,7 @@ where
// fast path for the single digit
let mut is_float: bool = false;
match second {
Some(b'0'..=b'9') => {
self.read.eat(1);
}
Some(b'0'..=b'9') => self.read.eat(1),
Some(b'.') => {
is_float = true;
self.read.eat(1);
Expand All @@ -1268,33 +1266,30 @@ where
let v = unsafe { i8x32::from_slice_unaligned_unchecked(chunk) };
let zero = i8x32::splat(b'0' as i8);
let nine = i8x32::splat(b'9' as i8);
let nondigits = (zero.gt(&v) | v.gt(&nine)).bitmask();
let mut nondigits = (zero.gt(&v) | v.gt(&nine)).bitmask();
if nondigits != 0 {
let cnt = nondigits.trailing_zeros() as usize;
let mut cnt = nondigits.trailing_zeros() as usize;
let ch = chunk[cnt];
if ch == b'.' && !is_float {
self.read.eat(cnt + 1);
// check the first digit after the dot
self.skip_single_digit()?;

let traversed = cnt + 2;
// check the remaining digits
let nondigts = nondigits.wrapping_shr((traversed) as u32);
if nondigts != 0 {
while let Some(ch) = self.read.peek() {
if ch == b'e' || ch == b'E' {
self.read.eat(1);
return self.skip_exponent();
} else if ch.is_ascii_digit() {
self.read.eat(1);
continue;
} else {
return Ok(());
}
cnt += 2;
nondigits = nondigits.wrapping_shr(cnt as u32);
if nondigits != 0 {
let offset = nondigits.trailing_zeros() as usize;
let ch = chunk[cnt + offset];
if ch == b'e' || ch == b'E' {
self.read.eat(offset + 1);
return self.skip_exponent();
} else {
self.read.eat(offset);
return Ok(());
}
} else {
// long digits
self.read.eat(32 - traversed);
self.read.eat(32 - cnt);
is_float = true;
continue;
}
Expand All @@ -1305,10 +1300,9 @@ where
self.read.eat(cnt);
return Ok(());
}
} else {
// long digits
self.read.eat(32);
}
// long digits
self.read.eat(32);
}

// has less than 32 bytes
Expand Down
15 changes: 11 additions & 4 deletions src/value/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,7 @@ impl Value {
}
}

#[inline(always)]
fn get_enum(&self) -> ValueRefInner<'_> {
match self.unpack_ref() {
ValueDetail::Null => ValueRefInner::Null,
Expand All @@ -589,6 +590,7 @@ impl Value {
}
}

#[inline(always)]
fn unpack_ref(&self) -> ValueDetail<'_> {
unsafe {
match self.meta.get_type() {
Expand Down Expand Up @@ -2068,16 +2070,21 @@ mod test {

#[test]
fn test_arbitrary_precision() {
use crate::{Deserialize, Deserializer};

let nums = [ "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123",
use crate::Deserializer;

let nums = [
"43.420273000",
"1e123",
"0.001","0e+12","0.1e+12",
"0", "0.0", "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345e+1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345",
"12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123",
"1.23456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567e89012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123",
"-0.000000023456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567e+89012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123",
];

for num in nums {
let mut de = Deserializer::from_str(num).use_rawnumber();
let value: Value = Deserialize::deserialize(&mut de).unwrap();
let value: Value = de.deserialize().unwrap();
assert_eq!(value.as_raw_number().unwrap().as_str(), num);
assert_eq!(value.to_string(), num);
}
Expand Down
Loading