searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-12-24 13:40:31 +01:00
Code Issues Releases Wiki Activity

meilisearch compatible primary key inference

Browse Source
This commit is contained in:
Marin Postma 2021-05-06 21:16:40 +02:00
parent 313c362461
commit eeb0c70ea2
No known key found for this signature in database
GPG Key ID: D5241F0C0C865F30
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
milli/src/update/index_documents/mod.rs
View File

@ -329,7 +329,7 @@ impl<'t, 'u, 'i, 'a> IndexDocuments<'t, 'u, 'i, 'a> {
let mut reader = BufReader::new(reader); let mut reader = BufReader::new(reader);
reader.fill_buf()?; reader.fill_buf()?;
// Early return when there are no document to add // Early return when there is no document to add
if reader.buffer().is_empty() { if reader.buffer().is_empty() {
return Ok(DocumentAdditionResult { return Ok(DocumentAdditionResult {
nb_documents: 0, nb_documents: 0,

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

@ -47,6 +47,10 @@ pub struct Transform<'t, 'i> {
pub autogenerate_docids: bool, pub autogenerate_docids: bool,
} }
fn is_primary_key(field: impl AsRef<str>) -> bool {
field.as_ref().to_lowercase().contains(DEFAULT_PRIMARY_KEY_NAME)
}
impl Transform<'_, '_> { impl Transform<'_, '_> {
pub fn output_from_json<R, F>(self, reader: R, progress_callback: F) -> anyhow::Result<TransformOutput> pub fn output_from_json<R, F>(self, reader: R, progress_callback: F) -> anyhow::Result<TransformOutput>
where where
@ -92,7 +96,7 @@ impl Transform<'_, '_> {
// We extract the primary key from the first document in // We extract the primary key from the first document in
// the batch if it hasn't already been defined in the index // the batch if it hasn't already been defined in the index
let first = documents.peek().and_then(|r| r.as_ref().ok()); let first = documents.peek().and_then(|r| r.as_ref().ok());
let alternative_name = first.and_then(|doc| doc.keys().find(|k| k.contains(DEFAULT_PRIMARY_KEY_NAME)).cloned()); let alternative_name = first.and_then(|doc| doc.keys().find(|f| is_primary_key(f)).cloned());
let (primary_key_id, primary_key) = compute_primary_key_pair( let (primary_key_id, primary_key) = compute_primary_key_pair(
self.index.primary_key(self.rtxn)?, self.index.primary_key(self.rtxn)?,
&mut fields_ids_map, &mut fields_ids_map,
@ -232,7 +236,7 @@ impl Transform<'_, '_> {
// The primary key is known so we must find the position in the CSV headers. // The primary key is known so we must find the position in the CSV headers.
headers.iter().position(|h| h == primary_key) headers.iter().position(|h| h == primary_key)
}, },
None => headers.iter().position(|h| h.contains("id")), None => headers.iter().position(|f| is_primary_key(&f)),
}; };
// Returns the field id in the fields ids map, create an "id" field // Returns the field id in the fields ids map, create an "id" field