From 75b3529eb984e83f48eddb80c847872f9723c263 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel.sambuc@epfl.ch>
Date: Fri, 4 Oct 2019 19:27:02 +0200
Subject: [PATCH] Support multiple cores (Datasets)

---
 Cargo.toml  |  2 +-
 src/main.rs | 46 +++++++++++++++++++++-------------------------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index bce9622..f1d61cc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,6 +26,7 @@ actix-web = "^1.0"
 actix-files = "^0.1"
 actix-service = "^0.4"
 actix-cors = "^0.1"
+glob = "^0.3"
 
 measure_time = "^0.6"
 memmap = "^0.7"
@@ -39,7 +40,6 @@ serde_json = "^1.0"
 bincode = "^1.1"
 
 # Logging macros API
-#log = { version = "^0.4", features = ["max_level_trace", "release_max_level_info"] }
 log = { version = "^0.4", features = ["max_level_trace", "release_max_level_trace"] }
 pretty_env_logger = "^0.3" # Logger implementation
 
diff --git a/src/main.rs b/src/main.rs
index f86e0f0..77fc096 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,6 +11,7 @@ use std::process::exit;
 use std::sync::RwLock;
 
 use actix_web::web::Data;
+use glob::glob;
 use mercator_db::json::model;
 use mercator_db::DataBase;
 
@@ -45,15 +46,14 @@ fn main() {
         // Allow by default access from a locally running Swagger Editor instance.
         std::env::set_var("MERCATOR_ALLOWED_ORIGINS", "http://localhost:3200");
     }
-    /* UNUSED FOR NOW
+
     if std::env::var("MERCATOR_DATA").is_err() {
         std::env::set_var("MERCATOR_DATA", ".");
     }
-    */
 
     let hostname;
     let port;
-    //let data;
+    let data;
 
     match std::env::var("MERCATOR_HOST") {
         Ok(val) => hostname = val,
@@ -77,38 +77,34 @@ fn main() {
         }
     };
 
-    /* UNUSED FOR NOW
     match std::env::var("MERCATOR_DATA") {
         Ok(val) => data = val,
         Err(val) => {
             error!("Could not fetch {} : `{}`", "MERCATOR_DATA", val);
             exit(1);
         }
-    };*/
+    };
+
+    let datasets = glob(&format!("{}/*.index", data))
+        .expect("Failed to read glob pattern")
+        .filter_map(|entry| match entry {
+            Ok(path) => match path.canonicalize() {
+                Ok(path) => Some(format!("{}", path.display())),
+                Err(_) => None,
+            },
+            Err(_) => None,
+        })
+        .collect::<Vec<_>>();
+
+    // FIXME: Why do we have to go through a temporary variable?
+    let datasets = datasets.iter().map(String::as_str).collect::<Vec<_>>();
 
     let db;
+    // Load a Database:
     {
-        // Temporary, until data ingestion can be done through the REST API.
-        let import;
+        info_time!("Loading database index");
 
-        if std::env::var("MERCATOR_IMPORT_DATA").is_err() {
-            std::env::set_var("MERCATOR_IMPORT_DATA", "test_data");
-        }
-
-        match std::env::var("MERCATOR_IMPORT_DATA") {
-            Ok(val) => import = val,
-            Err(val) => {
-                error!("Could not fetch {} : `{}`", "MERCATOR_IMPORT_DATA", val);
-                exit(1);
-            }
-        };
-
-        // Load a Database:
-        {
-            info_time!("Loading database index");
-            db = DataBase::load(&import).unwrap();
-        }
-        // END of Temporary bloc
+        db = DataBase::load(&datasets).unwrap();
     }
 
     rest_api::run(