mirror of
https://github.com/meilisearch/MeiliSearch
synced 2024-11-27 07:14:26 +01:00
feat: Introduce on the fly attributes reordering with meilidb-core
This commit is contained in:
parent
97cc3c7cce
commit
b7ed22bc59
@ -4,6 +4,7 @@
|
|||||||
mod automaton;
|
mod automaton;
|
||||||
mod distinct_map;
|
mod distinct_map;
|
||||||
mod query_builder;
|
mod query_builder;
|
||||||
|
mod reordered_attrs;
|
||||||
mod store;
|
mod store;
|
||||||
pub mod criterion;
|
pub mod criterion;
|
||||||
|
|
||||||
|
@ -17,6 +17,7 @@ use crate::automaton::{build_dfa, build_prefix_dfa};
|
|||||||
use crate::distinct_map::{DistinctMap, BufferedDistinctMap};
|
use crate::distinct_map::{DistinctMap, BufferedDistinctMap};
|
||||||
use crate::criterion::Criteria;
|
use crate::criterion::Criteria;
|
||||||
use crate::raw_documents_from_matches;
|
use crate::raw_documents_from_matches;
|
||||||
|
use crate::reordered_attrs::ReorderedAttrs;
|
||||||
use crate::{Match, DocumentId, Store, RawDocument, Document};
|
use crate::{Match, DocumentId, Store, RawDocument, Document};
|
||||||
|
|
||||||
const NGRAMS: usize = 3;
|
const NGRAMS: usize = 3;
|
||||||
@ -193,7 +194,7 @@ fn rewrite_matched_positions(matches: &mut [(DocumentId, Match)]) {
|
|||||||
pub struct QueryBuilder<'c, S, FI = fn(DocumentId) -> bool> {
|
pub struct QueryBuilder<'c, S, FI = fn(DocumentId) -> bool> {
|
||||||
store: S,
|
store: S,
|
||||||
criteria: Criteria<'c>,
|
criteria: Criteria<'c>,
|
||||||
searchable_attrs: Option<HashSet<u16>>,
|
searchable_attrs: Option<ReorderedAttrs>,
|
||||||
filter: Option<FI>,
|
filter: Option<FI>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -228,8 +229,8 @@ impl<'c, S, FI> QueryBuilder<'c, S, FI>
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn add_searchable_attribute(&mut self, attribute: u16) {
|
pub fn add_searchable_attribute(&mut self, attribute: u16) {
|
||||||
let attributes = self.searchable_attrs.get_or_insert_with(HashSet::new);
|
let reorders = self.searchable_attrs.get_or_insert_with(Default::default);
|
||||||
attributes.insert(attribute);
|
reorders.insert_attribute(attribute);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -239,6 +240,7 @@ where S: Store,
|
|||||||
fn query_all(&self, query: &str) -> Result<Vec<RawDocument>, S::Error> {
|
fn query_all(&self, query: &str) -> Result<Vec<RawDocument>, S::Error> {
|
||||||
let automatons = generate_automatons(query, &self.store)?;
|
let automatons = generate_automatons(query, &self.store)?;
|
||||||
let words = self.store.words()?.as_fst();
|
let words = self.store.words()?.as_fst();
|
||||||
|
let searchables = self.searchable_attrs.as_ref();
|
||||||
|
|
||||||
let mut stream = {
|
let mut stream = {
|
||||||
let mut op_builder = fst::raw::OpBuilder::new();
|
let mut op_builder = fst::raw::OpBuilder::new();
|
||||||
@ -264,11 +266,12 @@ where S: Store,
|
|||||||
};
|
};
|
||||||
|
|
||||||
for di in doc_indexes.as_slice() {
|
for di in doc_indexes.as_slice() {
|
||||||
if self.searchable_attrs.as_ref().map_or(true, |r| r.contains(&di.attribute)) {
|
let attribute = searchables.map_or(Some(di.attribute), |r| r.get(di.attribute));
|
||||||
|
if let Some(attribute) = attribute {
|
||||||
let match_ = Match {
|
let match_ = Match {
|
||||||
query_index: query_index as u32,
|
query_index: query_index as u32,
|
||||||
distance,
|
distance,
|
||||||
attribute: di.attribute,
|
attribute,
|
||||||
word_index: di.word_index,
|
word_index: di.word_index,
|
||||||
is_exact,
|
is_exact,
|
||||||
char_index: di.char_index,
|
char_index: di.char_index,
|
||||||
|
20
meilidb-core/src/reordered_attrs.rs
Normal file
20
meilidb-core/src/reordered_attrs.rs
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
#[derive(Default)]
|
||||||
|
pub struct ReorderedAttrs {
|
||||||
|
count: usize,
|
||||||
|
reorders: Vec<Option<u16>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ReorderedAttrs {
|
||||||
|
pub fn insert_attribute(&mut self, attribute: u16) {
|
||||||
|
self.reorders.resize(attribute as usize + 1, None);
|
||||||
|
self.reorders[attribute as usize] = Some(self.count as u16);
|
||||||
|
self.count += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get(&self, attribute: u16) -> Option<u16> {
|
||||||
|
match self.reorders.get(attribute as usize) {
|
||||||
|
Some(Some(attribute)) => Some(*attribute),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user