snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-30 09:04:59 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

feat: Allow users to construct query builders from database indexes

Browse Source
This commit is contained in:
Clément Renault 2019-04-18 14:11:00 +02:00
parent 4b40d5b0d4
commit 187e6740bd
No known key found for this signature in database
GPG Key ID: 0151CDAB43460DAE
2 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
meilidb-core/src/query_builder.rs
View File

@ -1,8 +1,8 @@
use std::{cmp, mem};
use std::ops::Range;
use std::time::Instant;
use std::hash::Hash; use std::hash::Hash;
use std::ops::{Range, Deref};
use std::rc::Rc; use std::rc::Rc;
use std::time::Instant;
use std::{cmp, mem};
use rayon::slice::ParallelSliceMut; use rayon::slice::ParallelSliceMut;
use slice_group_by::GroupByMut; use slice_group_by::GroupByMut;
@ -35,26 +35,26 @@ fn generate_automatons(query: &str) -> Vec<DfaExt> {
automatons automatons
} }
pub struct QueryBuilder<'i, 'c, FI = fn(DocumentId) -> bool> { pub struct QueryBuilder<'c, I, FI = fn(DocumentId) -> bool> {
index: &'i Index, index: I,
criteria: Criteria<'c>, criteria: Criteria<'c>,
searchable_attrs: Option<HashSet<u16>>, searchable_attrs: Option<HashSet<u16>>,
filter: Option<FI>, filter: Option<FI>,
} }
impl<'i, 'c> QueryBuilder<'i, 'c, fn(DocumentId) -> bool> { impl<'c, I> QueryBuilder<'c, I, fn(DocumentId) -> bool> {
pub fn new(index: &'i Index) -> Self { pub fn new(index: I) -> Self {
QueryBuilder::with_criteria(index, Criteria::default()) QueryBuilder::with_criteria(index, Criteria::default())
} }
pub fn with_criteria(index: &'i Index, criteria: Criteria<'c>) -> Self { pub fn with_criteria(index: I, criteria: Criteria<'c>) -> Self {
QueryBuilder { index, criteria, searchable_attrs: None, filter: None } QueryBuilder { index, criteria, searchable_attrs: None, filter: None }
} }
} }
impl<'i, 'c, FI> QueryBuilder<'i, 'c, FI> impl<'c, I, FI> QueryBuilder<'c, I, FI>
{ {
pub fn with_filter<F>(self, function: F) -> QueryBuilder<'i, 'c, F> pub fn with_filter<F>(self, function: F) -> QueryBuilder<'c, I, F>
where F: Fn(DocumentId) -> bool, where F: Fn(DocumentId) -> bool,
{ {
QueryBuilder { QueryBuilder {
@ -65,7 +65,7 @@ impl<'i, 'c, FI> QueryBuilder<'i, 'c, FI>
} }
} }
pub fn with_distinct<F, K>(self, function: F, size: usize) -> DistinctQueryBuilder<'i, 'c, FI, F> pub fn with_distinct<F, K>(self, function: F, size: usize) -> DistinctQueryBuilder<'c, I, FI, F>
where F: Fn(DocumentId) -> Option<K>, where F: Fn(DocumentId) -> Option<K>,
K: Hash + Eq, K: Hash + Eq,
{ {
@ -80,7 +80,11 @@ impl<'i, 'c, FI> QueryBuilder<'i, 'c, FI>
let attributes = self.searchable_attrs.get_or_insert_with(HashSet::new); let attributes = self.searchable_attrs.get_or_insert_with(HashSet::new);
attributes.insert(attribute); attributes.insert(attribute);
} }
}
impl<'c, I, FI> QueryBuilder<'c, I, FI>
where I: Deref<Target=Index>,
{
fn query_all(&self, query: &str) -> Vec<RawDocument> { fn query_all(&self, query: &str) -> Vec<RawDocument> {
let automatons = generate_automatons(query); let automatons = generate_automatons(query);
@ -131,8 +135,9 @@ impl<'i, 'c, FI> QueryBuilder<'i, 'c, FI>
} }
} }
impl<'i, 'c, FI> QueryBuilder<'i, 'c, FI> impl<'c, I, FI> QueryBuilder<'c, I, FI>
where FI: Fn(DocumentId) -> bool, where I: Deref<Target=Index>,
FI: Fn(DocumentId) -> bool,
{ {
pub fn query(self, query: &str, range: Range<usize>) -> Vec<Document> { pub fn query(self, query: &str, range: Range<usize>) -> Vec<Document> {
// We delegate the filter work to the distinct query builder, // We delegate the filter work to the distinct query builder,
@ -184,15 +189,15 @@ where FI: Fn(DocumentId) -> bool,
} }
} }
pub struct DistinctQueryBuilder<'i, 'c, FI, FD> { pub struct DistinctQueryBuilder<'c, I, FI, FD> {
inner: QueryBuilder<'i, 'c, FI>, inner: QueryBuilder<'c, I, FI>,
function: FD, function: FD,
size: usize, size: usize,
} }
impl<'i, 'c, FI, FD> DistinctQueryBuilder<'i, 'c, FI, FD> impl<'c, I, FI, FD> DistinctQueryBuilder<'c, I, FI, FD>
{ {
pub fn with_filter<F>(self, function: F) -> DistinctQueryBuilder<'i, 'c, F, FD> pub fn with_filter<F>(self, function: F) -> DistinctQueryBuilder<'c, I, F, FD>
where F: Fn(DocumentId) -> bool, where F: Fn(DocumentId) -> bool,
{ {
DistinctQueryBuilder { DistinctQueryBuilder {
@ -207,8 +212,9 @@ impl<'i, 'c, FI, FD> DistinctQueryBuilder<'i, 'c, FI, FD>
} }
} }
impl<'i, 'c, FI, FD, K> DistinctQueryBuilder<'i, 'c, FI, FD> impl<'c, I, FI, FD, K> DistinctQueryBuilder<'c, I, FI, FD>
where FI: Fn(DocumentId) -> bool, where I: Deref<Target=Index>,
FI: Fn(DocumentId) -> bool,
FD: Fn(DocumentId) -> Option<K>, FD: Fn(DocumentId) -> Option<K>,
K: Hash + Eq, K: Hash + Eq,
{ {

16
meilidb-data/src/database.rs
View File

@ -6,6 +6,8 @@ use std::sync::Arc;
use arc_swap::{ArcSwap, Lease}; use arc_swap::{ArcSwap, Lease};
use hashbrown::HashMap; use hashbrown::HashMap;
use meilidb_core::criterion::Criteria;
use meilidb_core::QueryBuilder;
use meilidb_core::shared_data_cursor::{FromSharedDataCursor, SharedDataCursor}; use meilidb_core::shared_data_cursor::{FromSharedDataCursor, SharedDataCursor};
use meilidb_core::write_to_bytes::WriteToBytes; use meilidb_core::write_to_bytes::WriteToBytes;
use meilidb_core::{DocumentId, Index as WordIndex}; use meilidb_core::{DocumentId, Index as WordIndex};
@ -288,6 +290,20 @@ impl<'a> Iterator for DocumentFieldsIter<'a> {
pub struct Index(RawIndex); pub struct Index(RawIndex);
impl Index { impl Index {
pub fn query_builder(&self) -> QueryBuilder<Lease<Arc<WordIndex>>> {
let word_index = self.word_index();
QueryBuilder::new(word_index)
}
pub fn query_builder_with_criteria<'c>(
&self,
criteria: Criteria<'c>,
) -> QueryBuilder<'c, Lease<Arc<WordIndex>>>
{
let word_index = self.word_index();
QueryBuilder::with_criteria(word_index, criteria)
}
pub fn schema(&self) -> &Schema { pub fn schema(&self) -> &Schema {
self.0.schema() self.0.schema()
} }