rust/tantivy
1
0
Fork 0
mirror of https://github.com/quickwit-oss/tantivy.git synced 2026-06-05 01:50:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "introduce optional collect_block in segmentcollector"

Browse Source 
This reverts commit c5c2e59b2b.
This commit is contained in:
Pascal Seitz
2022-05-19 16:25:21 +08:00
parent c5c2e59b2b
commit 17dcc99e43
6 changed files with 5 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/aggregation/bucket/term_agg.rs
View File

@@ -256,7 +256,7 @@ impl TermBuckets {
});
entry.doc_count += 1;
if let Some(sub_aggregations) = entry.sub_aggregations.as_mut() {
sub_aggregations.collect(doc, sub_aggregation)?;
sub_aggregations.collect(doc, &sub_aggregation)?;
}
}
bucket_count.validate_bucket_count()?;

5
src/collector/count_collector.rs
View File

@@ -70,11 +70,6 @@ impl SegmentCollector for SegmentCountCollector {
Ok(())
}
fn collect_block(&mut self, docs: &[(DocId, Score)]) -> crate::Result<()> {
self.count += docs.len();
Ok(())
}
fn harvest(self) -> usize {
self.count
}

14
src/collector/custom_score_top_collector.rs
View File

@@ -8,8 +8,7 @@ pub(crate) struct CustomScoreTopCollector<TCustomScorer, TScore = Score> {
}
impl<TCustomScorer, TScore> CustomScoreTopCollector<TCustomScorer, TScore>
where
TScore: Clone + PartialOrd,
where TScore: Clone + PartialOrd
{
pub(crate) fn new(
custom_scorer: TCustomScorer,
@@ -97,14 +96,6 @@ where
Ok(())
}
fn collect_block(&mut self, docs: &[(DocId, Score)]) -> crate::Result<()> {
for (doc, _score) in docs {
let score = self.segment_scorer.score(*doc);
self.segment_collector.collect(*doc, score);
}
Ok(())
}
fn harvest(self) -> Vec<(TScore, DocAddress)> {
self.segment_collector.harvest()
}
@@ -123,8 +114,7 @@ where
}
impl<F, TScore> CustomSegmentScorer<TScore> for F
where
F: 'static + FnMut(DocId) -> TScore,
where F: 'static + FnMut(DocId) -> TScore
{
fn score(&mut self, doc: DocId) -> TScore {
(self)(doc)

47
src/collector/mod.rs
View File

@@ -172,33 +172,19 @@ pub trait Collector: Sync + Send {
) -> crate::Result<<Self::Child as SegmentCollector>::Fruit> {
let mut segment_collector = self.for_segment(segment_ord as u32, reader)?;
let mut cache_pos = 0;
let mut cache = [(0, 0.0); 64];
if let Some(alive_bitset) = reader.alive_bitset() {
weight.for_each(reader, &mut |doc, score| {
if alive_bitset.is_alive(doc) {
cache[cache_pos] = (doc, score);
cache_pos += 1;
if cache_pos == 64 {
segment_collector.collect_block(&cache)?;
cache_pos = 0;
}
segment_collector.collect(doc, score)?;
}
Ok(())
})?;
} else {
weight.for_each(reader, &mut |doc, score| {
cache[cache_pos] = (doc, score);
cache_pos += 1;
if cache_pos == 64 {
segment_collector.collect_block(&cache)?;
cache_pos = 0;
}
segment_collector.collect(doc, score)?;
Ok(())
})?;
}
segment_collector.collect_block(&cache[..cache_pos])?;
Ok(segment_collector.harvest())
}
}
@@ -272,14 +258,6 @@ pub trait SegmentCollector: 'static {
/// The query pushes the scored document to the collector via this method.
fn collect(&mut self, doc: DocId, score: Score) -> crate::Result<()>;
/// The query pushes the scored document to the collector via this method.
fn collect_block(&mut self, docs: &[(DocId, Score)]) -> crate::Result<()> {
for (doc, score) in docs {
self.collect(*doc, *score)?;
}
Ok(())
}
/// Extract the fruit of the collection from the `SegmentCollector`.
fn harvest(self) -> Self::Fruit;
}
@@ -339,12 +317,6 @@ where
Ok(())
}
fn collect_block(&mut self, docs: &[(DocId, Score)]) -> crate::Result<()> {
self.0.collect_block(docs)?;
self.1.collect_block(docs)?;
Ok(())
}
fn harvest(self) -> <Self as SegmentCollector>::Fruit {
(self.0.harvest(), self.1.harvest())
}
@@ -411,13 +383,6 @@ where
Ok(())
}
fn collect_block(&mut self, docs: &[(DocId, Score)]) -> crate::Result<()> {
self.0.collect_block(docs)?;
self.1.collect_block(docs)?;
self.2.collect_block(docs)?;
Ok(())
}
fn harvest(self) -> <Self as SegmentCollector>::Fruit {
(self.0.harvest(), self.1.harvest(), self.2.harvest())
}
@@ -494,14 +459,6 @@ where
Ok(())
}
fn collect_block(&mut self, docs: &[(DocId, Score)]) -> crate::Result<()> {
self.0.collect_block(docs)?;
self.1.collect_block(docs)?;
self.2.collect_block(docs)?;
self.3.collect_block(docs)?;
Ok(())
}
fn harvest(self) -> <Self as SegmentCollector>::Fruit {
(
self.0.harvest(),

18
src/collector/multi_collector.rs
View File

@@ -57,11 +57,6 @@ impl SegmentCollector for Box<dyn BoxableSegmentCollector> {
Ok(())
}
fn collect_block(&mut self, docs: &[(DocId, Score)]) -> crate::Result<()> {
self.as_mut().collect_block(docs)?;
Ok(())
}
fn harvest(self) -> Box<dyn Fruit> {
BoxableSegmentCollector::harvest_from_box(self)
}
@@ -69,7 +64,6 @@ impl SegmentCollector for Box<dyn BoxableSegmentCollector> {
pub trait BoxableSegmentCollector {
fn collect(&mut self, doc: u32, score: Score) -> crate::Result<()>;
fn collect_block(&mut self, docs: &[(DocId, Score)]) -> crate::Result<()>;
fn harvest_from_box(self: Box<Self>) -> Box<dyn Fruit>;
}
@@ -82,11 +76,6 @@ impl<TSegmentCollector: SegmentCollector> BoxableSegmentCollector
self.0.collect(doc, score)
}
fn collect_block(&mut self, docs: &[(DocId, Score)]) -> crate::Result<()> {
self.0.collect_block(docs)?;
Ok(())
}
fn harvest_from_box(self: Box<Self>) -> Box<dyn Fruit> {
Box::new(self.0.harvest())
}
@@ -247,13 +236,6 @@ impl SegmentCollector for MultiCollectorChild {
Ok(())
}
fn collect_block(&mut self, docs: &[(DocId, Score)]) -> crate::Result<()> {
for child in &mut self.children {
child.collect_block(docs)?;
}
Ok(())
}
fn harvest(self) -> MultiFruit {
MultiFruit {
sub_fruits: self

8
src/collector/top_score_collector.rs
View File

@@ -704,14 +704,6 @@ impl SegmentCollector for TopScoreSegmentCollector {
Ok(())
}
#[inline]
fn collect_block(&mut self, docs: &[(DocId, Score)]) -> crate::Result<()> {
for (doc, score) in docs {
self.0.collect(*doc, *score);
}
Ok(())
}
fn harvest(self) -> Vec<(Score, DocAddress)> {
self.0.harvest()
}