Joren/qbz
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(suggestions): fix deadlock in build_vector

Browse Source 
The build_vector function was calling build_from_musicbrainz and
build_from_qobuz while holding the store lock. These functions also
try to acquire the store lock, causing a deadlock.

Fixed by saving the vectors from the first call and reusing them
for storage, instead of calling the functions again.
This commit is contained in:
vicrodh committed 2026-01-27 14:42:10 -06:00
1 parent 7e76fd6925
commit 54315c2e4e
1 file changed
+15 -12
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/artist_vectors/builder.rs
+15 -12
View File
@@ -81,6 +81,10 @@ impl ArtistVectorBuilder {
let mut mb_relations_count = 0;
let mut qobuz_similar_count = 0;
// Store vectors for later persistence (to avoid deadlock)
let mut mb_vec_to_store: Option<SparseVector> = None;
let mut qobuz_vec_to_store: Option<SparseVector> = None;
// 1. Get or create index for this artist
log::info!("[VectorBuilder] Acquiring store lock...");
{
@@ -98,6 +102,7 @@ impl ArtistVectorBuilder {
mb_relations_count = count;
if count > 0 {
sources.push("musicbrainz".to_string());
mb_vec_to_store = Some(mb_vec);
}
}
Err(e) => {
@@ -113,6 +118,7 @@ impl ArtistVectorBuilder {
qobuz_similar_count = count;
if count > 0 {
sources.push("qobuz".to_string());
qobuz_vec_to_store = Some(qobuz_vec);
}
}
Err(e) => {
@@ -121,27 +127,24 @@ impl ArtistVectorBuilder {
}
}
// 4. Persist the vector
// 4. Persist the vectors (using saved vectors to avoid deadlock)
log::info!("[VectorBuilder] Persisting vectors...");
{
let mut store = self.store.lock().await;
// Store MB relationships
if mb_relations_count > 0 {
// We need to rebuild just the MB part for proper source tagging
if let Ok((mb_vec, _)) = self.build_from_musicbrainz(artist_mbid).await {
store.set_vector(artist_mbid, &mb_vec, "musicbrainz")?;
}
if let Some(mb_vec) = mb_vec_to_store {
store.set_vector(artist_mbid, &mb_vec, "musicbrainz")?;
log::info!("[VectorBuilder] Stored MB vector for {}", artist_mbid);
}
// Store Qobuz similarities
if qobuz_similar_count > 0 {
if let Some(qobuz_id) = qobuz_artist_id {
if let Ok((qobuz_vec, _)) = self.build_from_qobuz(qobuz_id).await {
store.set_vector(artist_mbid, &qobuz_vec, "qobuz")?;
}
}
if let Some(qobuz_vec) = qobuz_vec_to_store {
store.set_vector(artist_mbid, &qobuz_vec, "qobuz")?;
log::info!("[VectorBuilder] Stored Qobuz vector for {}", artist_mbid);
}
}
log::info!("[VectorBuilder] build_vector COMPLETE for {}", artist_mbid);
Ok(BuildResult {
vector,