Apps/ImageApi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf/faces-embeddings-no-clone #72

Merged
cameron merged 2 commits from perf/faces-embeddings-no-clone into master 2026-05-01 23:09:23 +00:00
Conversation 0 Commits 2 Files Changed 7 +77 -71
6 changed files with 77 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fb4df4b195 - Show all commits

4
src/content_hash.rs
View File

@@ -78,9 +78,7 @@ pub fn library_scoped_legacy_path(
library_id: i32, library_id: i32,
rel_path: impl AsRef<Path>, rel_path: impl AsRef<Path>,
) -> PathBuf { ) -> PathBuf {
derivative_dir derivative_dir.join(library_id.to_string()).join(rel_path)
.join(library_id.to_string())
.join(rel_path)
} }
fn shard_prefix(hash: &str) -> &str { fn shard_prefix(hash: &str) -> &str {

9
src/database/mod.rs
View File

@@ -1149,7 +1149,11 @@ impl ExifDao for SqliteExifDao {
limit: i64, limit: i64,
offset: i64, offset: i64,
) -> Result<Vec<(i32, String)>, DbError> { ) -> Result<Vec<(i32, String)>, DbError> {
trace_db_call(context, "query", "list_rel_paths_for_library_page", |_span| { trace_db_call(
context,
"query",
"list_rel_paths_for_library_page",
|_span| {
use schema::image_exif::dsl::*; use schema::image_exif::dsl::*;
image_exif image_exif
@@ -1160,7 +1164,8 @@ impl ExifDao for SqliteExifDao {
.offset(offset) .offset(offset)
.load::<(i32, String)>(self.connection.lock().unwrap().deref_mut()) .load::<(i32, String)>(self.connection.lock().unwrap().deref_mut())
.map_err(|_| anyhow::anyhow!("Query error")) .map_err(|_| anyhow::anyhow!("Query error"))
}) },
)
.map_err(|_| DbError::new(DbErrorKind::QueryError)) .map_err(|_| DbError::new(DbErrorKind::QueryError))
} }
} }

17
src/database/reconcile.rs
View File

