Merge branch 'main' into bugfix/meta-query-multiple-alternatives

Author: thomaskrause

cli/src/bin/annis_bench_queries.rs

@@ -43,11 +43,7 @@ pub fn create_query_input<M>(
                     query_language: QueryLanguage::AQL,
                     timeout: None,
                 };
-                let count = if let Ok(count) = cs.count(search_query) {
-                    count
-                } else {
-                    0
-                };
+                let count = cs.count(search_query).unwrap_or_default();
                 assert_eq!(def.count, count);
             });
         });

graphannis/src/annis/db/corpusstorage.rs

@@ -1408,28 +1408,16 @@ impl CorpusStorage {
             db.apply_update(update, |_| {})?;
         }
         // start background thread to persists the results
-
         let active_background_workers = self.active_background_workers.clone();
         {
             let (lock, _cvar) = &*active_background_workers;
             let mut nr_active_background_workers = lock.lock()?;
             *nr_active_background_workers += 1;
         }
         thread::spawn(move || {
-            trace!("Starting background thread to sync WAL updates");
-            let lock = db_entry.read().unwrap();
-            if let Ok(db) = get_read_or_error(&lock) {
-                let db: &AnnotationGraph = db;
-                if let Err(e) = db.background_sync_wal_updates() {
-                    error!("Can't sync changes in background thread: {:?}", e);
-                } else {
-                    trace!("Finished background thread to sync WAL updates");
-                }
+            if let Err(err) = sync_wal_updates_in_background(db_entry, active_background_workers) {
+                error!("Error in WAL update background thread: {}", err);
             }
-            let (lock, cvar) = &*active_background_workers;
-            let mut nr_active_background_workers = lock.lock().unwrap();
-            *nr_active_background_workers -= 1;
-            cvar.notify_all();
         });
 
         Ok(())
@@ -2739,3 +2727,24 @@ fn create_lockfile_for_directory(db_dir: &Path) -> Result<File> {
 
     Ok(lock_file)
 }
+
+fn sync_wal_updates_in_background(
+    db_entry: Arc<RwLock<CacheEntry>>,
+    active_background_workers: Arc<(Mutex<usize>, Condvar)>,
+) -> Result<()> {
+    trace!("Starting background thread to sync WAL updates");
+    let lock = db_entry.read()?;
+    if let Ok(db) = get_read_or_error(&lock) {
+        let db: &AnnotationGraph = db;
+        if let Err(e) = db.background_sync_wal_updates() {
+            error!("Can't sync changes in background thread: {:?}", e);
+        } else {
+            trace!("Finished background thread to sync WAL updates");
+        }
+    }
+    let (lock, cvar) = &*active_background_workers;
+    let mut nr_active_background_workers = lock.lock()?;
+    *nr_active_background_workers -= 1;
+    cvar.notify_all();
+    Ok(())
+}