mirror of
https://gitlab.com/xmpp-rs/xmpp-rs.git
synced 2024-07-12 22:21:53 +00:00
jid: Optimise for no-transform JIDs
stringprep can make transformations to a JID, the most well-known one is making the nodepart and domainpart lowercase but it does much more than that. It is extremely common to have to validate already-normalised JIDs though, and since https://github.com/sfackler/rust-stringprep/pull/4 this is exactly what the stringprep crate does, by returning Cow::Borrowed() for common ASCII-only cases. This commit further reduces time spent by an additional -15%..-58% when already using this stringprep improvement, in addition to the 89.5%..98.5% change brought by this improvement (and +1.3% total when the JID isn’t normalised yet). For instance, my own full JID parses in 1.83 µs before these changes, 132 ns with just the stringprep optimisation, and 46 ns with also this commit, on an i7-8700K.
This commit is contained in:
parent
b3da75d0a7
commit
6f304d197d
3 changed files with 17 additions and 4 deletions
|
@ -8,6 +8,7 @@ Unreleased
|
||||||
* Additions
|
* Additions
|
||||||
- Parsing invalid JIDs with stringprep feature no longer results in panic,
|
- Parsing invalid JIDs with stringprep feature no longer results in panic,
|
||||||
returning Error with NodePrep, NamePrep or ResourcePrep variant instead (#84)
|
returning Error with NodePrep, NamePrep or ResourcePrep variant instead (#84)
|
||||||
|
- Parsing already-normalized JIDs with stringprep is much faster, about 20 times.
|
||||||
- JID parts are now typed as NodePart, DomainPart and ResourcePart ; once part into those types,
|
- JID parts are now typed as NodePart, DomainPart and ResourcePart ; once part into those types,
|
||||||
JID operations cannot fail
|
JID operations cannot fail
|
||||||
- BareJid::with_resource appends a ResourcePart to a BareJid to produce a FullJid (#204)
|
- BareJid::with_resource appends a ResourcePart to a BareJid to produce a FullJid (#204)
|
||||||
|
|
|
@ -22,4 +22,4 @@ gitlab = { repository = "xmpp-rs/xmpp-rs" }
|
||||||
memchr = "2.5"
|
memchr = "2.5"
|
||||||
minidom = { version = "0.15", optional = true }
|
minidom = { version = "0.15", optional = true }
|
||||||
serde = { version = "1.0", features = ["derive"], optional = true }
|
serde = { version = "1.0", features = ["derive"], optional = true }
|
||||||
stringprep = "0.1.2"
|
stringprep = "0.1.3"
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
use crate::Error;
|
use crate::Error;
|
||||||
use core::num::NonZeroU16;
|
use core::num::NonZeroU16;
|
||||||
use memchr::memchr;
|
use memchr::memchr;
|
||||||
|
use std::borrow::Cow;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
use stringprep::{nameprep, nodeprep, resourceprep};
|
use stringprep::{nameprep, nodeprep, resourceprep};
|
||||||
|
|
||||||
|
@ -57,7 +58,12 @@ impl InnerJid {
|
||||||
|
|
||||||
orig_at = Some(node.len());
|
orig_at = Some(node.len());
|
||||||
orig_slash = Some(node.len() + domain.len() + 1);
|
orig_slash = Some(node.len() + domain.len() + 1);
|
||||||
format!("{node}@{domain}/{resource}")
|
match (node, domain, resource) {
|
||||||
|
(Cow::Borrowed(_), Cow::Borrowed(_), Cow::Borrowed(_)) => {
|
||||||
|
unnormalized.to_string()
|
||||||
|
}
|
||||||
|
(node, domain, resource) => format!("{node}@{domain}/{resource}"),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
(Some(at), None) => {
|
(Some(at), None) => {
|
||||||
let node = nodeprep(&unnormalized[..at]).map_err(|_| Error::NodePrep)?;
|
let node = nodeprep(&unnormalized[..at]).map_err(|_| Error::NodePrep)?;
|
||||||
|
@ -67,7 +73,10 @@ impl InnerJid {
|
||||||
length_check(domain.len(), Error::DomainEmpty, Error::DomainTooLong)?;
|
length_check(domain.len(), Error::DomainEmpty, Error::DomainTooLong)?;
|
||||||
|
|
||||||
orig_at = Some(node.len());
|
orig_at = Some(node.len());
|
||||||
format!("{node}@{domain}")
|
match (node, domain) {
|
||||||
|
(Cow::Borrowed(_), Cow::Borrowed(_)) => unnormalized.to_string(),
|
||||||
|
(node, domain) => format!("{node}@{domain}"),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
(None, Some(slash)) => {
|
(None, Some(slash)) => {
|
||||||
let domain = nameprep(&unnormalized[..slash]).map_err(|_| Error::NamePrep)?;
|
let domain = nameprep(&unnormalized[..slash]).map_err(|_| Error::NamePrep)?;
|
||||||
|
@ -78,7 +87,10 @@ impl InnerJid {
|
||||||
length_check(resource.len(), Error::ResourceEmpty, Error::ResourceTooLong)?;
|
length_check(resource.len(), Error::ResourceEmpty, Error::ResourceTooLong)?;
|
||||||
|
|
||||||
orig_slash = Some(domain.len());
|
orig_slash = Some(domain.len());
|
||||||
format!("{domain}/{resource}")
|
match (domain, resource) {
|
||||||
|
(Cow::Borrowed(_), Cow::Borrowed(_)) => unnormalized.to_string(),
|
||||||
|
(domain, resource) => format!("{domain}/{resource}"),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
(None, None) => {
|
(None, None) => {
|
||||||
let domain = nameprep(unnormalized).map_err(|_| Error::NamePrep)?;
|
let domain = nameprep(unnormalized).map_err(|_| Error::NamePrep)?;
|
||||||
|
|
Loading…
Reference in a new issue