Reorganising storage layer

src/json/mod.rs

@@ -1,2 +0,0 @@
-pub mod model;
-pub mod storage;

src/lib.rs

@@ -11,6 +11,6 @@ extern crate arrayref;
 extern crate serde_derive;
 
 mod database;
-pub mod json;
+pub mod storage;
 
 pub use database::*;

src/main.rs

@@ -1,8 +1,8 @@
 #[macro_use]
 extern crate measure_time;
 
-use mercator_db::json::storage;
 use mercator_db::space::Shape;
+use mercator_db::storage;
 use mercator_db::CoreQueryParameters;
 use mercator_db::DataBase;
 
@@ -16,14 +16,14 @@ fn main() {
     // Convert to binary the JSON data:
     if true {
         info_time!("Converting to binary JSON data");
-        storage::convert::<Vec<mercator_db::json::model::Space>>("10k.spaces");
+        storage::json::from::<Vec<mercator_db::storage::model::Space>>("10k.spaces");
-        storage::convert::<Vec<mercator_db::json::model::SpatialObject>>("10k.objects");
+        storage::json::from::<Vec<mercator_db::storage::model::v1::SpatialObject>>("10k.objects");
     }
 
     // Build a Database Index:
     if true {
         info_time!("Building database index");
-        storage::build("10k", "v0.1", None, None);
+        storage::bincode::build("10k", "v0.1", None, None);
     }
 
     // Load a Database:
@@ -69,7 +69,7 @@ fn main() {
         let r = core.get_by_label(&c, id).unwrap();
         println!("get_by_label {}: {}", id, r.len());
         if !r.is_empty() {
-            println!("{}: {:?}\n", id, r[0].1[0]);
+            println!("{}: {:?}\n", id, r); // no overlaping point, so no results
         }
 
         let lower = space.encode(&[0.2, 0.2, 0.2]).unwrap();

src/storage/bincode.rs

@@ -5,31 +5,8 @@ use memmap::Mmap;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 
-use crate::json::model;
+use super::model;
 
-pub fn from_json<T>(from: &str, to: &str)
-where
-    T: Serialize + DeserializeOwned,
-{
-    let file_in =
-        File::open(from).unwrap_or_else(|e| panic!("Unable to read file: {}: {}", from, e));
-    let file_out =
-        File::create(to).unwrap_or_else(|e| panic!("Unable to create file: {}: {}", to, e));
-
-    // We create a buffered writer from the file we get
-    let writer = BufWriter::new(&file_out);
-
-    let mmap = unsafe {
-        Mmap::map(&file_in)
-            .unwrap_or_else(|e| panic!("Unable to map in memory the file: {}: {}", from, e))
-    };
-    let v: T = serde_json::from_slice(&mmap[..])
-        .unwrap_or_else(|e| panic!("Unable to parse the json data from: {}: {}", from, e));
-
-    bincode::serialize_into(writer, &v).unwrap();
-}
-
-//FIXME: Move to ironsea_store?
 pub fn load<T>(from: &str) -> T
 where
     T: DeserializeOwned,
@@ -46,7 +23,6 @@ where
         .unwrap_or_else(|e| panic!("Unable to parse the json data from: {}: {}", from, e))
 }
 
-//FIXME: Move to ironsea_store?
 pub fn store<T>(data: T, to: &str)
 where
     T: Serialize,
@@ -60,17 +36,6 @@ where
     bincode::serialize_into(writer, &data).unwrap();
 }
 
-pub fn convert<T>(name: &str)
-where
-    T: Serialize + DeserializeOwned,
-{
-    // Convert definitions from json to bincode
-    let fn_in = format!("{}.json", name);
-    let fn_out = format!("{}.bin", name);
-
-    from_json::<T>(&fn_in, &fn_out);
-}
-
 pub fn build(
     name: &str,
     version: &str,
@@ -86,7 +51,7 @@ pub fn build(
         .map(|s| s.into())
         .collect::<Vec<_>>();
 
-    let objects = load::<Vec<model::v1::SpatialObject>>(&fn_objects);
+    let objects = load::<Vec<model::SpatialObject>>(&fn_objects);
 
     let core = model::build_index(name, version, &spaces, &objects, scales, max_elements);
 

src/storage/json.rs

@@ -0,0 +1,39 @@
+use std::fs::File;
+use std::io::BufWriter;
+
+use memmap::Mmap;
+use serde::de::DeserializeOwned;
+use serde::Serialize;
+
+fn convert<T>(from: &str, to: &str)
+where
+    T: Serialize + DeserializeOwned,
+{
+    let file_in =
+        File::open(from).unwrap_or_else(|e| panic!("Unable to read file: {}: {}", from, e));
+    let file_out =
+        File::create(to).unwrap_or_else(|e| panic!("Unable to create file: {}: {}", to, e));
+
+    // We create a buffered writer from the file we get
+    let writer = BufWriter::new(&file_out);
+
+    let mmap = unsafe {
+        Mmap::map(&file_in)
+            .unwrap_or_else(|e| panic!("Unable to map in memory the file: {}: {}", from, e))
+    };
+    let v: T = serde_json::from_slice(&mmap[..])
+        .unwrap_or_else(|e| panic!("Unable to parse the json data from: {}: {}", from, e));
+
+    bincode::serialize_into(writer, &v).unwrap();
+}
+
+pub fn from<T>(name: &str)
+where
+    T: Serialize + DeserializeOwned,
+{
+    // Convert definitions from json to bincode
+    let fn_in = format!("{}.json", name);
+    let fn_out = format!("{}.bin", name);
+
+    convert::<T>(&fn_in, &fn_out);
+}

src/storage/mod.rs

@@ -0,0 +1,3 @@
+pub mod bincode;
+pub mod json;
+pub mod model;

src/storage/model.rs

@@ -233,11 +233,13 @@ impl From<&&database::Properties> for Properties {
     }
 }
 
+pub use v1::SpatialObject;
+
 pub fn build_index(
     name: &str,
     version: &str,
     spaces: &[space::Space],
-    objects: &[v1::SpatialObject],
+    objects: &[SpatialObject],
     scales: Option<Vec<Vec<u32>>>,
     max_elements: Option<usize>,
 ) -> Core {