snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-27 04:25:06 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix compiler warning/errors caused by previous merge

Browse Source
This commit is contained in:
Loïc Lecrenier 2023-04-12 16:53:11 +02:00
parent df0d9bb878
commit 30f7bd03f6
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
milli/src/search/new/db_cache.rs
View File

@ -9,6 +9,7 @@ use roaring::RoaringBitmap;
use super::interner::Interned; use super::interner::Interned;
use super::Word; use super::Word;
use crate::heed_codec::StrBEU16Codec;
use crate::{ use crate::{
CboRoaringBitmapCodec, CboRoaringBitmapLenCodec, Result, RoaringBitmapCodec, SearchContext, CboRoaringBitmapCodec, CboRoaringBitmapLenCodec, Result, RoaringBitmapCodec, SearchContext,
}; };
@ -292,14 +293,16 @@ impl<'ctx> SearchContext<'ctx> {
&mut self, &mut self,
word_prefix: Interned<String>, word_prefix: Interned<String>,
fid: u16, fid: u16,
) -> Result<Option<&'ctx [u8]>> { ) -> Result<Option<RoaringBitmap>> {
DatabaseCache::get_value( DatabaseCache::get_value(
self.txn, self.txn,
(word_prefix, fid), (word_prefix, fid),
&(self.word_interner.get(word_prefix).as_str(), fid), &(self.word_interner.get(word_prefix).as_str(), fid),
&mut self.db_cache.word_prefix_fid_docids, &mut self.db_cache.word_prefix_fid_docids,
self.index.word_prefix_fid_docids.remap_data_type::<ByteSlice>(), self.index.word_prefix_fid_docids.remap_data_type::<ByteSlice>(),
) )?
.map(|bytes| CboRoaringBitmapCodec::bytes_decode(bytes).ok_or(heed::Error::Decoding.into()))
.transpose()
} }
pub fn get_db_word_fids(&mut self, word: Interned<String>) -> Result<Vec<u16>> { pub fn get_db_word_fids(&mut self, word: Interned<String>) -> Result<Vec<u16>> {

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

@ -4,9 +4,7 @@ use roaring::RoaringBitmap;
use super::{ComputedCondition, RankingRuleGraphTrait}; use super::{ComputedCondition, RankingRuleGraphTrait};
use crate::search::new::interner::{DedupInterner, Interned}; use crate::search::new::interner::{DedupInterner, Interned};
use crate::search::new::query_term::LocatedQueryTermSubset; use crate::search::new::query_term::LocatedQueryTermSubset;
use crate::search::new::resolve_query_graph::{ use crate::search::new::resolve_query_graph::compute_query_term_subset_docids_within_field_id;
compute_query_term_subset_docids, compute_query_term_subset_docids_within_field_id,
};
use crate::search::new::SearchContext; use crate::search::new::SearchContext;
use crate::Result; use crate::Result;
@ -53,7 +51,7 @@ impl RankingRuleGraphTrait for AttributeGraph {
let mut all_fields = FxHashSet::default(); let mut all_fields = FxHashSet::default();
for word in term.term_subset.all_single_words_except_prefix_db(ctx)? { for word in term.term_subset.all_single_words_except_prefix_db(ctx)? {
let fields = ctx.get_db_word_fids(word)?; let fields = ctx.get_db_word_fids(word.interned())?;
all_fields.extend(fields); all_fields.extend(fields);
} }
@ -65,7 +63,7 @@ impl RankingRuleGraphTrait for AttributeGraph {
} }
if let Some(word_prefix) = term.term_subset.use_prefix_db(ctx) { if let Some(word_prefix) = term.term_subset.use_prefix_db(ctx) {
let fields = ctx.get_db_word_prefix_fids(word_prefix)?; let fields = ctx.get_db_word_prefix_fids(word_prefix.interned())?;
all_fields.extend(fields); all_fields.extend(fields);
} }

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

@ -63,25 +63,24 @@ pub fn compute_query_term_subset_docids_within_field_id(
let mut docids = RoaringBitmap::new(); let mut docids = RoaringBitmap::new();
for word in term.all_single_words_except_prefix_db(ctx)? { 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)? { if let Some(word_fid_docids) = ctx.get_db_word_fid_docids(word.interned(), fid)? {
docids |= CboRoaringBitmapCodec::bytes_decode(word_fid_docids) docids |= word_fid_docids;
.ok_or(heed::Error::Decoding)?;
} }
} }
for phrase in term.all_phrases(ctx)? { for phrase in term.all_phrases(ctx)? {
for &word in phrase.words(ctx).iter().flatten() { for &word in phrase.words(ctx).iter().flatten() {
if let Some(word_fid_docids) = ctx.get_db_word_fid_docids(word, fid)? { if let Some(word_fid_docids) = ctx.get_db_word_fid_docids(word, fid)? {
docids |= CboRoaringBitmapCodec::bytes_decode(word_fid_docids) docids |= word_fid_docids;
.ok_or(heed::Error::Decoding)?;
} }
} }
} }
if let Some(word_prefix) = term.use_prefix_db(ctx) { 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)? { if let Some(word_fid_docids) =
docids |= CboRoaringBitmapCodec::bytes_decode(word_fid_docids) ctx.get_db_word_prefix_fid_docids(word_prefix.interned(), fid)?
.ok_or(heed::Error::Decoding)?; {
docids |= word_fid_docids;
} }
} }