From 39c16c0fe4c05241036fa952ff7c7d3e166d2de2 Mon Sep 17 00:00:00 2001
From: Marin Postma <postma.marin@protonmail.com>
Date: Sun, 30 May 2021 12:35:17 +0200
Subject: [PATCH] fix dump import

---
 .../update_actor/store/dump.rs                | 26 +++++++++++--------
 .../update_actor/store/mod.rs                 |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/meilisearch-http/src/index_controller/update_actor/store/dump.rs b/meilisearch-http/src/index_controller/update_actor/store/dump.rs
index ec7aeea87..fb4b7d5ac 100644
--- a/meilisearch-http/src/index_controller/update_actor/store/dump.rs
+++ b/meilisearch-http/src/index_controller/update_actor/store/dump.rs
@@ -12,7 +12,7 @@ use uuid::Uuid;
 
 use super::UpdateStore;
 use super::{codec::UpdateKeyCodec, State};
-use crate::index_controller::{index_actor::IndexActorHandle, UpdateStatus};
+use crate::index_controller::{Enqueued, UpdateStatus, index_actor::IndexActorHandle, update_actor::store::update_uuid_to_file_path};
 
 #[derive(Serialize, Deserialize)]
 struct UpdateEntry {
@@ -69,7 +69,7 @@ impl UpdateStore {
         txn: &RoTxn,
         uuids: &HashSet<Uuid>,
         mut file: &mut File,
-        dst_update_files: impl AsRef<Path>,
+        dst_path: impl AsRef<Path>,
     ) -> anyhow::Result<()> {
         let pendings = self.pending_queue.iter(txn)?.lazily_decode_data();
 
@@ -79,10 +79,9 @@ impl UpdateStore {
                 let update = data.decode()?;
 
                 if let Some(ref update_uuid) = update.content {
-                    let src = dbg!(super::update_uuid_to_file_path(&self.path, *update_uuid));
-                    let dst = dbg!(super::update_uuid_to_file_path(&dst_update_files, *update_uuid));
-                    assert!(src.exists());
-                    dbg!(std::fs::copy(src, dst))?;
+                    let src = super::update_uuid_to_file_path(&self.path, *update_uuid);
+                    let dst = super::update_uuid_to_file_path(&dst_path, *update_uuid);
+                    std::fs::copy(src, dst)?;
                 }
 
                 println!("copied files");
@@ -144,6 +143,8 @@ impl UpdateStore {
         let update_data = File::open(&src_update_path.join("data.jsonl"))?;
         let mut update_data = BufReader::new(update_data);
 
+        std::fs::create_dir_all(dst_update_path.join("update_files/"))?;
+
         let mut wtxn = store.env.write_txn()?;
         let mut line = String::new();
         loop {
@@ -151,7 +152,14 @@ impl UpdateStore {
                 Ok(0) => break,
                 Ok(_) => {
                     let UpdateEntry { uuid, update } = serde_json::from_str(&line)?;
-                    store.register_raw_updates(&mut wtxn, update, uuid)?;
+                    store.register_raw_updates(&mut wtxn, &update, uuid)?;
+
+                    // Copy ascociated update path if it exists
+                    if let UpdateStatus::Enqueued(Enqueued { content: Some(uuid), .. }) = update {
+                        let src = update_uuid_to_file_path(&src_update_path, uuid);
+                        let dst = update_uuid_to_file_path(&dst_update_path, uuid);
+                        std::fs::copy(src, dst)?;
+                    }
                 }
                 _ => break,
             }
@@ -159,10 +167,6 @@ impl UpdateStore {
             line.clear();
         }
 
-        let dst_update_files_path = dst_update_path.join("update_files/");
-        let src_update_files_path = src_update_path.join("update_files/");
-        std::fs::copy(src_update_files_path, dst_update_files_path)?;
-
         wtxn.commit()?;
 
         Ok(())
diff --git a/meilisearch-http/src/index_controller/update_actor/store/mod.rs b/meilisearch-http/src/index_controller/update_actor/store/mod.rs
index 6910d5144..6e8f87a79 100644
--- a/meilisearch-http/src/index_controller/update_actor/store/mod.rs
+++ b/meilisearch-http/src/index_controller/update_actor/store/mod.rs
@@ -244,7 +244,7 @@ impl UpdateStore {
     pub fn register_raw_updates(
         &self,
         wtxn: &mut heed::RwTxn,
-        update: UpdateStatus,
+        update: &UpdateStatus,
         index_uuid: Uuid,
     ) -> heed::Result<()> {
         match update {