snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-27 08:41:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move sort code out of facet

Browse Source
This commit is contained in:
Mubelotix
2025-07-01 14:05:47 +02:00
parent 9f55708d84
commit d85480de89
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/meilisearch/src/routes/indexes/documents.rs
View File

@ -18,7 +18,7 @@ use meilisearch_types::error::deserr_codes::*;
use meilisearch_types::error::{Code, ResponseError}; use meilisearch_types::error::{Code, ResponseError};
use meilisearch_types::heed::RoTxn; use meilisearch_types::heed::RoTxn;
use meilisearch_types::index_uid::IndexUid; use meilisearch_types::index_uid::IndexUid;
use meilisearch_types::milli::facet::facet_sort_recursive::recursive_facet_sort; use meilisearch_types::milli::documents::sort::recursive_sort;
use meilisearch_types::milli::update::IndexDocumentsMethod; use meilisearch_types::milli::update::IndexDocumentsMethod;
use meilisearch_types::milli::vector::parsed_vectors::ExplicitVectors; use meilisearch_types::milli::vector::parsed_vectors::ExplicitVectors;
use meilisearch_types::milli::{AscDesc, DocumentId}; use meilisearch_types::milli::{AscDesc, DocumentId};
@ -1576,7 +1576,7 @@ fn retrieve_documents<S: AsRef<str>>(
let facet_sort; let facet_sort;
let (it, number_of_documents) = if let Some(sort) = sort_criteria { let (it, number_of_documents) = if let Some(sort) = sort_criteria {
let number_of_documents = candidates.len(); let number_of_documents = candidates.len();
facet_sort = recursive_facet_sort(index, &rtxn, sort, &candidates)?; facet_sort = recursive_sort(index, &rtxn, sort, &candidates)?;
let iter = facet_sort.iter()?; let iter = facet_sort.iter()?;
( (
itertools::Either::Left(some_documents( itertools::Either::Left(some_documents(

1
crates/milli/src/documents/mod.rs
View File

@ -4,6 +4,7 @@ pub mod geo_sort;
mod primary_key; mod primary_key;
mod reader; mod reader;
mod serde_impl; mod serde_impl;
pub mod sort;
use std::fmt::Debug; use std::fmt::Debug;
use std::io; use std::io;

2
crates/milli/src/facet/facet_sort_recursive.rs → crates/milli/src/documents/sort.rs
View File

@ -359,7 +359,7 @@ impl<'ctx> SortedDocuments<'ctx> {
} }
} }
pub fn recursive_facet_sort<'ctx>( pub fn recursive_sort<'ctx>(
index: &'ctx crate::Index, index: &'ctx crate::Index,
rtxn: &'ctx heed::RoTxn<'ctx>, rtxn: &'ctx heed::RoTxn<'ctx>,
sort: Vec<AscDesc>, sort: Vec<AscDesc>,

1
crates/milli/src/facet/mod.rs
View File

@ -1,4 +1,3 @@
pub mod facet_sort_recursive;
mod facet_type; mod facet_type;
mod facet_value; mod facet_value;
pub mod value_encoding; pub mod value_encoding;