From d12ff15ee31067e7bbad6f5bb9014fecff6a0802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Thu, 19 Dec 2019 10:32:17 +0100 Subject: [PATCH] Set the indexes info in the create_index function --- meilisearch-core/src/database.rs | 6 +++++- meilisearch-http/src/routes/index.rs | 12 ++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/meilisearch-core/src/database.rs b/meilisearch-core/src/database.rs index ea57c7d14..7dd4d9866 100644 --- a/meilisearch-core/src/database.rs +++ b/meilisearch-core/src/database.rs @@ -236,9 +236,13 @@ impl Database { let (sender, receiver) = crossbeam_channel::bounded(100); let index = store::create(&self.env, &self.update_env, name, sender)?; - let mut writer = self.env.write_txn()?; + let mut writer = self.env.typed_write_txn::()?; self.indexes_store.put(&mut writer, name, &())?; + index.main.put_name(&mut writer, name)?; + index.main.put_created_at(&mut writer)?; + index.main.put_updated_at(&mut writer)?; + let env_clone = self.env.clone(); let update_env_clone = self.update_env.clone(); let index_clone = index.clone(); diff --git a/meilisearch-http/src/routes/index.rs b/meilisearch-http/src/routes/index.rs index bf37e2a28..61691923a 100644 --- a/meilisearch-http/src/routes/index.rs +++ b/meilisearch-http/src/routes/index.rs @@ -57,13 +57,13 @@ pub async fn list_indexes(ctx: Context) -> SResult { .map_err(ResponseError::internal)? .ok_or(ResponseError::internal("'updated_at' date not found"))?; - let index_reponse = IndexResponse { + let index_response = IndexResponse { name, uid: index_uid, created_at, updated_at, }; - response_body.push(index_reponse); + response_body.push(index_response); } None => error!( "Index {} is referenced in the indexes list but cannot be found", @@ -171,14 +171,6 @@ pub async fn create_index(mut ctx: Context) -> SResult { .main .put_name(&mut writer, &body.name) .map_err(ResponseError::internal)?; - created_index - .main - .put_created_at(&mut writer) - .map_err(ResponseError::internal)?; - created_index - .main - .put_updated_at(&mut writer) - .map_err(ResponseError::internal)?; let schema: Option = body.schema.clone().map(Into::into); let mut response_update_id = None;