perf: round 4 — one-pass row paths, drive-selector cache, CalDAV single-parse, streamed Azure, batched hydration
Nine benchmark-gated changes (benches/ROUND4.md; every one ships with a BEFORE/AFTER bench + equivalence gate, rollback rule as ROUND2/3): - Row→entity path build: one-pass StoragePath::from_folder_and_name / from_joined + normalize_storage_name_owned + alloc-free Display — 743→417 ns/file-row (1.78x), −5 allocs/row on every listing surface. - WebDAV drive-selector: per-user readable_cache (single-flight, 30 s TTL, explicit invalidation incl. membership + group changes) replaces the grants join per request — 441 µs → 0.8 µs (~550x), 0 queries warm. - CalDAV from_ical/update_ical_data: 8 full IcalParser runs per VEVENT → 1 (7.1x per PUT, 4.4x on 50-event imports); alloc-free split_vevents, chunk scan without the whole-body uppercase copy (1.4x), borrowed-key UID grouping (1.3x), REPORT props no longer cloned. - PROPFIND emit: partition Vecs dropped (single-pass 404 list) + stack rendered RFC 3339/2822 dates, sizes, quoted etags (common::fmt, chrono-byte-identical, sweep-tested) on both DAV surfaces — 1.22x per page, 17.9→12.0 allocs/row. - Grant-listing hydration: calendars/address books/playlists batch hydrate via = ANY($1) — 15 serial queries → 1 (~13x per sync poll). - user-flags cache: get→insert → try_get_with single-flight (32→1 queries per cold herd). - Azure downloads: whole-blob Vec buffering → streamed SDK pages — TTFB 349→4 ms (87x), peak heap 480→1.9 MiB (254x) on 256 MiB blobs; new OXICLOUD_AZURE_ENDPOINT_URL override (Azurite/bench hook). - Face indexing: unbounded per-image tokio::spawn → core-count semaphore, permit before blob read — peak heap 1175→176 MiB (6.7x). Checks: cargo fmt, clippy --all-features --all-targets -D warnings, cargo test --workspace (523 passed) + --features test_utils. hurl API suite and dockerized integration DB not runnable in this environment — left to CI. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017aJu9ghvuT8WqC31ZEGTBA
This commit is contained in:
@@ -1700,21 +1700,24 @@ pub fn write_folder_response<W: std::io::Write>(
|
||||
|
||||
write_text_element(xml, "d:displayname", &folder.name)?;
|
||||
|
||||
let created_at =
|
||||
chrono::DateTime::<Utc>::from_timestamp(timestamp_to_i64(folder.created_at), 0)
|
||||
.unwrap_or_else(Utc::now);
|
||||
let modified_at =
|
||||
chrono::DateTime::<Utc>::from_timestamp(timestamp_to_i64(folder.modified_at), 0)
|
||||
.unwrap_or_else(Utc::now);
|
||||
|
||||
write_text_element(xml, "d:getlastmodified", &modified_at.to_rfc2822())?;
|
||||
write_date_element(
|
||||
xml,
|
||||
"d:getlastmodified",
|
||||
timestamp_to_i64(folder.modified_at),
|
||||
true,
|
||||
)?;
|
||||
// Route through `FolderDto::etag` (= `Folder::etag()`: the
|
||||
// descendant-aware `{id[..16]}-{tree_modified_at}` — see the
|
||||
// entity for the formula and the async-bump freshness contract).
|
||||
write_text_element(xml, "d:getetag", &format!("\"{}\"", folder.etag))?;
|
||||
write_etag_element(xml, "d:getetag", &folder.etag)?;
|
||||
write_text_element(xml, "d:getcontenttype", "httpd/unix-directory")?;
|
||||
write_text_element(xml, "d:getcontentlength", "0")?;
|
||||
write_text_element(xml, "d:creationdate", &created_at.to_rfc3339())?;
|
||||
write_date_element(
|
||||
xml,
|
||||
"d:creationdate",
|
||||
timestamp_to_i64(folder.created_at),
|
||||
false,
|
||||
)?;
|
||||
|
||||
// Nextcloud/ownCloud properties
|
||||
if let Some(id) = file_id {
|
||||
@@ -1795,17 +1798,28 @@ pub fn write_file_response<W: std::io::Write>(
|
||||
|
||||
write_text_element(xml, "d:displayname", &file.name)?;
|
||||
write_text_element(xml, "d:getcontenttype", &file.mime_type)?;
|
||||
write_text_element(xml, "d:getcontentlength", &file.size.to_string())?;
|
||||
{
|
||||
let mut buf = [0u8; 20];
|
||||
write_text_element(
|
||||
xml,
|
||||
"d:getcontentlength",
|
||||
crate::common::fmt::u64_str(&mut buf, file.size),
|
||||
)?;
|
||||
}
|
||||
|
||||
let created_at = chrono::DateTime::<Utc>::from_timestamp(timestamp_to_i64(file.created_at), 0)
|
||||
.unwrap_or_else(Utc::now);
|
||||
let modified_at =
|
||||
chrono::DateTime::<Utc>::from_timestamp(timestamp_to_i64(file.modified_at), 0)
|
||||
.unwrap_or_else(Utc::now);
|
||||
|
||||
write_text_element(xml, "d:getlastmodified", &modified_at.to_rfc2822())?;
|
||||
write_text_element(xml, "d:getetag", &format!("\"{}\"", file.etag))?;
|
||||
write_text_element(xml, "d:creationdate", &created_at.to_rfc3339())?;
|
||||
write_date_element(
|
||||
xml,
|
||||
"d:getlastmodified",
|
||||
timestamp_to_i64(file.modified_at),
|
||||
true,
|
||||
)?;
|
||||
write_etag_element(xml, "d:getetag", &file.etag)?;
|
||||
write_date_element(
|
||||
xml,
|
||||
"d:creationdate",
|
||||
timestamp_to_i64(file.created_at),
|
||||
false,
|
||||
)?;
|
||||
|
||||
// Nextcloud/ownCloud properties
|
||||
if let Some(id) = file_id {
|
||||
@@ -1817,7 +1831,14 @@ pub fn write_file_response<W: std::io::Write>(
|
||||
write_text_element(xml, "oc:permissions", "RGDNVW")?;
|
||||
// Numeric share-permissions bitmask: Read=1 + Update=2 + Delete=8 + Share=16 = 27
|
||||
write_text_element(xml, "ocs:share-permissions", "27")?;
|
||||
write_text_element(xml, "oc:size", &file.size.to_string())?;
|
||||
{
|
||||
let mut buf = [0u8; 20];
|
||||
write_text_element(
|
||||
xml,
|
||||
"oc:size",
|
||||
crate::common::fmt::u64_str(&mut buf, file.size),
|
||||
)?;
|
||||
}
|
||||
write_text_element(xml, "oc:owner-id", owner)?;
|
||||
write_text_element(xml, "oc:owner-display-name", owner)?;
|
||||
|
||||
@@ -1861,6 +1882,47 @@ pub fn write_file_response<W: std::io::Write>(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Stack-rendered `d:getlastmodified` / `d:creationdate` bodies
|
||||
/// (`common::fmt`) — the old per-row `to_rfc2822()` / `to_rfc3339()`
|
||||
/// ran chrono's format interpreter and allocated a String each.
|
||||
/// Out-of-range timestamps keep the chrono path, byte-identical.
|
||||
fn write_date_element<W: std::io::Write>(
|
||||
xml: &mut Writer<W>,
|
||||
tag: &str,
|
||||
secs: i64,
|
||||
rfc2822: bool,
|
||||
) -> Result<(), String> {
|
||||
if rfc2822 {
|
||||
let mut buf = [0u8; 31];
|
||||
if let Some(s) = crate::common::fmt::rfc2822_utc(&mut buf, secs) {
|
||||
return write_text_element(xml, tag, s);
|
||||
}
|
||||
let dt = chrono::DateTime::<Utc>::from_timestamp(secs, 0).unwrap_or_else(Utc::now);
|
||||
write_text_element(xml, tag, &dt.to_rfc2822())
|
||||
} else {
|
||||
let mut buf = [0u8; 25];
|
||||
if let Some(s) = crate::common::fmt::rfc3339_utc(&mut buf, secs) {
|
||||
return write_text_element(xml, tag, s);
|
||||
}
|
||||
let dt = chrono::DateTime::<Utc>::from_timestamp(secs, 0).unwrap_or_else(Utc::now);
|
||||
write_text_element(xml, tag, &dt.to_rfc3339())
|
||||
}
|
||||
}
|
||||
|
||||
/// `d:getetag` with the HTTP quoting — one exactly-sized allocation
|
||||
/// instead of `format!`'s grow-from-empty.
|
||||
fn write_etag_element<W: std::io::Write>(
|
||||
xml: &mut Writer<W>,
|
||||
tag: &str,
|
||||
etag: &str,
|
||||
) -> Result<(), String> {
|
||||
let mut quoted = String::with_capacity(etag.len() + 2);
|
||||
quoted.push('"');
|
||||
quoted.push_str(etag);
|
||||
quoted.push('"');
|
||||
write_text_element(xml, tag, "ed)
|
||||
}
|
||||
|
||||
pub fn write_text_element<W: std::io::Write>(
|
||||
xml: &mut Writer<W>,
|
||||
tag: &str,
|
||||
|
||||
Reference in New Issue
Block a user