searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-09-22 16:41:45 +02:00
Code Issues Releases Wiki Activity

Resolve the attribute ranking rule conditions

Browse Source
This commit is contained in:
Kerollmops 2023-04-12 11:52:56 +02:00 committed by Loïc Lecrenier
parent d6a7c28e4d
commit 5230ddb3ea
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
milli/src/search/new/ranking_rule_graph/attribute/mod.rs
View File

@ -4,7 +4,9 @@ use roaring::RoaringBitmap;
use super::{ComputedCondition, RankingRuleGraphTrait};
use crate::search::new::interner::{DedupInterner, Interned};
use crate::search::new::query_term::LocatedQueryTermSubset;
use crate::search::new::resolve_query_graph::compute_query_term_subset_docids;
use crate::search::new::resolve_query_graph::{
compute_query_term_subset_docids, compute_query_term_subset_docids_within_field_id,
};
use crate::search::new::SearchContext;
use crate::Result;
@ -26,7 +28,11 @@ impl RankingRuleGraphTrait for AttributeGraph {
) -> Result<ComputedCondition> {
let AttributeCondition { term, .. } = condition;
// maybe compute_query_term_subset_docids should accept a universe as argument
let mut docids = compute_query_term_subset_docids(ctx, &term.term_subset)?;
let mut docids = compute_query_term_subset_docids_within_field_id(
ctx,
&term.term_subset,
condition.fid,
)?;
docids &= universe;
Ok(ComputedCondition {

36
milli/src/search/new/resolve_query_graph.rs
View File

@ -33,6 +33,8 @@ pub fn compute_query_term_subset_docids(
ctx: &mut SearchContext,
term: &QueryTermSubset,
) -> Result<RoaringBitmap> {
// TODO Use the roaring::MultiOps trait
let mut docids = RoaringBitmap::new();
for word in term.all_single_words_except_prefix_db(ctx)? {
if let Some(word_docids) = ctx.word_docids(word)? {
@ -52,6 +54,40 @@ pub fn compute_query_term_subset_docids(
Ok(docids)
}
pub fn compute_query_term_subset_docids_within_field_id(
ctx: &mut SearchContext,
term: &QueryTermSubset,
fid: u16,
) -> Result<RoaringBitmap> {
// TODO Use the roaring::MultiOps trait
let mut docids = RoaringBitmap::new();
for word in term.all_single_words_except_prefix_db(ctx)? {
if let Some(word_fid_docids) = ctx.get_db_word_fid_docids(word, fid)? {
docids |= CboRoaringBitmapCodec::bytes_decode(word_fid_docids)
.ok_or(heed::Error::Decoding)?;
}
}
for phrase in term.all_phrases(ctx)? {
for &word in phrase.words(ctx).iter().flatten() {
if let Some(word_fid_docids) = ctx.get_db_word_fid_docids(word, fid)? {
docids |= CboRoaringBitmapCodec::bytes_decode(word_fid_docids)
.ok_or(heed::Error::Decoding)?;
}
}
}
if let Some(word_prefix) = term.use_prefix_db(ctx) {
if let Some(word_fid_docids) = ctx.get_db_word_prefix_fid_docids(word_prefix, fid)? {
docids |= CboRoaringBitmapCodec::bytes_decode(word_fid_docids)
.ok_or(heed::Error::Decoding)?;
}
}
Ok(docids)
}
pub fn compute_query_graph_docids(
ctx: &mut SearchContext,
q: &QueryGraph,