searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-26 14:54:27 +01:00
Code Issues Releases Wiki Activity

Simplify the API of the DatabaseCache

Browse Source
This commit is contained in:
Loïc Lecrenier 2023-03-30 11:08:17 +02:00
parent 223e82a10d
commit d0f048c068
1 changed files with 43 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,8 @@ use fxhash::FxHashMap;
use heed::types::ByteSlice; use heed::types::ByteSlice;
use heed::{BytesEncode, Database, RoTxn}; use heed::{BytesEncode, Database, RoTxn};
use super::interner::{DedupInterner, Interned}; use super::interner::Interned;
use crate::{Index, Result}; use crate::{Result, SearchContext};
/// A cache storing pointers to values in the LMDB databases. /// A cache storing pointers to values in the LMDB databases.
/// ///
@ -47,94 +47,85 @@ impl<'ctx> DatabaseCache<'ctx> {
}; };
Ok(bitmap_ptr) Ok(bitmap_ptr)
} }
}
impl<'ctx> SearchContext<'ctx> {
/// Retrieve or insert the given value in the `word_docids` database. /// Retrieve or insert the given value in the `word_docids` database.
pub fn get_word_docids( pub fn get_db_word_docids(&mut self, word: Interned<String>) -> Result<Option<&'ctx [u8]>> {
&mut self, DatabaseCache::get_value(
index: &Index, self.txn,
txn: &'ctx RoTxn,
word_interner: &DedupInterner<String>,
word: Interned<String>,
) -> Result<Option<&'ctx [u8]>> {
Self::get_value(
txn,
word, word,
word_interner.get(word).as_str(), self.word_interner.get(word).as_str(),
&mut self.word_docids, &mut self.db_cache.word_docids,
index.word_docids.remap_data_type::<ByteSlice>(), self.index.word_docids.remap_data_type::<ByteSlice>(),
) )
} }
/// Retrieve or insert the given value in the `word_prefix_docids` database. /// Retrieve or insert the given value in the `word_prefix_docids` database.
pub fn get_word_prefix_docids( pub fn get_db_word_prefix_docids(
&mut self, &mut self,
index: &Index,
txn: &'ctx RoTxn,
word_interner: &DedupInterner<String>,
prefix: Interned<String>, prefix: Interned<String>,
) -> Result<Option<&'ctx [u8]>> { ) -> Result<Option<&'ctx [u8]>> {
Self::get_value( DatabaseCache::get_value(
txn, self.txn,
prefix, prefix,
word_interner.get(prefix).as_str(), self.word_interner.get(prefix).as_str(),
&mut self.word_prefix_docids, &mut self.db_cache.word_prefix_docids,
index.word_prefix_docids.remap_data_type::<ByteSlice>(), self.index.word_prefix_docids.remap_data_type::<ByteSlice>(),
) )
} }
pub fn get_word_pair_proximity_docids( pub fn get_db_word_pair_proximity_docids(
&mut self, &mut self,
index: &Index,
txn: &'ctx RoTxn,
word_interner: &DedupInterner<String>,
word1: Interned<String>, word1: Interned<String>,
word2: Interned<String>, word2: Interned<String>,
proximity: u8, proximity: u8,
) -> Result<Option<&'ctx [u8]>> { ) -> Result<Option<&'ctx [u8]>> {
Self::get_value( DatabaseCache::get_value(
txn, self.txn,
(proximity, word1, word2), (proximity, word1, word2),
&(proximity, word_interner.get(word1).as_str(), word_interner.get(word2).as_str()), &(
&mut self.word_pair_proximity_docids, proximity,
index.word_pair_proximity_docids.remap_data_type::<ByteSlice>(), self.word_interner.get(word1).as_str(),
self.word_interner.get(word2).as_str(),
),
&mut self.db_cache.word_pair_proximity_docids,
self.index.word_pair_proximity_docids.remap_data_type::<ByteSlice>(),
) )
} }
pub fn get_word_prefix_pair_proximity_docids( pub fn get_db_word_prefix_pair_proximity_docids(
&mut self, &mut self,
index: &Index,
txn: &'ctx RoTxn,
word_interner: &DedupInterner<String>,
word1: Interned<String>, word1: Interned<String>,
prefix2: Interned<String>, prefix2: Interned<String>,
proximity: u8, proximity: u8,
) -> Result<Option<&'ctx [u8]>> { ) -> Result<Option<&'ctx [u8]>> {
Self::get_value( DatabaseCache::get_value(
txn, self.txn,
(proximity, word1, prefix2), (proximity, word1, prefix2),
&(proximity, word_interner.get(word1).as_str(), word_interner.get(prefix2).as_str()), &(
&mut self.word_prefix_pair_proximity_docids, proximity,
index.word_prefix_pair_proximity_docids.remap_data_type::<ByteSlice>(), self.word_interner.get(word1).as_str(),
self.word_interner.get(prefix2).as_str(),
),
&mut self.db_cache.word_prefix_pair_proximity_docids,
self.index.word_prefix_pair_proximity_docids.remap_data_type::<ByteSlice>(),
) )
} }
pub fn get_prefix_word_pair_proximity_docids( pub fn get_db_prefix_word_pair_proximity_docids(
&mut self, &mut self,
index: &Index,
txn: &'ctx RoTxn,
word_interner: &DedupInterner<String>,
left_prefix: Interned<String>, left_prefix: Interned<String>,
right: Interned<String>, right: Interned<String>,
proximity: u8, proximity: u8,
) -> Result<Option<&'ctx [u8]>> { ) -> Result<Option<&'ctx [u8]>> {
Self::get_value( DatabaseCache::get_value(
txn, self.txn,
(proximity, left_prefix, right), (proximity, left_prefix, right),
&( &(
proximity, proximity,
word_interner.get(left_prefix).as_str(), self.word_interner.get(left_prefix).as_str(),
word_interner.get(right).as_str(), self.word_interner.get(right).as_str(),
), ),
&mut self.prefix_word_pair_proximity_docids, &mut self.db_cache.prefix_word_pair_proximity_docids,
index.prefix_word_pair_proximity_docids.remap_data_type::<ByteSlice>(), self.index.prefix_word_pair_proximity_docids.remap_data_type::<ByteSlice>(),
) )
} }
} }