refactor meilisearch

meilisearch-http/src/index_controller/dump_actor/loaders/v1.rs

@@ -1,20 +1,16 @@
 use std::collections::{BTreeMap, BTreeSet};
-use std::fs::{create_dir_all, File};
-use std::io::BufRead;
 use std::marker::PhantomData;
 use std::path::Path;
-use std::sync::Arc;
 
-use heed::EnvOpenOptions;
 use log::{error, info, warn};
-use milli::update::{IndexDocumentsMethod, Setting, UpdateFormat};
+use milli::update::Setting;
 use serde::{Deserialize, Deserializer, Serialize};
 use uuid::Uuid;
 
 use crate::index_controller::{self, uuid_resolver::HeedUuidStore, IndexMetadata};
 use crate::index_controller::{asc_ranking_rule, desc_ranking_rule};
 use crate::{
-    index::{update_handler::UpdateHandler, Index, Unchecked},
+    index::Unchecked,
     option::IndexerOpts,
 };
 
@@ -86,57 +82,57 @@ struct Settings {
 }
 
 fn load_index(
-    src: impl AsRef<Path>,
-    dst: impl AsRef<Path>,
-    uuid: Uuid,
-    primary_key: Option<&str>,
-    size: usize,
-    indexer_options: &IndexerOpts,
+    _src: impl AsRef<Path>,
+    _dst: impl AsRef<Path>,
+    _uuid: Uuid,
+    _primary_key: Option<&str>,
+    _size: usize,
+    _indexer_options: &IndexerOpts,
 ) -> anyhow::Result<()> {
-    let index_path = dst.as_ref().join(&format!("indexes/index-{}", uuid));
+    todo!("fix dump obkv documents")
+    //let index_path = dst.as_ref().join(&format!("indexes/index-{}", uuid));
 
-    create_dir_all(&index_path)?;
-    let mut options = EnvOpenOptions::new();
-    options.map_size(size);
-    let index = milli::Index::new(options, index_path)?;
-    let index = Index(Arc::new(index));
+    //create_dir_all(&index_path)?;
+    //let mut options = EnvOpenOptions::new();
+    //options.map_size(size);
+    //let index = milli::Index::new(options, index_path)?;
+    //let index = Index(Arc::new(index));
 
-    // extract `settings.json` file and import content
-    let settings = import_settings(&src)?;
-    let settings: index_controller::Settings<Unchecked> = settings.into();
+    //// extract `settings.json` file and import content
+    //let settings = import_settings(&src)?;
+    //let settings: index_controller::Settings<Unchecked> = settings.into();
 
-    let mut txn = index.write_txn()?;
+    //let mut txn = index.write_txn()?;
 
-    let handler = UpdateHandler::new(indexer_options)?;
+    //let handler = UpdateHandler::new(indexer_options)?;
 
-    index.update_settings_txn(&mut txn, &settings.check(), handler.update_builder(0))?;
+    //index.update_settings_txn(&mut txn, &settings.check(), handler.update_builder(0))?;
 
-    let file = File::open(&src.as_ref().join("documents.jsonl"))?;
-    let mut reader = std::io::BufReader::new(file);
-    reader.fill_buf()?;
-    if !reader.buffer().is_empty() {
-        index.update_documents_txn(
-            &mut txn,
-            UpdateFormat::JsonStream,
-            IndexDocumentsMethod::ReplaceDocuments,
-            Some(reader),
-            handler.update_builder(0),
-            primary_key,
-        )?;
-    }
+    //let file = File::open(&src.as_ref().join("documents.jsonl"))?;
+    //let mut reader = std::io::BufReader::new(file);
+    //reader.fill_buf()?;
+    //if !reader.buffer().is_empty() {
+        //index.update_documents_txn(
+            //&mut txn,
+            //IndexDocumentsMethod::ReplaceDocuments,
+            //Some(reader),
+            //handler.update_builder(0),
+            //primary_key,
+        //)?;
+    //}
 
-    txn.commit()?;
+    //txn.commit()?;
 
-    // Finaly, we extract the original milli::Index and close it
-    Arc::try_unwrap(index.0)
-        .map_err(|_e| "Couldn't close the index properly")
-        .unwrap()
-        .prepare_for_closing()
-        .wait();
+    //// Finaly, we extract the original milli::Index and close it
+    //Arc::try_unwrap(index.0)
+        //.map_err(|_e| "Couldn't close the index properly")
+        //.unwrap()
+        //.prepare_for_closing()
+        //.wait();
 
-    // Updates are ignored in dumps V1.
+    //// Updates are ignored in dumps V1.
 
-    Ok(())
+    //Ok(())
 }
 
 /// we need to **always** be able to convert the old settings to the settings currently being used
@@ -203,15 +199,15 @@ impl From<Settings> for index_controller::Settings<Unchecked> {
     }
 }
 
-/// Extract Settings from `settings.json` file present at provided `dir_path`
-fn import_settings(dir_path: impl AsRef<Path>) -> anyhow::Result<Settings> {
-    let path = dir_path.as_ref().join("settings.json");
-    let file = File::open(path)?;
-    let reader = std::io::BufReader::new(file);
-    let metadata = serde_json::from_reader(reader)?;
+// /// Extract Settings from `settings.json` file present at provided `dir_path`
+//fn import_settings(dir_path: impl AsRef<Path>) -> anyhow::Result<Settings> {
+    //let path = dir_path.as_ref().join("settings.json");
+    //let file = File::open(path)?;
+    //let reader = std::io::BufReader::new(file);
+    //let metadata = serde_json::from_reader(reader)?;
 
-    Ok(metadata)
-}
+    //Ok(metadata)
+//}
 
 #[cfg(test)]
 mod test {