searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-30 00:34:26 +01:00
Code Issues Releases Wiki Activity

Constify the default primary key name

Browse Source
This commit is contained in:
Kerollmops 2022-06-21 10:48:07 +02:00
parent 5f1bfb73ee
commit 742543091e
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
milli/src/update/index_documents/validate.rs
View File

@ -12,6 +12,9 @@ use crate::{FieldId, Index, Object, Result};
/// The symbol used to define levels in a nested primary key. /// The symbol used to define levels in a nested primary key.
const PRIMARY_KEY_SPLIT_SYMBOL: char = '.'; const PRIMARY_KEY_SPLIT_SYMBOL: char = '.';
/// The default primary that is used when not specified.
const DEFAULT_PRIMARY_KEY: &str = "id";
/// This function validates and enrich the documents by checking that: /// This function validates and enrich the documents by checking that:
/// - we can infer a primary key, /// - we can infer a primary key,
/// - all the documents id exist and are extracted, /// - all the documents id exist and are extracted,
@ -51,13 +54,14 @@ pub fn validate_and_enrich_documents_batch<R: Read + Seek>(
None => { None => {
let guessed = documents_batch_index let guessed = documents_batch_index
.iter() .iter()
.filter(|(_, name)| name.to_lowercase().contains("id")) .filter(|(_, name)| name.to_lowercase().contains(DEFAULT_PRIMARY_KEY))
.min_by_key(|(fid, _)| *fid); .min_by_key(|(fid, _)| *fid);
match guessed { match guessed {
Some((id, name)) => PrimaryKey::flat(name.as_str(), *id), Some((id, name)) => PrimaryKey::flat(name.as_str(), *id),
None if autogenerate_docids => { None if autogenerate_docids => PrimaryKey::flat(
PrimaryKey::flat("id", documents_batch_index.insert("id")) DEFAULT_PRIMARY_KEY,
} documents_batch_index.insert(DEFAULT_PRIMARY_KEY),
),
None => return Ok(Err(UserError::MissingPrimaryKey)), None => return Ok(Err(UserError::MissingPrimaryKey)),
} }
} }