mirror of
https://github.com/meilisearch/MeiliSearch
synced 2024-11-26 23:04:26 +01:00
Merge #388
388: fix primary key inference r=MarinPostma a=MarinPostma The primary key is was infered from a hashtable index of the field. For this reason the order in which the fields were interated upon was not deterministic, and the primary key was chosed ffrom the first field containing "id". This fix sorts the the index by field_id when infering the primary key. Co-authored-by: mpostma <postma.marin@protonmail.com>
This commit is contained in:
commit
6e3b869e6a
@ -77,7 +77,9 @@ fn create_fields_mapping(
|
|||||||
|
|
||||||
fn find_primary_key(index: &bimap::BiHashMap<u16, String>) -> Option<&str> {
|
fn find_primary_key(index: &bimap::BiHashMap<u16, String>) -> Option<&str> {
|
||||||
index
|
index
|
||||||
.right_values()
|
.iter()
|
||||||
|
.sorted_by_key(|(k, _)| *k)
|
||||||
|
.map(|(_, v)| v)
|
||||||
.find(|v| v.to_lowercase().contains(DEFAULT_PRIMARY_KEY_NAME))
|
.find(|v| v.to_lowercase().contains(DEFAULT_PRIMARY_KEY_NAME))
|
||||||
.map(String::as_str)
|
.map(String::as_str)
|
||||||
}
|
}
|
||||||
@ -538,4 +540,25 @@ mod test {
|
|||||||
assert_eq!(fields_map.len(), 0);
|
assert_eq!(fields_map.len(), 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mod primary_key_inference {
|
||||||
|
use bimap::BiHashMap;
|
||||||
|
|
||||||
|
use crate::update::index_documents::transform::find_primary_key;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn primary_key_infered_on_first_field() {
|
||||||
|
// We run the test multiple times to change the order in which the fields are iterated upon.
|
||||||
|
for _ in 1..50 {
|
||||||
|
let mut map = BiHashMap::new();
|
||||||
|
map.insert(1, "fakeId".to_string());
|
||||||
|
map.insert(2, "fakeId".to_string());
|
||||||
|
map.insert(3, "fakeId".to_string());
|
||||||
|
map.insert(4, "fakeId".to_string());
|
||||||
|
map.insert(0, "realId".to_string());
|
||||||
|
|
||||||
|
assert_eq!(find_primary_key(&map), Some("realId"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user