web search done right
[webgraph] speedup queries by using warmed f64 column for scorer
Mikkel Denkercd40e2757bb0
diff --git a/crates/core/src/distributed/sonic/service.rs b/crates/core/src/distributed/sonic/service.rsindex 38258339..1e156101 100644--- a/crates/core/src/distributed/sonic/service.rs+++ b/crates/core/src/distributed/sonic/service.rs@@ -71,11 +71,9 @@ impl<S: Service> Server<S> {let mut res = Vec::new();for req in bodies {- res.push(S::handle(req, &service));+ res.push(S::handle(req, &service).await);}- let res = futures::future::join_all(res).await;-if let Err(e) = req.respond(OneOrMany::Many(res)).await {tracing::error!("failed to respond to request: {}", e);}diff --git a/crates/core/src/webgraph/query/backlink.rs b/crates/core/src/webgraph/query/backlink.rsindex 419435e6..f0988b4e 100644--- a/crates/core/src/webgraph/query/backlink.rs+++ b/crates/core/src/webgraph/query/backlink.rs@@ -139,6 +139,7 @@ impl Query for BacklinksQuery {TopDocsCollector::from(self.limit).with_shard_id(searcher.shard()).disable_offset()+ .with_column_fields(searcher.warmed_column_fields().clone())}fn remote_collector(&self) -> Self::Collector {@@ -245,7 +246,8 @@ impl Query for HostBacklinksQuery {.with_shard_id(searcher.shard()).disable_offset().with_deduplicator(HostDeduplicator)- .with_column_fields(searcher.warmed_column_fields().clone(), FromHostId)+ .with_column_fields(searcher.warmed_column_fields().clone())+ .with_host_field(FromHostId)}fn remote_collector(&self) -> Self::Collector {@@ -340,6 +342,7 @@ impl Query for FullBacklinksQuery {TopDocsCollector::from(self.limit).with_shard_id(searcher.shard()).disable_offset()+ .with_column_fields(searcher.warmed_column_fields().clone())}fn remote_collector(&self) -> Self::Collector {@@ -436,7 +439,8 @@ impl Query for FullHostBacklinksQuery {.with_shard_id(searcher.shard()).disable_offset().with_deduplicator(HostDeduplicator)- .with_column_fields(searcher.warmed_column_fields().clone(), FromHostId)+ .with_column_fields(searcher.warmed_column_fields().clone())+ .with_host_field(FromHostId)}fn remote_collector(&self) -> Self::Collector {@@ -516,6 +520,7 @@ impl Query for BacklinksWithLabelsQuery {TopDocsCollector::from(self.limit).with_shard_id(searcher.shard()).disable_offset()+ .with_column_fields(searcher.warmed_column_fields().clone())}fn remote_collector(&self) -> Self::Collector {diff --git a/crates/core/src/webgraph/query/between.rs b/crates/core/src/webgraph/query/between.rsindex 25847f58..0c11b462 100644--- a/crates/core/src/webgraph/query/between.rs+++ b/crates/core/src/webgraph/query/between.rs@@ -67,6 +67,7 @@ impl Query for FullLinksBetweenQuery {TopDocsCollector::from(self.limit).with_shard_id(searcher.shard()).disable_offset()+ .with_column_fields(searcher.warmed_column_fields().clone())}fn remote_collector(&self) -> Self::Collector {diff --git a/crates/core/src/webgraph/query/collector/top_docs.rs b/crates/core/src/webgraph/query/collector/top_docs.rsindex 8ff42152..7813554f 100644--- a/crates/core/src/webgraph/query/collector/top_docs.rs+++ b/crates/core/src/webgraph/query/collector/top_docs.rs@@ -131,14 +131,21 @@ impl Deduplicator for HostDeduplicator {pub struct ColumnFields {warmed_column_fields: WarmedColumnFields,- host_field: FieldEnum,+ host_field: Option<FieldEnum>,}impl ColumnFields {- pub fn new<F: Field>(warmed_column_fields: WarmedColumnFields, host_field: F) -> Self {+ pub fn new(warmed_column_fields: WarmedColumnFields) -> Self {Self {warmed_column_fields,- host_field: host_field.into(),+ host_field: None,+ }+ }++ pub fn with_host_field<F: Field>(self, host_field: F) -> Self {+ Self {+ warmed_column_fields: self.warmed_column_fields,+ host_field: Some(host_field.into()),}}}@@ -238,13 +245,16 @@ impl<S, D> TopDocsCollector<S, D> {}}- pub fn with_column_fields<F: Field>(- self,- warmed_column_fields: WarmedColumnFields,- host_field: F,- ) -> Self {+ pub fn with_column_fields(self, warmed_column_fields: WarmedColumnFields) -> Self {+ Self {+ column_fields: Some(ColumnFields::new(warmed_column_fields)),+ ..self+ }+ }++ pub fn with_host_field<F: Field>(self, host_field: F) -> Self {Self {- column_fields: Some(ColumnFields::new(warmed_column_fields, host_field)),+ column_fields: Some(self.column_fields.unwrap().with_host_field(host_field)),..self}}@@ -276,7 +286,9 @@ impl<S: DocumentScorer + 'static, D: Deduplicator + 'static> Collector for TopDosegment_ord: SegmentOrdinal,segment: &tantivy::SegmentReader,) -> crate::Result<Self::Child> {- let scorer = S::for_segment(segment)?;+ let column_fields = self.column_fields.as_ref().unwrap();++ let scorer = S::for_segment(segment, &column_fields.warmed_column_fields)?;let segment_id = segment.segment_id();@@ -285,10 +297,11 @@ impl<S: DocumentScorer + 'static, D: Deduplicator + 'static> Collector for TopDocomputer: self.computer(),segment_ord,scorer,- host_column: self.column_fields.as_ref().map(|cf| {- cf.warmed_column_fields+ host_column: column_fields.host_field.map(|host_field| {+ column_fields+ .warmed_column_fields.segment(&segment_id)- .u64_by_enum(cf.host_field)+ .u64_by_enum(host_field).unwrap()}),_deduplicator: PhantomData,diff --git a/crates/core/src/webgraph/query/document_scorer/mod.rs b/crates/core/src/webgraph/query/document_scorer/mod.rsindex 842300ff..98640d25 100644--- a/crates/core/src/webgraph/query/document_scorer/mod.rs+++ b/crates/core/src/webgraph/query/document_scorer/mod.rs@@ -16,10 +16,16 @@use tantivy::{columnar::Column, DocId, Score, SegmentReader};-use crate::webgraph::schema::{Field, SortScore};+use crate::webgraph::{+ schema::{Field, SortScore},+ warmed_column_fields::WarmedColumnFields,+};pub trait DocumentScorer: Send + Sync + Sized {- fn for_segment(segment: &SegmentReader) -> tantivy::Result<Self>;+ fn for_segment(+ segment: &SegmentReader,+ column_fields: &WarmedColumnFields,+ ) -> tantivy::Result<Self>;fn score(&self, doc: DocId) -> Score;}@@ -28,8 +34,17 @@ pub struct DefaultDocumentScorer {}impl DocumentScorer for DefaultDocumentScorer {- fn for_segment(segment: &SegmentReader) -> tantivy::Result<Self> {- let column = segment.column_fields().f64(SortScore.name())?;+ fn for_segment(+ segment: &SegmentReader,+ column_fields: &WarmedColumnFields,+ ) -> tantivy::Result<Self> {+ let column = column_fields+ .segment(&segment.segment_id())+ .f64(SortScore)+ .ok_or(tantivy::TantivyError::FieldNotFound(format!(+ "{} column not found",+ SortScore.name()+ )))?;Ok(Self { column })}diff --git a/crates/core/src/webgraph/query/forwardlink.rs b/crates/core/src/webgraph/query/forwardlink.rsindex d2e0b1e0..06b9fa06 100644--- a/crates/core/src/webgraph/query/forwardlink.rs+++ b/crates/core/src/webgraph/query/forwardlink.rs@@ -78,6 +78,7 @@ impl Query for ForwardlinksQuery {TopDocsCollector::from(self.limit).with_shard_id(searcher.shard()).disable_offset()+ .with_column_fields(searcher.warmed_column_fields().clone())}fn remote_collector(&self) -> Self::Collector {@@ -186,7 +187,8 @@ impl Query for HostForwardlinksQuery {.with_shard_id(searcher.shard()).disable_offset().with_deduplicator(HostDeduplicator)- .with_column_fields(searcher.warmed_column_fields().clone(), ToHostId)+ .with_column_fields(searcher.warmed_column_fields().clone())+ .with_host_field(ToHostId)}fn remote_collector(&self) -> Self::Collector {@@ -281,6 +283,7 @@ impl Query for FullForwardlinksQuery {TopDocsCollector::from(self.limit).with_shard_id(searcher.shard()).disable_offset()+ .with_column_fields(searcher.warmed_column_fields().clone())}fn remote_collector(&self) -> Self::Collector {@@ -377,7 +380,8 @@ impl Query for FullHostForwardlinksQuery {.with_shard_id(searcher.shard()).disable_offset().with_deduplicator(HostDeduplicator)- .with_column_fields(searcher.warmed_column_fields().clone(), ToHostId)+ .with_column_fields(searcher.warmed_column_fields().clone())+ .with_host_field(ToHostId)}fn remote_collector(&self) -> Self::Collector {