rust/tantivy
1
0
Fork 0
mirror of https://github.com/quickwit-oss/tantivy.git synced 2026-06-02 16:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for non static predicate in the FilterCollector

Browse Source
This commit is contained in:
Paul Masurel
2021-03-18 21:58:35 +09:00
parent d2d0873fdb
commit 4f32126e35
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/collector/filter_collector_wrapper.rs
View File

@@ -56,11 +56,11 @@ use crate::{Score, SegmentReader, TantivyError};
/// ```
pub struct FilterCollector<TCollector, TPredicate, TPredicateValue: FastValue>
where
TPredicate: 'static,
TPredicate: 'static + Clone,
{
field: Field,
collector: TCollector,
predicate: &'static TPredicate,
predicate: TPredicate,
t_predicate_value: PhantomData<TPredicateValue>,
}
@@ -68,12 +68,12 @@ impl<TCollector, TPredicate, TPredicateValue: FastValue>
FilterCollector<TCollector, TPredicate, TPredicateValue>
where
TCollector: Collector + Send + Sync,
TPredicate: Fn(TPredicateValue) -> bool + Send + Sync,
TPredicate: Fn(TPredicateValue) -> bool + Send + Sync + Clone,
{
/// Create a new FilterCollector.
pub fn new(
field: Field,
predicate: &'static TPredicate,
predicate: TPredicate,
collector: TCollector,
) -> FilterCollector<TCollector, TPredicate, TPredicateValue> {
FilterCollector {
@@ -89,7 +89,7 @@ impl<TCollector, TPredicate, TPredicateValue: FastValue> Collector
for FilterCollector<TCollector, TPredicate, TPredicateValue>
where
TCollector: Collector + Send + Sync,
TPredicate: 'static + Fn(TPredicateValue) -> bool + Send + Sync,
TPredicate: 'static + Fn(TPredicateValue) -> bool + Send + Sync + Clone,
TPredicateValue: FastValue,
{
// That's the type of our result.
@@ -133,7 +133,7 @@ where
Ok(FilterSegmentCollector {
fast_field_reader,
segment_collector,
predicate: self.predicate,
predicate: self.predicate.clone(),
t_predicate_value: PhantomData,
})
}
@@ -157,7 +157,7 @@ where
{
fast_field_reader: FastFieldReader<TPredicateValue>,
segment_collector: TSegmentCollector,
predicate: &'static TPredicate,
predicate: TPredicate,
t_predicate_value: PhantomData<TPredicateValue>,
}