Add index name to non sortable search query

meilisearch/src/analytics/segment_analytics.rs

@@ -634,6 +634,7 @@ impl SearchAggregator {
     pub fn from_query(query: &SearchQuery, request: &HttpRequest) -> Self {
         let SearchQuery {
             q,
+            index_uid,
             vector,
             offset,
             limit,

meilisearch/src/routes/indexes/facet_search.rs

@@ -102,6 +102,7 @@ impl From<FacetSearchQuery> for SearchQuery {
 
         SearchQuery {
             q,
+            index_uid: None,
             offset: DEFAULT_SEARCH_OFFSET(),
             limit: DEFAULT_SEARCH_LIMIT(),
             page: None,

meilisearch/src/routes/indexes/search.rs

@@ -128,6 +128,7 @@ impl From<SearchQueryGet> for SearchQuery {
         };
 
         Self {
+            index_uid: None,
             q: other.q,
             vector: other.vector.map(CS::into_inner),
             offset: other.offset.0,
@@ -203,9 +204,10 @@ pub async fn search_with_url_query(
 
     let distribution = embed(&mut query, index_scheduler.get_ref(), &index).await?;
 
-    let search_result =
-        tokio::task::spawn_blocking(move || perform_search(&index, query, features, distribution))
-            .await?;
+    let search_result = tokio::task::spawn_blocking(move || {
+        perform_search(&index, index_uid.to_string(), query, features, distribution)
+    })
+    .await?;
     if let Ok(ref search_result) = search_result {
         aggregate.succeed(search_result);
     }
@@ -242,9 +244,10 @@ pub async fn search_with_post(
 
     let distribution = embed(&mut query, index_scheduler.get_ref(), &index).await?;
 
-    let search_result =
-        tokio::task::spawn_blocking(move || perform_search(&index, query, features, distribution))
-            .await?;
+    let search_result = tokio::task::spawn_blocking(move || {
+        perform_search(&index, index_uid.to_string(), query, features, distribution)
+    })
+    .await?;
     if let Ok(ref search_result) = search_result {
         aggregate.succeed(search_result);
     }

meilisearch/src/routes/multi_search.rs

@@ -54,6 +54,8 @@ pub async fn multi_search_with_post(
         {
             debug!(on_index = query_index, parameters = ?query, "Multi-search");
 
+            let index_uid_name = &index_uid.clone();
+
             // Check index from API key
             if !index_scheduler.filters().is_index_authorized(&index_uid) {
                 return Err(AuthenticationError::InvalidToken).with_index(query_index);
@@ -80,13 +82,13 @@ pub async fn multi_search_with_post(
                 .with_index(query_index)?;
 
             let search_result = tokio::task::spawn_blocking(move || {
-                perform_search(&index, query, features, distribution)
+                perform_search(&index, index_uid.to_string().clone(), query, features, distribution)
             })
             .await
             .with_index(query_index)?;
 
             search_results.push(SearchResultWithIndex {
-                index_uid: index_uid.into_inner(),
+                index_uid: index_uid_name.to_string(),
                 result: search_result.with_index(query_index)?,
             });
         }

meilisearch/src/search.rs

@@ -41,6 +41,7 @@ pub const DEFAULT_SEMANTIC_RATIO: fn() -> SemanticRatio = || SemanticRatio(0.5);
 #[derive(Debug, Clone, Default, PartialEq, Deserr)]
 #[deserr(error = DeserrJsonError, rename_all = camelCase, deny_unknown_fields)]
 pub struct SearchQuery {
+    pub index_uid: Option<String>,
     #[deserr(default, error = DeserrJsonError<InvalidSearchQ>)]
     pub q: Option<String>,
     #[deserr(default, error = DeserrJsonError<InvalidSearchVector>)]
@@ -192,6 +193,7 @@ pub struct SearchQueryWithIndex {
 
 impl SearchQueryWithIndex {
     pub fn into_index_query(self) -> (IndexUid, SearchQuery) {
+        let index_uid_name = self.index_uid.clone().to_string().clone();
         let SearchQueryWithIndex {
             index_uid,
             q,
@@ -221,6 +223,7 @@ impl SearchQueryWithIndex {
             index_uid,
             SearchQuery {
                 q,
+                index_uid: Some(index_uid_name),
                 vector,
                 offset,
                 limit,
@@ -378,12 +381,13 @@ pub fn add_search_rules(query: &mut SearchQuery, rules: IndexSearchRules) {
 
 fn prepare_search<'t>(
     index: &'t Index,
+    index_uid: &String,
     rtxn: &'t RoTxn,
     query: &'t SearchQuery,
     features: RoFeatures,
     distribution: Option<DistributionShift>,
 ) -> Result<(milli::Search<'t>, bool, usize, usize), MeilisearchHttpError> {
-    let mut search = index.search(rtxn);
+    let mut search = index.search(rtxn, index_uid.clone());
 
     if query.vector.is_some() {
         features.check_vector("Passing `vector` as a query parameter")?;
@@ -486,6 +490,7 @@ fn prepare_search<'t>(
 
 pub fn perform_search(
     index: &Index,
+    index_uid: String,
     query: SearchQuery,
     features: RoFeatures,
     distribution: Option<DistributionShift>,
@@ -494,7 +499,7 @@ pub fn perform_search(
     let rtxn = index.read_txn()?;
 
     let (search, is_finite_pagination, max_total_hits, offset) =
-        prepare_search(index, &rtxn, &query, features, distribution)?;
+        prepare_search(index, &index_uid, &rtxn, &query, features, distribution)?;
 
     let milli::SearchResult { documents_ids, matching_words, candidates, document_scores, .. } =
         match &query.hybrid {
@@ -725,7 +730,8 @@ pub fn perform_facet_search(
     let before_search = Instant::now();
     let rtxn = index.read_txn()?;
 
-    let (search, _, _, _) = prepare_search(index, &rtxn, &search_query, features, None)?;
+    let (search, _, _, _) =
+        prepare_search(index, &"".to_string(), &rtxn, &search_query, features, None)?;
     let mut facet_search =
         SearchForFacetValues::new(facet_name, search, search_query.hybrid.is_some());
     if let Some(facet_query) = &facet_query {