@@ -325,9 +325,7 @@ mod tests {
let stats = run(&mut conn); let stats = run(&mut conn);
assert_eq!(stats.photo_insights_hashes_filled, 1); assert_eq!(stats.photo_insights_hashes_filled, 1);
let row = diesel::sql_query( let row = diesel::sql_query("SELECT content_hash FROM photo_insights WHERE id = ?")
"SELECT content_hash FROM photo_insights WHERE id = ?",
)
.bind::<diesel::sql_types::Integer, _>(id1) .bind::<diesel::sql_types::Integer, _>(id1)
.get_result::<HashOnly>(&mut conn) .get_result::<HashOnly>(&mut conn)
.unwrap(); .unwrap();
@@ -350,14 +348,15 @@ mod tests {
assert_eq!(stats.photo_insights_hashes_filled, 2); assert_eq!(stats.photo_insights_hashes_filled, 2);
assert_eq!(stats.photo_insights_demoted, 1); assert_eq!(stats.photo_insights_demoted, 1);
let rows = diesel::sql_query( let rows = diesel::sql_query("SELECT id, is_current FROM photo_insights ORDER BY id")
"SELECT id, is_current FROM photo_insights ORDER BY id",
)
.get_results::<CurrentRow>(&mut conn) .get_results::<CurrentRow>(&mut conn)
.unwrap(); .unwrap();
let earlier_row = rows.iter().find(|r| r.id == earlier).unwrap(); let earlier_row = rows.iter().find(|r| r.id == earlier).unwrap();
let later_row = rows.iter().find(|r| r.id == later).unwrap(); let later_row = rows.iter().find(|r| r.id == later).unwrap();
assert!(earlier_row.is_current, "earlier insight should remain current"); assert!(
earlier_row.is_current,
"earlier insight should remain current"
);
assert!(!later_row.is_current, "later insight should be demoted"); assert!(!later_row.is_current, "later insight should be demoted");
// Idempotent. // Idempotent.
@@ -374,9 +373,7 @@ mod tests {
let stats = run(&mut conn); let stats = run(&mut conn);
assert_eq!(stats.photo_insights_demoted, 0); assert_eq!(stats.photo_insights_demoted, 0);
let row = diesel::sql_query( let row = diesel::sql_query("SELECT id, is_current FROM photo_insights WHERE id = ?")
"SELECT id, is_current FROM photo_insights WHERE id = ?",
)
.bind::<diesel::sql_types::Integer, _>(solo) .bind::<diesel::sql_types::Integer, _>(solo)
.get_result::<CurrentRow>(&mut conn) .get_result::<CurrentRow>(&mut conn)
.unwrap(); .unwrap();

3
src/libraries.rs
View File

@@ -71,7 +71,8 @@ impl Library {
if self.excluded_dirs.is_empty() { if self.excluded_dirs.is_empty() {
return globals.to_vec(); return globals.to_vec();
} }
let mut combined: Vec<String> = Vec::with_capacity(globals.len() + self.excluded_dirs.len()); let mut combined: Vec<String> =
Vec::with_capacity(globals.len() + self.excluded_dirs.len());
combined.extend_from_slice(globals); combined.extend_from_slice(globals);
combined.extend(self.excluded_dirs.iter().cloned()); combined.extend(self.excluded_dirs.iter().cloned());
combined combined

53
src/library_maintenance.rs
View File

@@ -350,7 +350,11 @@ pub fn run_orphan_gc(
// ("revived"). Common case: a network share that briefly went // ("revived"). Common case: a network share that briefly went
// stale comes back, image_exif gets re-populated by ingest, and // stale comes back, image_exif gets re-populated by ingest, and
// the hash is no longer orphaned. // the hash is no longer orphaned.
let revived = state.pending.difference(&orphans).cloned().collect::<Vec<_>>(); let revived = state
.pending
.difference(&orphans)
.cloned()
.collect::<Vec<_>>();
if !revived.is_empty() { if !revived.is_empty() {
for h in &revived { for h in &revived {
state.pending.remove(h); state.pending.remove(h);
@@ -438,7 +442,10 @@ pub fn run_orphan_gc(
state.pending.len(), state.pending.len(),
); );
} else { } else {
debug!("orphan-gc: no changes this tick (pending: {})", state.pending.len()); debug!(
"orphan-gc: no changes this tick (pending: {})",
state.pending.len()
);
} }
stats stats
@@ -458,12 +465,7 @@ pub fn all_libraries_online(libs: &[Library], health: &LibraryHealthMap) -> bool
let guard = health.read().unwrap_or_else(|e| e.into_inner()); let guard = health.read().unwrap_or_else(|e| e.into_inner());
libs.iter() libs.iter()
.filter(|lib| lib.enabled) .filter(|lib| lib.enabled)
.all(|lib| { .all(|lib| guard.get(&lib.id).map(|h| h.is_online()).unwrap_or(false))
guard
.get(&lib.id)
.map(|h| h.is_online())
.unwrap_or(false)
})
} }
#[derive(QueryableByName, Debug)] #[derive(QueryableByName, Debug)]
@@ -504,17 +506,14 @@ fn delete_hash_keyed_rows(
use crate::database::schema::{face_detections, photo_insights, tagged_photo}; use crate::database::schema::{face_detections, photo_insights, tagged_photo};
let faces = diesel::delete( let faces =
face_detections::table.filter(face_detections::content_hash.eq_any(hashes)), diesel::delete(face_detections::table.filter(face_detections::content_hash.eq_any(hashes)))
)
.execute(conn)?; .execute(conn)?;
let tags = diesel::delete( let tags =
tagged_photo::table.filter(tagged_photo::content_hash.eq_any(hashes)), diesel::delete(tagged_photo::table.filter(tagged_photo::content_hash.eq_any(hashes)))
)
.execute(conn)?; .execute(conn)?;
let insights = diesel::delete( let insights =
photo_insights::table.filter(photo_insights::content_hash.eq_any(hashes)), diesel::delete(photo_insights::table.filter(photo_insights::content_hash.eq_any(hashes)))
)
.execute(conn)?; .execute(conn)?;
Ok((faces, tags, insights)) Ok((faces, tags, insights))
@@ -605,7 +604,10 @@ mod tests {
n: i64, n: i64,
} }
fn count(conn: &mut SqliteConnection, sql: &str) -> i64 { fn count(conn: &mut SqliteConnection, sql: &str) -> i64 {
diesel::sql_query(sql).get_result::<CountRow>(conn).unwrap().n diesel::sql_query(sql)
.get_result::<CountRow>(conn)
.unwrap()
.n
} }
#[test] #[test]
@@ -731,9 +733,18 @@ mod tests {
assert_eq!(stats.deleted_tagged_photo, 1); assert_eq!(stats.deleted_tagged_photo, 1);
assert_eq!(stats.deleted_photo_insights, 1); assert_eq!(stats.deleted_photo_insights, 1);
assert_eq!(count(&mut conn, "SELECT COUNT(*) AS n FROM face_detections"), 0); assert_eq!(
assert_eq!(count(&mut conn, "SELECT COUNT(*) AS n FROM tagged_photo"), 0); count(&mut conn, "SELECT COUNT(*) AS n FROM face_detections"),
assert_eq!(count(&mut conn, "SELECT COUNT(*) AS n FROM photo_insights"), 0); 0
);
assert_eq!(
count(&mut conn, "SELECT COUNT(*) AS n FROM tagged_photo"),
0
);
assert_eq!(
count(&mut conn, "SELECT COUNT(*) AS n FROM photo_insights"),
0
);
} }
#[test] #[test]

22
src/main.rs
View File

@@ -1736,7 +1736,10 @@ fn cleanup_orphaned_playlists(
info!(" Cleanup interval: {} seconds", cleanup_interval_secs); info!(" Cleanup interval: {} seconds", cleanup_interval_secs);
info!(" Playlist directory: {}", video_path); info!(" Playlist directory: {}", video_path);
for lib in &libs { for lib in &libs {
info!(" Checking sources under '{}' at {}", lib.name, lib.root_path); info!(
" Checking sources under '{}' at {}",
lib.name, lib.root_path
);
} }
loop { loop {
@@ -1752,12 +1755,7 @@ fn cleanup_orphaned_playlists(
let guard = library_health.read().unwrap_or_else(|e| e.into_inner()); let guard = library_health.read().unwrap_or_else(|e| e.into_inner());
let stale: Vec<String> = libs let stale: Vec<String> = libs
.iter() .iter()
.filter(|lib| { .filter(|lib| guard.get(&lib.id).map(|h| !h.is_online()).unwrap_or(false))
guard
.get(&lib.id)
.map(|h| !h.is_online())
.unwrap_or(false)
})
.map(|lib| lib.name.clone()) .map(|lib| lib.name.clone())
.collect(); .collect();
if !stale.is_empty() { if !stale.is_empty() {
@@ -2170,13 +2168,9 @@ fn watch_files(
// requirement is enforced inside run_orphan_gc; we // requirement is enforced inside run_orphan_gc; we
// pass the current all-online flag and the function // pass the current all-online flag and the function
// tracks the previous tick's flag in OrphanGcState. // tracks the previous tick's flag in OrphanGcState.
let all_online = let all_online = library_maintenance::all_libraries_online(&libs, &library_health);
library_maintenance::all_libraries_online(&libs, &library_health); let _ =
let _ = library_maintenance::run_orphan_gc( library_maintenance::run_orphan_gc(&mut conn, &mut orphan_gc_state, all_online);
&mut conn,
&mut orphan_gc_state,
all_online,
);
} }
if is_full_scan { if is_full_scan {