aba89c4f5d
Every change is benchmark-verified (harness + before/after numbers in benches/, measured on this branch; reproduction commands in each doc): DAV / sync-client hot paths - PROPFIND dead-properties: one = ANY($1) query per 500-child page instead of one sequential query per child, and indexable `=` predicates instead of IS NOT DISTINCT FROM (seq scans). 2,000-child folder: 1.07-4.54 s of DB chatter -> 4-6 ms (258-773x). Applied to native + NC PROPFIND and both NC REPORT handlers. [benches/DEAD-PROPS.md] - Folder paging: keyset cursor (name > $last) + new partial index (folder_id, name) replaces LIMIT/OFFSET full-folder rescan per page. Full 20k-file walk: 1266 ms -> 77 ms (16.5x). New migration 20260917000000. [benches/PROPFIND-PAGING.md] - NC chroot / default-drive resolution: moka caches (30 s TTL, explicit invalidation on drive mutations) for find_default_for_user and the markerless chroot FolderDto. 2 uncached queries + 2 pool checkouts per NC/WebDAV/WOPI request -> sub-us moka hit (p50 0.7-3.6 ms -> ~1 us). [benches/CHROOT-CACHE.md] - Quota: PROPFINDs whose prop list never names a quota prop skip the 2-query resolution entirely (wants_quota()); the remaining lookups read 2 columns instead of the full auth.users row with its <=512 KiB avatar (11-16x, p50 3.4 ms -> 0.29 ms). Same narrow read now gates every upload quota check. [benches/QUOTA-PATH.md] CPU on the request path - ZIP exports (folder download, share ZIP, batch download): entries whose MIME says already-compressed (JPEG/MP4/zip/pdf/...) are Stored instead of Deflate - deflate ran inline on the tokio writer task at ~41 MB/s for ~0% size gain. Mixed media corpus: 4.31x wall and CPU, archive size unchanged. Shared predicate in common::mime_detect. [benches/ZIP-MEDIA.md] - Compression layers: tower-http's default maps to Brotli QUALITY 11 (verified in brotli-8.0.2 source and empirically: 90 ms per 64 KiB JSON response, 1.3 s per 700 KiB bundle). Both layers pinned to Precise(4): 99x less CPU for ~15% more bytes. SPA assets are now precompressed at build time (scripts/precompress.mjs, 77% smaller) and served via ServeDir::precompressed_br/gzip: 2016x less per-request work, and clients get the better q11 bytes. [benches/STATIC-PRECOMPRESSED.md] Batched / cached backend paths [benches/NPLUS1-AND-CACHES.md] - Content-search ReBAC re-verification: new AuthorizationEngine::check_files_read_batch (default = old loop; PgAclEngine override batches drive resolution + reuses role cache). 200 sequential point SELECTs per search -> 1-2 queries. - Batch-ZIP subtree downloads: drop per-file re-authz + per-file Recent recording (2 writes/file) for subtree entries already authorized at the root - mirrors the native folder-download path. ~6,000 statements removed from a 2,000-file archive. - CDC chunk manifests: immutable by content address, now moka-cached (weight-bounded 32 MiB, 60 s TTL, positive-only, invalidated on delete) - removes one manifest query (p50 0.44-4.4 ms) from every stream, range and full blob read. - People tab: grouped COUNT + batched cover lookup instead of dragging every face row with its 2 KiB embedding (10k faces: 30.4 ms & 21 MB -> 3.8 ms & 1.3 KB, 8.1x); merge() is one set-based UPDATE. [benches/PEOPLE-LIST.md] - Photos timeline cursor: raw timestamptz comparison instead of EXTRACT(EPOCH ...) wrapper + IS NULL OR disjunction - cursor is an index boundary again, deep scroll stops re-scanning skipped rows. - Public share landing: one atomic UPDATE ... access_count + 1 (was SELECT + full-row write-back: racy, lost updates, clobbered concurrent owner edits) - 3 round-trips -> 2 per visit. - move_to_trash: dead full-entity SELECT feeding a documented no-op removed from both branches; dead fields dropped from TrashService. - NFC normalization: is_nfc_quick fast path skips the decompose/recompose state machine for the ~100% already-NFC case (every row loaded from PG). Frontend - Large folders paint after page one (~200 items) via fetchFolderListing's new onPage hook instead of waiting for every sequential page. - Tested-and-reverted (kept for the record): cached Intl.Collator for name sorts - vitest showed it 2x SLOWER than V8's argument-less localeCompare fast path (5.6 ms vs 12.1 ms / 5k names). Sort order untouched. New bench harnesses under examples/ (bench feature): zip_media, dead_props, chroot_cache, quota_path, people_list, propfind_paging, static_precompress. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CBK1RdtzyP6759Muqe1K1w
234 lines
7.4 KiB
Rust
234 lines
7.4 KiB
Rust
//! PROPFIND folder-listing pagination benchmark — LIMIT/OFFSET vs keyset.
|
|
//!
|
|
//! The streaming PROPFIND walker pages a folder's children 500 at a time in
|
|
//! name order (`list_files_batch`). The old shape was `ORDER BY name LIMIT
|
|
//! 500 OFFSET k` with no supporting index — every page bitmap-scanned all N
|
|
//! children and top-sorted them, so a full folder walk was O(N²/500) row
|
|
//! visits. The change adds `idx_files_folder_name (folder_id, name) WHERE
|
|
//! NOT is_trashed` and switches the cursor to keyset (`name > $last`), making
|
|
//! each page one O(page) index-range read.
|
|
//!
|
|
//! Modes (full walk of the folder, all pages):
|
|
//! OFFSET/no-idx — the true BEFORE (index dropped for the run)
|
|
//! OFFSET/idx — index alone, old query shape
|
|
//! KEYSET/idx — the AFTER
|
|
//!
|
|
//! Run (needs Postgres up; reads DATABASE_URL from .env):
|
|
//! cargo run --release --features bench --example bench_propfind_paging
|
|
//! Tunables: BENCH_FILES (20000), BENCH_PAGE (500), BENCH_REPS (3)
|
|
|
|
use std::env;
|
|
use std::time::Instant;
|
|
|
|
use sqlx::PgPool;
|
|
use sqlx::postgres::PgPoolOptions;
|
|
use uuid::Uuid;
|
|
|
|
fn env_or<T: std::str::FromStr>(key: &str, default: T) -> T {
|
|
env::var(key)
|
|
.ok()
|
|
.and_then(|v| v.parse().ok())
|
|
.unwrap_or(default)
|
|
}
|
|
|
|
async fn seed(pool: &PgPool, files: usize) -> (Uuid, Uuid) {
|
|
let mut tx = pool.begin().await.expect("begin");
|
|
let drive_id: Uuid = sqlx::query_scalar(
|
|
"INSERT INTO storage.drives (kind, quota_bytes) VALUES ('shared', NULL) RETURNING id",
|
|
)
|
|
.fetch_one(&mut *tx)
|
|
.await
|
|
.expect("drive");
|
|
let folder_id: Uuid = sqlx::query_scalar(
|
|
"INSERT INTO storage.folders (name, path, lpath, drive_id)
|
|
VALUES ('bench_paging', '/bench_paging', 'bench_paging', $1) RETURNING id",
|
|
)
|
|
.bind(drive_id)
|
|
.fetch_one(&mut *tx)
|
|
.await
|
|
.expect("folder");
|
|
sqlx::query("UPDATE storage.drives SET root_folder_id = $1 WHERE id = $2")
|
|
.bind(folder_id)
|
|
.bind(drive_id)
|
|
.execute(&mut *tx)
|
|
.await
|
|
.expect("stamp");
|
|
tx.commit().await.expect("commit");
|
|
|
|
sqlx::query(
|
|
"INSERT INTO storage.files (name, folder_id, blob_hash, size, mime_type, drive_id)
|
|
SELECT 'file_' || LPAD(i::text, 8, '0') || '.jpg', $1,
|
|
'benchpaging00000000000000000000000000000000000000000000000000000',
|
|
1024, 'image/jpeg', $2
|
|
FROM generate_series(1, $3) AS i",
|
|
)
|
|
.bind(folder_id)
|
|
.bind(drive_id)
|
|
.bind(files as i32)
|
|
.execute(pool)
|
|
.await
|
|
.expect("files");
|
|
sqlx::query("ANALYZE storage.files")
|
|
.execute(pool)
|
|
.await
|
|
.ok();
|
|
(drive_id, folder_id)
|
|
}
|
|
|
|
const COLS: &str = "fi.id::text, fi.name, fi.folder_id::text, fo.path, fi.size, fi.mime_type,
|
|
EXTRACT(EPOCH FROM fi.created_at)::bigint,
|
|
EXTRACT(EPOCH FROM fi.updated_at)::bigint, fi.blob_hash";
|
|
|
|
type Row = (
|
|
String,
|
|
String,
|
|
Option<String>,
|
|
Option<String>,
|
|
i64,
|
|
String,
|
|
i64,
|
|
i64,
|
|
String,
|
|
);
|
|
|
|
/// Full folder walk with the old LIMIT/OFFSET shape. Returns rows seen.
|
|
async fn walk_offset(pool: &PgPool, folder: Uuid, page: i64) -> usize {
|
|
let mut offset = 0i64;
|
|
let mut seen = 0usize;
|
|
loop {
|
|
let rows: Vec<Row> = sqlx::query_as(&format!(
|
|
"SELECT {COLS}
|
|
FROM storage.files fi
|
|
LEFT JOIN storage.folders fo ON fo.id = fi.folder_id
|
|
WHERE fi.folder_id = $1 AND NOT fi.is_trashed
|
|
ORDER BY fi.name LIMIT $2 OFFSET $3"
|
|
))
|
|
.bind(folder)
|
|
.bind(page)
|
|
.bind(offset)
|
|
.fetch_all(pool)
|
|
.await
|
|
.expect("offset page");
|
|
let n = rows.len();
|
|
seen += n;
|
|
if (n as i64) < page {
|
|
break;
|
|
}
|
|
offset += n as i64;
|
|
}
|
|
seen
|
|
}
|
|
|
|
/// Full folder walk with the new keyset shape.
|
|
async fn walk_keyset(pool: &PgPool, folder: Uuid, page: i64) -> usize {
|
|
let mut after: Option<String> = None;
|
|
let mut seen = 0usize;
|
|
loop {
|
|
let rows: Vec<Row> = if let Some(a) = &after {
|
|
sqlx::query_as(&format!(
|
|
"SELECT {COLS}
|
|
FROM storage.files fi
|
|
LEFT JOIN storage.folders fo ON fo.id = fi.folder_id
|
|
WHERE fi.folder_id = $1 AND NOT fi.is_trashed AND fi.name > $3
|
|
ORDER BY fi.name LIMIT $2"
|
|
))
|
|
.bind(folder)
|
|
.bind(page)
|
|
.bind(a)
|
|
.fetch_all(pool)
|
|
.await
|
|
} else {
|
|
sqlx::query_as(&format!(
|
|
"SELECT {COLS}
|
|
FROM storage.files fi
|
|
LEFT JOIN storage.folders fo ON fo.id = fi.folder_id
|
|
WHERE fi.folder_id = $1 AND NOT fi.is_trashed
|
|
ORDER BY fi.name LIMIT $2"
|
|
))
|
|
.bind(folder)
|
|
.bind(page)
|
|
.fetch_all(pool)
|
|
.await
|
|
}
|
|
.expect("keyset page");
|
|
let n = rows.len();
|
|
seen += n;
|
|
if (n as i64) < page {
|
|
break;
|
|
}
|
|
after = rows.last().map(|r| r.1.clone());
|
|
}
|
|
seen
|
|
}
|
|
|
|
fn median(mut xs: Vec<f64>) -> f64 {
|
|
xs.sort_by(|a, b| a.partial_cmp(b).unwrap());
|
|
xs[xs.len() / 2]
|
|
}
|
|
|
|
#[tokio::main(flavor = "multi_thread")]
|
|
async fn main() {
|
|
dotenvy::dotenv().ok();
|
|
let url = env::var("DATABASE_URL").expect("set DATABASE_URL");
|
|
let files: usize = env_or("BENCH_FILES", 20_000);
|
|
let page: i64 = env_or("BENCH_PAGE", 500);
|
|
let reps: usize = env_or("BENCH_REPS", 3);
|
|
|
|
let pool = PgPoolOptions::new()
|
|
.max_connections(5)
|
|
.connect(&url)
|
|
.await
|
|
.expect("connect");
|
|
println!("seeding {files} files (one-time)…");
|
|
let (drive_id, folder_id) = seed(&pool, files).await;
|
|
|
|
println!("\n# full PROPFIND walk of a {files}-file folder, {page}/page");
|
|
println!("{:<18} {:>12} {:>9}", "mode", "total ms", "vs OLD");
|
|
|
|
let mut base = None;
|
|
for mode in ["OFFSET/no-idx", "OFFSET/idx", "KEYSET/idx"] {
|
|
match mode {
|
|
"OFFSET/no-idx" => {
|
|
sqlx::query("DROP INDEX IF EXISTS storage.idx_files_folder_name")
|
|
.execute(&pool)
|
|
.await
|
|
.ok();
|
|
}
|
|
"OFFSET/idx" => {
|
|
sqlx::query(
|
|
"CREATE INDEX IF NOT EXISTS idx_files_folder_name
|
|
ON storage.files (folder_id, name) WHERE NOT is_trashed",
|
|
)
|
|
.execute(&pool)
|
|
.await
|
|
.expect("create index");
|
|
}
|
|
_ => {}
|
|
}
|
|
let mut times = Vec::with_capacity(reps);
|
|
for _ in 0..reps {
|
|
let t = Instant::now();
|
|
let seen = if mode.starts_with("OFFSET") {
|
|
walk_offset(&pool, folder_id, page).await
|
|
} else {
|
|
walk_keyset(&pool, folder_id, page).await
|
|
};
|
|
assert_eq!(seen, files);
|
|
times.push(t.elapsed().as_secs_f64() * 1000.0);
|
|
}
|
|
let ms = median(times);
|
|
let speedup = base
|
|
.map(|b: f64| format!("{:.1}x", b / ms))
|
|
.unwrap_or_else(|| "1.0x".into());
|
|
if base.is_none() {
|
|
base = Some(ms);
|
|
}
|
|
println!("{mode:<18} {ms:>12.1} {speedup:>9}");
|
|
}
|
|
|
|
let _ = sqlx::query("DELETE FROM storage.drives WHERE id = $1")
|
|
.bind(drive_id)
|
|
.execute(&pool)
|
|
.await;
|
|
}
|