snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-27 04:25:06 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

update to infer identifier; fix #498

Browse Source
This commit is contained in:
qdequele 2020-03-05 15:49:47 +01:00 committed by Quentin de Quelen
parent 6d86968c4c
commit 16a99aa95e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meilisearch-http/src/routes/document.rs
View File

@ -1,7 +1,7 @@
use std::collections::{BTreeSet, HashSet}; use std::collections::{BTreeSet, HashSet};
use indexmap::IndexMap; use indexmap::IndexMap;
use meilisearch_core::settings::{SettingsUpdate, UpdateState}; use meilisearch_schema::Schema;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::Value; use serde_json::Value;
use tide::{Request, Response}; use tide::{Request, Response};
@ -135,7 +135,7 @@ async fn update_multiple_documents(mut ctx: Request<Data>, is_partial: bool) ->
let db = &ctx.state().db; let db = &ctx.state().db;
let reader = db.main_read_txn()?; let reader = db.main_read_txn()?;
let mut update_writer = db.update_write_txn()?;
let current_schema = index.main.schema(&reader)?; let current_schema = index.main.schema(&reader)?;
if current_schema.is_none() { if current_schema.is_none() {
let id = match query.identifier { let id = match query.identifier {
@ -145,11 +145,9 @@ async fn update_multiple_documents(mut ctx: Request<Data>, is_partial: bool) ->
None => return Err(ResponseError::bad_request("Could not infer a schema")), None => return Err(ResponseError::bad_request("Could not infer a schema")),
}, },
}; };
let settings_update = SettingsUpdate { let mut writer = db.main_write_txn()?;
identifier: UpdateState::Update(id), index.main.put_schema(&mut writer, &Schema::with_identifier(&id))?;
..SettingsUpdate::default() writer.commit()?;
};
index.settings_update(&mut update_writer, settings_update)?;
} }
let mut document_addition = if is_partial { let mut document_addition = if is_partial {
@ -162,6 +160,7 @@ async fn update_multiple_documents(mut ctx: Request<Data>, is_partial: bool) ->
document_addition.update_document(document); document_addition.update_document(document);
} }
let mut update_writer = db.update_write_txn()?;
let update_id = document_addition.finalize(&mut update_writer)?; let update_id = document_addition.finalize(&mut update_writer)?;
update_writer.commit()?; update_writer.commit()?;