web search done right
'fn compute(..)' in core signal should not return option anymore as all core signals should be computable in that part of the ranking
Mikkel Denkerfa5d2b662a4a
diff --git a/crates/core/src/ranking/computer/order.rs b/crates/core/src/ranking/computer/order.rsindex 61b33821..69df4170 100644--- a/crates/core/src/ranking/computer/order.rs+++ b/crates/core/src/ranking/computer/order.rs@@ -18,7 +18,7 @@ use tantivy::DocId;use crate::{enum_map::EnumMap,- ranking::{ComputedSignal, CoreSignal, CoreSignalEnum, SignalCalculation},+ ranking::{ComputedSignal, CoreSignal, CoreSignalEnum},schema::{text_field::TextField, TextFieldEnum},};@@ -69,19 +69,12 @@ impl SignalComputeOrder {.values().flat_map(move |ngram| ngram.compute(doc, signal_computer)).chain(self.other_signals.iter().map(move |&signal| {- signal- .compute(doc, signal_computer)- .map(|calc| ComputedSignal {- signal: signal.into(),- calc,- })- .unwrap_or_else(|| ComputedSignal {- signal: signal.into(),- calc: SignalCalculation {- score: 0.0,- value: 0.0,- },- })+ let calc = signal.compute(doc, signal_computer);++ ComputedSignal {+ signal: signal.into(),+ calc,+ }}))}}@@ -119,28 +112,20 @@ impl NGramComputeOrder {let mut hits = 0;self.signals.iter().map(|(_, s)| s).map(move |&signal| {- signal- .compute(doc, signal_computer)- .map(|calc| ComputedSignal {- signal: signal.into(),- calc,- })- .map(|mut c| {- c.calc.score *= NGRAM_DAMPENING.powi(hits);+ let calc = signal.compute(doc, signal_computer);- if c.calc.score > 0.0 {- hits += 1;- }+ let mut computed = ComputedSignal {+ signal: signal.into(),+ calc,+ };- c- })- .unwrap_or_else(|| ComputedSignal {- signal: signal.into(),- calc: SignalCalculation {- value: 0.0,- score: 0.0,- },- })+ computed.calc.score *= NGRAM_DAMPENING.powi(hits);++ if computed.calc.score > 0.0 {+ hits += 1;+ }++ computed})}}diff --git a/crates/core/src/ranking/signals/core/non_text.rs b/crates/core/src/ranking/signals/core/non_text.rsindex 69e11e88..5ec20ec8 100644--- a/crates/core/src/ranking/signals/core/non_text.rs+++ b/crates/core/src/ranking/signals/core/non_text.rs@@ -121,7 +121,7 @@ impl CoreSignal for HostCentrality {Some(SignalCalculation::new_symmetrical(webpage.host_centrality))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -129,7 +129,7 @@ impl CoreSignal for HostCentrality {.get(self.as_numericalfield().unwrap()).and_then(|v| v.as_f64()).unwrap();- Some(SignalCalculation::new_symmetrical(val))+ SignalCalculation::new_symmetrical(val)}}@@ -164,7 +164,7 @@ impl CoreSignal for HostCentralityRank {})}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -172,10 +172,10 @@ impl CoreSignal for HostCentralityRank {.get(self.as_numericalfield().unwrap()).and_then(|v| v.as_u64()).unwrap();- Some(SignalCalculation {+ SignalCalculation {value: val as f64,score: score_rank(val as f64),- })+ }}}@@ -207,7 +207,7 @@ impl CoreSignal for PageCentrality {Some(SignalCalculation::new_symmetrical(webpage.page_centrality))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -215,7 +215,7 @@ impl CoreSignal for PageCentrality {.get(self.as_numericalfield().unwrap()).and_then(|v| v.as_f64()).unwrap();- Some(SignalCalculation::new_symmetrical(val))+ SignalCalculation::new_symmetrical(val)}}@@ -250,7 +250,7 @@ impl CoreSignal for PageCentralityRank {})}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -258,10 +258,10 @@ impl CoreSignal for PageCentralityRank {.get(self.as_numericalfield().unwrap()).and_then(|v| v.as_u64()).unwrap();- Some(SignalCalculation {+ SignalCalculation {value: val as f64,score: score_rank(val as f64),- })+ }}}@@ -293,7 +293,7 @@ impl CoreSignal for IsHomepage {))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -303,9 +303,9 @@ impl CoreSignal for IsHomepage {.unwrap();if val {- Some(SignalCalculation::new_symmetrical(1.0))+ SignalCalculation::new_symmetrical(1.0)} else {- Some(SignalCalculation::new_symmetrical(0.0))+ SignalCalculation::new_symmetrical(0.0)}}}@@ -352,7 +352,7 @@ impl CoreSignal for FetchTimeMs {})}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -367,10 +367,10 @@ impl CoreSignal for FetchTimeMs {signal_computer.fetch_time_ms_cache()[fetch_time_ms]};- Some(SignalCalculation {+ SignalCalculation {value: fetch_time_ms as f64,score,- })+ }}}@@ -417,7 +417,7 @@ impl CoreSignal for UpdateTimestamp {})}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -428,10 +428,10 @@ impl CoreSignal for UpdateTimestamp {let score = score_timestamp(val, signal_computer);- Some(SignalCalculation {+ SignalCalculation {value: val as f64,score,- })+ }}}@@ -469,7 +469,7 @@ impl CoreSignal for TrackerScore {})}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -479,10 +479,10 @@ impl CoreSignal for TrackerScore {.unwrap();let score = score_trackers(val as f64);- Some(SignalCalculation {+ SignalCalculation {value: val as f64,score,- })+ }}}@@ -523,7 +523,7 @@ impl CoreSignal for Region {})}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -534,10 +534,10 @@ impl CoreSignal for Region {let region = crate::webpage::Region::from_id(val);let score = score_region(region, signal_computer);- Some(SignalCalculation {+ SignalCalculation {value: val as f64,score,- })+ }}}@@ -590,7 +590,7 @@ impl CoreSignal for UrlDigits {})}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -600,7 +600,7 @@ impl CoreSignal for UrlDigits {.unwrap() as f64;let score = score_digits(val);- Some(SignalCalculation { value: val, score })+ SignalCalculation { value: val, score }}}@@ -644,7 +644,7 @@ impl CoreSignal for UrlSlashes {})}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -654,7 +654,7 @@ impl CoreSignal for UrlSlashes {.unwrap() as f64;let score = score_slashes(val);- Some(SignalCalculation { value: val, score })+ SignalCalculation { value: val, score }}}@@ -692,7 +692,7 @@ impl CoreSignal for LinkDensity {})}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -702,7 +702,7 @@ impl CoreSignal for LinkDensity {.unwrap();let score = score_link_density(val);- Some(SignalCalculation { value: val, score })+ SignalCalculation { value: val, score }}}@@ -738,7 +738,7 @@ impl CoreSignal for HasAds {Some(SignalCalculation { value, score })}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();let numericalfield_reader = seg_reader.numericalfield_reader().get_field_reader(doc);@@ -750,6 +750,6 @@ impl CoreSignal for HasAds {let value: f64 = has_ads.into();let score = if !has_ads { 1.0 } else { 0.0 };- Some(SignalCalculation { value, score })+ SignalCalculation { value, score }}}diff --git a/crates/core/src/ranking/signals/core/text.rs b/crates/core/src/ranking/signals/core/text.rsindex a8785655..a391bf3a 100644--- a/crates/core/src/ranking/signals/core/text.rs+++ b/crates/core/src/ranking/signals/core/text.rs@@ -42,16 +42,16 @@ impl CoreSignal for Bm25F {None}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- Some(SignalCalculation::new_symmetrical(+ SignalCalculation::new_symmetrical(seg_reader.text_fields_mut().values_mut().map(|field| field.bm25f(doc)).sum(),- ))+ )}}@@ -81,14 +81,16 @@ impl CoreSignal for Bm25Title {true}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.bm25(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -114,13 +116,16 @@ impl CoreSignal for TitleCoverage {Some(Field::Text(schema::text_field::Title.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap())- .map(|field| SignalCalculation::new_symmetrical(field.coverage(doc)))+ .map(|field| field.coverage(doc))+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -150,14 +155,16 @@ impl CoreSignal for Bm25TitleBigrams {Some(Field::Text(schema::text_field::TitleBigrams.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.bm25(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -187,14 +194,16 @@ impl CoreSignal for Bm25TitleTrigrams {Some(Field::Text(schema::text_field::TitleTrigrams.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.bm25(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -224,14 +233,16 @@ impl CoreSignal for Bm25CleanBody {Some(Field::Text(schema::text_field::CleanBody.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.bm25(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -257,14 +268,16 @@ impl CoreSignal for CleanBodyCoverage {Some(Field::Text(schema::text_field::CleanBody.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.coverage(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -294,14 +307,16 @@ impl CoreSignal for Bm25CleanBodyBigrams {Some(Field::Text(schema::text_field::CleanBodyBigrams.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.bm25(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -331,14 +346,16 @@ impl CoreSignal for Bm25CleanBodyTrigrams {Some(Field::Text(schema::text_field::CleanBodyTrigrams.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.bm25(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -364,14 +381,16 @@ impl CoreSignal for Bm25StemmedTitle {Some(Field::Text(schema::text_field::StemmedTitle.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.bm25(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -397,14 +416,16 @@ impl CoreSignal for Bm25StemmedCleanBody {Some(Field::Text(schema::text_field::StemmedCleanBody.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.bm25(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -430,14 +451,16 @@ impl CoreSignal for Bm25AllBody {Some(Field::Text(schema::text_field::AllBody.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.bm25(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -463,14 +486,16 @@ impl CoreSignal for Bm25Keywords {Some(Field::Text(schema::text_field::Keywords.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.bm25(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -496,14 +521,16 @@ impl CoreSignal for Bm25BacklinkText {Some(Field::Text(schema::text_field::BacklinkText.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.bm25(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -529,14 +556,16 @@ impl CoreSignal for IdfSumUrl {Some(Field::Text(schema::text_field::Url.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.idf_sum(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -562,14 +591,16 @@ impl CoreSignal for IdfSumSite {Some(Field::Text(schema::text_field::SiteWithout.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.idf_sum(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -595,14 +626,16 @@ impl CoreSignal for IdfSumDomain {Some(Field::Text(schema::text_field::Domain.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.idf_sum(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -628,14 +661,16 @@ impl CoreSignal for IdfSumSiteNoTokenizer {Some(Field::Text(schema::text_field::SiteNoTokenizer.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.idf_sum(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -661,14 +696,16 @@ impl CoreSignal for IdfSumDomainNoTokenizer {Some(Field::Text(schema::text_field::DomainNoTokenizer.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.idf_sum(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -696,14 +733,16 @@ impl CoreSignal for IdfSumDomainNameNoTokenizer {))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.idf_sum(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -729,14 +768,16 @@ impl CoreSignal for IdfSumDomainIfHomepage {Some(Field::Text(schema::text_field::DomainIfHomepage.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.idf_sum(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -764,14 +805,16 @@ impl CoreSignal for IdfSumDomainNameIfHomepageNoTokenizer {))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.idf_sum(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -799,14 +842,16 @@ impl CoreSignal for IdfSumDomainIfHomepageNoTokenizer {))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.idf_sum(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}@@ -832,13 +877,15 @@ impl CoreSignal for IdfSumTitleIfHomepage {Some(Field::Text(schema::text_field::TitleIfHomepage.into()))}- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation> {+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation {let mut seg_reader = signal_computer.segment_reader().unwrap().borrow_mut();- seg_reader+ let val = seg_reader.text_fields_mut().get_mut(self.as_textfield().unwrap()).map(|field| field.idf_sum(doc))- .map(SignalCalculation::new_symmetrical)+ .unwrap_or(0.0);++ SignalCalculation::new_symmetrical(val)}}diff --git a/crates/core/src/ranking/signals/mod.rs b/crates/core/src/ranking/signals/mod.rsindex 8667b041..65dc7640 100644--- a/crates/core/src/ranking/signals/mod.rs+++ b/crates/core/src/ranking/signals/mod.rs@@ -42,7 +42,7 @@ use tantivy::DocId;pub trait CoreSignal: Clone + Copy + std::fmt::Debug + PartialEq + Eq + std::hash::Hash {fn default_coefficient(&self) -> f64;fn as_field(&self) -> Option<Field>;- fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> Option<SignalCalculation>;+ fn compute(&self, doc: DocId, signal_computer: &SignalComputer) -> SignalCalculation;fn precompute(self,