Server: limits file loading concurrency

Bug #210

Cargo.lock

@@ -827,6 +827,7 @@ dependencies = [
  "oxigraph",
  "oxiri",
  "rand",
+ "rayon-core",
  "sparesults",
  "url",
 ]

server/Cargo.toml

@@ -20,3 +20,4 @@ rand = "0.8"
 url = "2"
 oxiri = "0.2"
 flate2 = "1"
+rayon-core = "1"

server/src/main.rs

@@ -8,16 +8,17 @@ use oxigraph::sparql::{Query, QueryResults, Update};
 use oxigraph::store::{BulkLoader, Store};
 use oxiri::Iri;
 use rand::random;
+use rayon_core::ThreadPoolBuilder;
 use sparesults::{QueryResultsFormat, QueryResultsSerializer};
 use std::cell::RefCell;
-use std::cmp::min;
+use std::cmp::{max, min};
 use std::fmt;
 use std::fs::File;
-use std::io::{self, BufReader, ErrorKind, Read, Write};
+use std::io::{self, BufReader, Error, ErrorKind, Read, Write};
 use std::path::PathBuf;
 use std::rc::Rc;
 use std::str::FromStr;
-use std::thread::{spawn, JoinHandle};
+use std::thread::available_parallelism;
 use std::time::{Duration, Instant};
 use url::form_urlencoded;
 
@@ -70,12 +71,16 @@ pub fn main() -> std::io::Result<()> {
 
     match matches.command {
         Command::Load { file, lenient } => {
-            let handles = file
+            ThreadPoolBuilder::new()
-                .iter()
+                .num_threads(max(1, available_parallelism()?.get() / 2))
-                .map(|file| {
+                .thread_name(|i| format!("Oxigraph bulk loader thread {}", i))
+                .build()
+                .map_err(|e| Error::new(ErrorKind::Other, e))?
+                .scope(|s| {
+                    for file in file {
                         let store = store.clone();
                         let file = file.to_string();
-                    spawn(move || {
+                        s.spawn(move |_| {
                             let f = file.clone();
                             let start = Instant::now();
                             let mut loader = store.bulk_loader().on_progress(move |size| {
@@ -89,26 +94,35 @@ pub fn main() -> std::io::Result<()> {
                                 )
                             });
                             if lenient {
-                            loader = loader.on_parse_error(|e| {
+                                let f = file.clone();
-                                eprintln!("Parsing error: {}", e);
+                                loader = loader.on_parse_error(move |e| {
+                                    eprintln!("Parsing error on file {}: {}", f, e);
                                     Ok(())
                                 })
                             }
+                            let fp = match File::open(&file) {
+                                Ok(fp) => fp,
+                                Err(error) => {
+                                    eprintln!("Error while opening file {}: {}", file, error);
+                                    return;
+                                }
+                            };
+                            if let Err(error) = {
                                 if file.ends_with(".gz") {
                                     bulk_load(
                                         loader,
                                         &file[..file.len() - 3],
-                                MultiGzDecoder::new(File::open(&file)?),
+                                        MultiGzDecoder::new(fp),
                                     )
                                 } else {
-                            bulk_load(loader, &file, File::open(&file)?)
+                                    bulk_load(loader, &file, fp)
+                                }
+                            } {
+                                eprintln!("Error while loading file {}: {}", file, error)
                             }
                         })
-                })
-                .collect::<Vec<JoinHandle<io::Result<()>>>>();
-            for handle in handles {
-                handle.join().unwrap()?;
                     }
+                });
             Ok(())
         }
         Command::Serve { bind } => {