Add migration for #529

Author: joepio

lib/src/db.rs

@@ -89,7 +89,7 @@ impl Db {
     pub fn init(path: &std::path::Path, server_url: String) -> AtomicResult<Db> {
         let db = sled::open(path).map_err(|e|format!("Failed opening DB at this location: {:?} . Is another instance of Atomic Server running? {}", path, e))?;
         let resources = db.open_tree("resources_v1").map_err(|e|format!("Failed building resources. Your DB might be corrupt. Go back to a previous version and export your data. {}", e))?;
-        let reference_index = db.open_tree("reference_index")?;
+        let reference_index = db.open_tree("reference_index_v1")?;
         let query_index = db.open_tree("members_index")?;
         let prop_val_sub_index = db.open_tree("prop_val_sub_index")?;
         let watched_queries = db.open_tree("watched_queries")?;

lib/src/db/migrations.rs

@@ -12,14 +12,15 @@ Therefore, we need migrations to convert the old schema to the new one.
 - Update the Tree key used in [Db::init]
  */
 
-use crate::{errors::AtomicResult, Db};
+use crate::{errors::AtomicResult, Db, Storelike};
 
 /// Checks the current version(s) of the internal Store, and performs migrations if needed.
 pub fn migrate_maybe(store: &Db) -> AtomicResult<()> {
     for tree in store.db.tree_names() {
         match String::from_utf8_lossy(&tree).as_ref() {
             // Add migrations for outdated Trees to this list
             "resources" => v0_to_v1(store)?,
+            "reference_index" => ref_v0_to_v1(store)?,
             _other => {}
         }
     }
@@ -71,3 +72,12 @@ fn v0_to_v1(store: &Db) -> AtomicResult<()> {
     tracing::warn!("Finished migration of {} resources", count);
     Ok(())
 }
+
+/// Add `prop_val_sub` index
+fn ref_v0_to_v1(store: &Db) -> AtomicResult<()> {
+    tracing::warn!("Rebuilding indexes...");
+    store.db.drop_tree("reference_index")?;
+    store.build_index(true)?;
+    tracing::warn!("Rebuilding index finished!");
+    Ok(())
+}

lib/src/storelike.rs

@@ -377,7 +377,7 @@ impl Query {
             sort_by: None,
             sort_desc: false,
             include_external: false,
-            include_nested: false,
+            include_nested: true,
             for_agent: None,
         }
     }
@@ -399,6 +399,12 @@ impl Query {
     }
 }
 
+impl Default for Query {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 pub struct QueryResult {
     pub subjects: Vec<String>,
     pub resources: Vec<Resource>,