This commit is contained in:
Paul Masurel
2022-08-24 00:16:38 +02:00
committed by GitHub
parent 4c6c6e4a9c
commit 21519788ea
2 changed files with 5 additions and 6 deletions

View File

@@ -1,4 +1,3 @@
use std::collections::BTreeMap;
use std::fmt;
use crate::query::{Explanation, Query, Scorer, Weight};
@@ -46,8 +45,8 @@ impl Query for ConstScoreQuery {
})
}
fn query_terms(&self, terms: &mut BTreeMap<Term, bool>) {
self.query.query_terms(terms)
fn query_terms<'a>(&'a self, visitor: &mut dyn FnMut(&'a Term, bool)) {
self.query.query_terms(visitor);
}
}

View File

@@ -7,7 +7,7 @@ use htmlescape::encode_minimal;
use crate::query::Query;
use crate::schema::{Field, Value};
use crate::tokenizer::{TextAnalyzer, Token};
use crate::{Document, Score, Searcher};
use crate::{Document, Score, Searcher, Term};
const DEFAULT_MAX_NUM_CHARS: usize = 150;
@@ -255,7 +255,7 @@ impl SnippetGenerator {
query: &dyn Query,
field: Field,
) -> crate::Result<SnippetGenerator> {
let mut terms = BTreeSet::new();
let mut terms: BTreeSet<&Term> = BTreeSet::new();
query.query_terms(&mut |term, _| {
if term.field() == field {
terms.insert(term);
@@ -268,7 +268,7 @@ impl SnippetGenerator {
} else {
continue;
};
let doc_freq = searcher.doc_freq(&term)?;
let doc_freq = searcher.doc_freq(term)?;
if doc_freq > 0 {
let score = 1.0 / (1.0 + doc_freq as Score);
terms_text.insert(term_str.to_string(), score);