snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-11-04 01:46:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

change variable's name from distance to proximity

Browse Source
This commit is contained in:
many
2021-02-17 17:02:26 +01:00
committed by Kerollmops
parent 4128bdc859
commit 86bcecf840
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
milli/src/search/criteria/mod.rs
View File

@@ -37,7 +37,7 @@ impl Default for Candidates {
} }
pub trait Context { pub trait Context {
fn query_docids(&self, query: &Query) -> anyhow::Result<RoaringBitmap>; fn query_docids(&self, query: &Query) -> anyhow::Result<RoaringBitmap>;
fn query_pair_proximity_docids(&self, left: &Query, right: &Query, distance: u8) ->anyhow::Result<RoaringBitmap>; fn query_pair_proximity_docids(&self, left: &Query, right: &Query, proximity: u8) ->anyhow::Result<RoaringBitmap>;
fn words_fst<'t>(&self) -> &'t fst::Set<Cow<[u8]>>; fn words_fst<'t>(&self) -> &'t fst::Set<Cow<[u8]>>;
} }
pub struct HeedContext<'t> { pub struct HeedContext<'t> {
@@ -77,19 +77,19 @@ impl<'a> Context for HeedContext<'a> {
} }
} }
fn query_pair_proximity_docids(&self, left: &Query, right: &Query, distance: u8) -> anyhow::Result<RoaringBitmap> { fn query_pair_proximity_docids(&self, left: &Query, right: &Query, proximity: u8) -> anyhow::Result<RoaringBitmap> {
let prefix = right.prefix; let prefix = right.prefix;
match (&left.kind, &right.kind) { match (&left.kind, &right.kind) {
(QueryKind::Exact { word: left, .. }, QueryKind::Exact { word: right, .. }) => { (QueryKind::Exact { word: left, .. }, QueryKind::Exact { word: right, .. }) => {
if prefix && self.in_prefix_cache(&right) { if prefix && self.in_prefix_cache(&right) {
let key = (left.as_str(), right.as_str(), distance); let key = (left.as_str(), right.as_str(), proximity);
Ok(self.index.word_prefix_pair_proximity_docids.get(self.rtxn, &key)?.unwrap_or_default()) Ok(self.index.word_prefix_pair_proximity_docids.get(self.rtxn, &key)?.unwrap_or_default())
} else if prefix { } else if prefix {
let r_words = word_typos(&right, true, 0, &self.words_fst)?; let r_words = word_typos(&right, true, 0, &self.words_fst)?;
self.all_word_pair_proximity_docids(&[(left, 0)], &r_words, distance) self.all_word_pair_proximity_docids(&[(left, 0)], &r_words, proximity)
} else { } else {
let key = (left.as_str(), right.as_str(), distance); let key = (left.as_str(), right.as_str(), proximity);
Ok(self.index.word_pair_proximity_docids.get(self.rtxn, &key)?.unwrap_or_default()) Ok(self.index.word_pair_proximity_docids.get(self.rtxn, &key)?.unwrap_or_default())
} }
}, },
@@ -98,26 +98,26 @@ impl<'a> Context for HeedContext<'a> {
if prefix && self.in_prefix_cache(&right) { if prefix && self.in_prefix_cache(&right) {
let mut docids = RoaringBitmap::new(); let mut docids = RoaringBitmap::new();
for (left, _) in l_words { for (left, _) in l_words {
let key = (left.as_ref(), right.as_ref(), distance); let key = (left.as_ref(), right.as_ref(), proximity);
let current_docids = self.index.word_prefix_pair_proximity_docids.get(self.rtxn, &key)?.unwrap_or_default(); let current_docids = self.index.word_prefix_pair_proximity_docids.get(self.rtxn, &key)?.unwrap_or_default();
docids.union_with(&current_docids); docids.union_with(&current_docids);
} }
Ok(docids) Ok(docids)
} else if prefix { } else if prefix {
let r_words = word_typos(&right, true, 0, &self.words_fst)?; let r_words = word_typos(&right, true, 0, &self.words_fst)?;
self.all_word_pair_proximity_docids(&l_words, &r_words, distance) self.all_word_pair_proximity_docids(&l_words, &r_words, proximity)
} else { } else {
self.all_word_pair_proximity_docids(&l_words, &[(right, 0)], distance) self.all_word_pair_proximity_docids(&l_words, &[(right, 0)], proximity)
} }
}, },
(QueryKind::Exact { word: left, .. }, QueryKind::Tolerant { typo, word: right }) => { (QueryKind::Exact { word: left, .. }, QueryKind::Tolerant { typo, word: right }) => {
let r_words = word_typos(&right, prefix, *typo, &self.words_fst)?; let r_words = word_typos(&right, prefix, *typo, &self.words_fst)?;
self.all_word_pair_proximity_docids(&[(left, 0)], &r_words, distance) self.all_word_pair_proximity_docids(&[(left, 0)], &r_words, proximity)
}, },
(QueryKind::Tolerant { typo: l_typo, word: left }, QueryKind::Tolerant { typo: r_typo, word: right }) => { (QueryKind::Tolerant { typo: l_typo, word: left }, QueryKind::Tolerant { typo: r_typo, word: right }) => {
let l_words = word_typos(&left, false, *l_typo, &self.words_fst)?; let l_words = word_typos(&left, false, *l_typo, &self.words_fst)?;
let r_words = word_typos(&right, prefix, *r_typo, &self.words_fst)?; let r_words = word_typos(&right, prefix, *r_typo, &self.words_fst)?;
self.all_word_pair_proximity_docids(&l_words, &r_words, distance) self.all_word_pair_proximity_docids(&l_words, &r_words, proximity)
}, },
} }
} }
@@ -144,11 +144,16 @@ impl<'t> HeedContext<'t> {
self.words_prefixes_fst.contains(word) self.words_prefixes_fst.contains(word)
} }
fn all_word_pair_proximity_docids<T: AsRef<str>, U: AsRef<str>>(&self, left_words: &[(T, u8)], right_words: &[(U, u8)], distance: u8) -> anyhow::Result<RoaringBitmap> { fn all_word_pair_proximity_docids<T: AsRef<str>, U: AsRef<str>>(
&self,
left_words: &[(T, u8)],
right_words: &[(U, u8)],
proximity: u8
) -> anyhow::Result<RoaringBitmap> {
let mut docids = RoaringBitmap::new(); let mut docids = RoaringBitmap::new();
for (left, _l_typo) in left_words { for (left, _l_typo) in left_words {
for (right, _r_typo) in right_words { for (right, _r_typo) in right_words {
let key = (left.as_ref(), right.as_ref(), distance); let key = (left.as_ref(), right.as_ref(), proximity);
let current_docids = self.index.word_pair_proximity_docids.get(self.rtxn, &key)?.unwrap_or_default(); let current_docids = self.index.word_pair_proximity_docids.get(self.rtxn, &key)?.unwrap_or_default();
docids.union_with(&current_docids); docids.union_with(&current_docids);
} }