searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-22 21:04:27 +01:00
Code Issues Releases Wiki Activity

Merge #578

Browse Source 
578: Bump uuid to 1.1.2 r=ManyTheFish a=Kerollmops

Just to [align the version with Meilisearch](https://github.com/meilisearch/meilisearch/pull/2584).

Co-authored-by: Kerollmops <clement@meilisearch.com>
This commit is contained in:
bors[bot] 2022-07-05 14:56:08 +00:00 committed by GitHub
commit ebddfdb9a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
milli/Cargo.toml
View File

@ -37,7 +37,7 @@ smartstring = "1.0.1"
tempfile = "3.3.0" tempfile = "3.3.0"
thiserror = "1.0.31" thiserror = "1.0.31"
time = { version = "0.3.7", features = ["serde-well-known", "formatting", "parsing", "macros"] } time = { version = "0.3.7", features = ["serde-well-known", "formatting", "parsing", "macros"] }
uuid = { version = "0.8.2", features = ["v4"] } uuid = { version = "1.1.2", features = ["v4"] }
filter-parser = { path = "../filter-parser" } filter-parser = { path = "../filter-parser" }

6
milli/src/update/index_documents/transform.rs
View File

@ -205,7 +205,7 @@ impl<'a, 'i> Transform<'a, 'i> {
// it, transform it into a string and validate it, and then update it in the // it, transform it into a string and validate it, and then update it in the
// document. If none is found, and we were told to generate missing document ids, then // document. If none is found, and we were told to generate missing document ids, then
// we create the missing field, and update the new document. // we create the missing field, and update the new document.
let mut uuid_buffer = [0; uuid::adapter::Hyphenated::LENGTH]; let mut uuid_buffer = [0; uuid::fmt::Hyphenated::LENGTH];
let external_id = if primary_key_id_nested { let external_id = if primary_key_id_nested {
let mut field_buffer_cache = field_buffer_cache.clone(); let mut field_buffer_cache = field_buffer_cache.clone();
self.flatten_from_field_mapping( self.flatten_from_field_mapping(
@ -804,7 +804,7 @@ fn update_primary_key<'a>(
addition_index: &DocumentsBatchIndex, addition_index: &DocumentsBatchIndex,
primary_key_id: FieldId, primary_key_id: FieldId,
primary_key_name: &str, primary_key_name: &str,
uuid_buffer: &'a mut [u8; uuid::adapter::Hyphenated::LENGTH], uuid_buffer: &'a mut [u8; uuid::fmt::Hyphenated::LENGTH],
field_buffer_cache: &mut Vec<(u16, Cow<'a, [u8]>)>, field_buffer_cache: &mut Vec<(u16, Cow<'a, [u8]>)>,
mut external_id_buffer: &'a mut Vec<u8>, mut external_id_buffer: &'a mut Vec<u8>,
autogenerate_docids: bool, autogenerate_docids: bool,
@ -831,7 +831,7 @@ fn update_primary_key<'a>(
Ok(Cow::Owned(value)) Ok(Cow::Owned(value))
} }
None if autogenerate_docids => { None if autogenerate_docids => {
let uuid = uuid::Uuid::new_v4().to_hyphenated().encode_lower(uuid_buffer); let uuid = uuid::Uuid::new_v4().as_hyphenated().encode_lower(uuid_buffer);
serde_json::to_writer(&mut external_id_buffer, &uuid) serde_json::to_writer(&mut external_id_buffer, &uuid)
.map_err(InternalError::SerdeJson)?; .map_err(InternalError::SerdeJson)?;
field_buffer_cache.push((primary_key_id, external_id_buffer.as_slice().into())); field_buffer_cache.push((primary_key_id, external_id_buffer.as_slice().into()));