From a90facaa41e0e22590f6353ec399b4c14df8214a Mon Sep 17 00:00:00 2001 From: Quentin de Quelen Date: Tue, 19 Nov 2019 16:15:49 +0100 Subject: [PATCH] Rename index_name by index_uid --- meilidb-core/examples/from_file.rs | 14 +++++++------- meilidb-core/src/database.rs | 18 +++++++++--------- meilidb-http/src/data.rs | 24 ++++++++++++------------ meilidb-http/src/helpers/tide.rs | 6 +++--- meilidb-http/src/routes/index.rs | 16 ++++++++-------- meilidb-http/src/routes/search.rs | 12 ++++++------ meilidb-http/src/routes/stats.rs | 20 ++++++++++---------- 7 files changed, 55 insertions(+), 55 deletions(-) diff --git a/meilidb-core/examples/from_file.rs b/meilidb-core/examples/from_file.rs index f7a135dd8..963254dd6 100644 --- a/meilidb-core/examples/from_file.rs +++ b/meilidb-core/examples/from_file.rs @@ -22,7 +22,7 @@ struct IndexCommand { database_path: PathBuf, #[structopt(long, default_value = "default")] - index_name: String, + index_uid: String, /// The csv file to index. #[structopt(parse(from_os_str))] @@ -46,7 +46,7 @@ struct SearchCommand { database_path: PathBuf, #[structopt(long, default_value = "default")] - index_name: String, + index_uid: String, /// Timeout after which the search will return results. #[structopt(long)] @@ -76,7 +76,7 @@ struct ShowUpdatesCommand { database_path: PathBuf, #[structopt(long, default_value = "default")] - index_name: String, + index_uid: String, } #[derive(Debug, StructOpt)] @@ -106,9 +106,9 @@ fn index_command(command: IndexCommand, database: Database) -> Result<(), Box index, - None => database.create_index(&command.index_name).unwrap(), + None => database.create_index(&command.index_uid).unwrap(), }; database.set_update_callback(Box::new(update_fn)); @@ -318,7 +318,7 @@ fn crop_text( fn search_command(command: SearchCommand, database: Database) -> Result<(), Box> { let env = &database.env; let index = database - .open_index(&command.index_name) + .open_index(&command.index_uid) .expect("Could not find index"); let reader = env.read_txn().unwrap(); @@ -446,7 +446,7 @@ fn show_updates_command( ) -> Result<(), Box> { let env = &database.env; let index = database - .open_index(&command.index_name) + .open_index(&command.index_uid) .expect("Could not find index"); let reader = env.read_txn().unwrap(); diff --git a/meilidb-core/src/database.rs b/meilidb-core/src/database.rs index fc290a0f6..8cd3cd2a0 100644 --- a/meilidb-core/src/database.rs +++ b/meilidb-core/src/database.rs @@ -45,7 +45,7 @@ pub type UpdateEventsEmitter = Sender; fn update_awaiter( receiver: UpdateEvents, env: heed::Env, - index_name: &str, + index_uid: &str, update_fn: Arc, index: Index, ) { @@ -91,7 +91,7 @@ fn update_awaiter( // call the user callback when the update and the result are written consistently if let Some(ref callback) = *update_fn.load() { - (callback)(index_name, status); + (callback)(index_uid, status); } } } @@ -116,22 +116,22 @@ impl Database { let mut must_open = Vec::new(); let reader = env.read_txn()?; for result in indexes_store.iter(&reader)? { - let (index_name, _) = result?; - must_open.push(index_name.to_owned()); + let (index_uid, _) = result?; + must_open.push(index_uid.to_owned()); } reader.abort(); // open the previously aggregated indexes let mut indexes = HashMap::new(); - for index_name in must_open { + for index_uid in must_open { let (sender, receiver) = crossbeam_channel::bounded(100); - let index = match store::open(&env, &index_name, sender.clone())? { + let index = match store::open(&env, &index_uid, sender.clone())? { Some(index) => index, None => { log::warn!( "the index {} doesn't exist or has not all the databases", - index_name + index_uid ); continue; } @@ -139,7 +139,7 @@ impl Database { let env_clone = env.clone(); let index_clone = index.clone(); - let name_clone = index_name.clone(); + let name_clone = index_uid.clone(); let update_fn_clone = update_fn.clone(); let handle = thread::spawn(move || { @@ -156,7 +156,7 @@ impl Database { // possible pre-boot updates are consumed sender.send(UpdateEvent::NewUpdate).unwrap(); - let result = indexes.insert(index_name, (index, handle)); + let result = indexes.insert(index_uid, (index, handle)); assert!( result.is_none(), "The index should not have been already open" diff --git a/meilidb-http/src/data.rs b/meilidb-http/src/data.rs index c4fba4af9..9a2617191 100644 --- a/meilidb-http/src/data.rs +++ b/meilidb-http/src/data.rs @@ -47,9 +47,9 @@ impl DataInner { pub fn last_update( &self, reader: &heed::RoTxn, - index_name: &str, + index_uid: &str, ) -> MResult>> { - let key = format!("last-update-{}", index_name); + let key = format!("last-update-{}", index_uid); match self .db .common_store() @@ -60,8 +60,8 @@ impl DataInner { } } - pub fn set_last_update(&self, writer: &mut heed::RwTxn, index_name: &str) -> MResult<()> { - let key = format!("last-update-{}", index_name); + pub fn set_last_update(&self, writer: &mut heed::RwTxn, index_uid: &str) -> MResult<()> { + let key = format!("last-update-{}", index_uid); self.db .common_store() .put::(writer, &key, &Utc::now()) @@ -71,9 +71,9 @@ impl DataInner { pub fn fields_frequency( &self, reader: &heed::RoTxn, - index_name: &str, + index_uid: &str, ) -> MResult> { - let key = format!("fields-frequency-{}", index_name); + let key = format!("fields-frequency-{}", index_uid); match self .db .common_store() @@ -84,11 +84,11 @@ impl DataInner { } } - pub fn compute_stats(&self, writer: &mut heed::RwTxn, index_name: &str) -> MResult<()> { - let index = match self.db.open_index(&index_name) { + pub fn compute_stats(&self, writer: &mut heed::RwTxn, index_uid: &str) -> MResult<()> { + let index = match self.db.open_index(&index_uid) { Some(index) => index, None => { - error!("Impossible to retrieve index {}", index_name); + error!("Impossible to retrieve index {}", index_uid); return Ok(()); } }; @@ -115,7 +115,7 @@ impl DataInner { .map(|(a, c)| (schema.attribute_name(a).to_owned(), c)) .collect(); - let key = format!("fields-frequency-{}", index_name); + let key = format!("fields-frequency-{}", index_uid); self.db .common_store() .put::(writer, &key, &frequency)?; @@ -144,8 +144,8 @@ impl Data { }; let callback_context = data.clone(); - db.set_update_callback(Box::new(move |index_name, status| { - index_update_callback(&index_name, &callback_context, status); + db.set_update_callback(Box::new(move |index_uid, status| { + index_update_callback(&index_uid, &callback_context, status); })); data diff --git a/meilidb-http/src/helpers/tide.rs b/meilidb-http/src/helpers/tide.rs index 3ede9d9f9..8890f6340 100644 --- a/meilidb-http/src/helpers/tide.rs +++ b/meilidb-http/src/helpers/tide.rs @@ -93,12 +93,12 @@ impl ContextExt for Context { } fn index(&self) -> Result { - let index_name = self.url_param("index")?; + let index_uid = self.url_param("index")?; let index = self .state() .db - .open_index(&index_name) - .ok_or(ResponseError::index_not_found(index_name))?; + .open_index(&index_uid) + .ok_or(ResponseError::index_not_found(index_uid))?; Ok(index) } diff --git a/meilidb-http/src/routes/index.rs b/meilidb-http/src/routes/index.rs index e915a3573..53b9f36e5 100644 --- a/meilidb-http/src/routes/index.rs +++ b/meilidb-http/src/routes/index.rs @@ -131,7 +131,7 @@ pub async fn create_index(mut ctx: Context) -> SResult { pub async fn update_schema(mut ctx: Context) -> SResult { ctx.is_allowed(IndexesWrite)?; - let index_name = ctx.url_param("index")?; + let index_uid = ctx.url_param("index")?; let schema = ctx .body_json::() @@ -143,8 +143,8 @@ pub async fn update_schema(mut ctx: Context) -> SResult { let mut writer = env.write_txn().map_err(ResponseError::internal)?; let index = db - .open_index(&index_name) - .ok_or(ResponseError::index_not_found(index_name))?; + .open_index(&index_uid) + .ok_or(ResponseError::index_not_found(index_uid))?; let schema: meilidb_schema::Schema = schema.into(); let update_id = index @@ -206,12 +206,12 @@ pub async fn get_all_updates_status(ctx: Context) -> SResult { pub async fn delete_index(ctx: Context) -> SResult { ctx.is_allowed(IndexesWrite)?; - let index_name = ctx.url_param("index")?; + let index_uid = ctx.url_param("index")?; let found = ctx .state() .db - .delete_index(&index_name) + .delete_index(&index_uid) .map_err(ResponseError::internal)?; if found { @@ -221,12 +221,12 @@ pub async fn delete_index(ctx: Context) -> SResult { } } -pub fn index_update_callback(index_name: &str, data: &Data, _status: ProcessedUpdateResult) { +pub fn index_update_callback(index_uid: &str, data: &Data, _status: ProcessedUpdateResult) { let env = &data.db.env; let mut writer = env.write_txn().unwrap(); - data.compute_stats(&mut writer, &index_name).unwrap(); - data.set_last_update(&mut writer, &index_name).unwrap(); + data.compute_stats(&mut writer, &index_uid).unwrap(); + data.set_last_update(&mut writer, &index_uid).unwrap(); writer.commit().unwrap(); } diff --git a/meilidb-http/src/routes/search.rs b/meilidb-http/src/routes/search.rs index 116f76e03..f144e3f32 100644 --- a/meilidb-http/src/routes/search.rs +++ b/meilidb-http/src/routes/search.rs @@ -181,10 +181,10 @@ pub async fn search_multi_index(mut ctx: Context) -> SResult { let par_body = body.clone(); let responses_per_index: Vec> = index_list .into_par_iter() - .map(move |index_name| { + .map(move |index_uid| { let index: Index = db - .open_index(&index_name) - .ok_or(ResponseError::index_not_found(&index_name))?; + .open_index(&index_uid) + .ok_or(ResponseError::index_not_found(&index_uid))?; let mut search_builder = index.new_search(par_body.query.clone()); @@ -221,7 +221,7 @@ pub async fn search_multi_index(mut ctx: Context) -> SResult { let response = search_builder .search(&reader) .map_err(ResponseError::internal)?; - Ok((index_name, response)) + Ok((index_uid, response)) }) .collect(); @@ -230,11 +230,11 @@ pub async fn search_multi_index(mut ctx: Context) -> SResult { let mut max_query_time = 0; for response in responses_per_index { - if let Ok((index_name, response)) = response { + if let Ok((index_uid, response)) = response { if response.processing_time_ms > max_query_time { max_query_time = response.processing_time_ms; } - hits_map.insert(index_name, response.hits); + hits_map.insert(index_uid, response.hits); } } diff --git a/meilidb-http/src/routes/stats.rs b/meilidb-http/src/routes/stats.rs index dd4d24653..afc8ceaaf 100644 --- a/meilidb-http/src/routes/stats.rs +++ b/meilidb-http/src/routes/stats.rs @@ -23,7 +23,7 @@ struct IndexStatsResponse { pub async fn index_stat(ctx: Context) -> SResult { ctx.is_allowed(Admin)?; - let index_name = ctx.url_param("index")?; + let index_uid = ctx.url_param("index")?; let index = ctx.index()?; let env = &ctx.state().db.env; @@ -36,19 +36,19 @@ pub async fn index_stat(ctx: Context) -> SResult { let fields_frequency = ctx .state() - .fields_frequency(&reader, &index_name) + .fields_frequency(&reader, &index_uid) .map_err(ResponseError::internal)? .unwrap_or_default(); let is_indexing = ctx .state() - .is_indexing(&reader, &index_name) + .is_indexing(&reader, &index_uid) .map_err(ResponseError::internal)? .ok_or(ResponseError::not_found("Index not found"))?; let last_update = ctx .state() - .last_update(&reader, &index_name) + .last_update(&reader, &index_uid) .map_err(ResponseError::internal)?; let response = IndexStatsResponse { @@ -73,11 +73,11 @@ pub async fn get_stats(ctx: Context) -> SResult { let mut index_list = HashMap::new(); if let Ok(indexes_set) = ctx.state().db.indexes_names() { - for index_name in indexes_set { + for index_uid in indexes_set { let db = &ctx.state().db; let env = &db.env; - let index = db.open_index(&index_name).unwrap(); + let index = db.open_index(&index_uid).unwrap(); let reader = env.read_txn().map_err(ResponseError::internal)?; let number_of_documents = index @@ -87,19 +87,19 @@ pub async fn get_stats(ctx: Context) -> SResult { let fields_frequency = ctx .state() - .fields_frequency(&reader, &index_name) + .fields_frequency(&reader, &index_uid) .map_err(ResponseError::internal)? .unwrap_or_default(); let is_indexing = ctx .state() - .is_indexing(&reader, &index_name) + .is_indexing(&reader, &index_uid) .map_err(ResponseError::internal)? .ok_or(ResponseError::not_found("Index not found"))?; let last_update = ctx .state() - .last_update(&reader, &index_name) + .last_update(&reader, &index_uid) .map_err(ResponseError::internal)?; let response = IndexStatsResponse { @@ -108,7 +108,7 @@ pub async fn get_stats(ctx: Context) -> SResult { last_update, fields_frequency, }; - index_list.insert(index_name, response); + index_list.insert(index_uid, response); } }