Rename raw_matches into bare_matches

meilisearch-core/src/criterion/attribute.rs

@@ -2,7 +2,7 @@ use std::cmp::Ordering;
 use slice_group_by::GroupBy;
 use crate::{RawDocument, MResult};
 use crate::bucket_sort::SimpleMatch;
-use super::{Criterion, Context, ContextMut, prepare_raw_matches};
+use super::{Criterion, Context, ContextMut, prepare_bare_matches};
 
 pub struct Attribute;
 
@@ -15,7 +15,7 @@ impl Criterion for Attribute {
         documents: &mut [RawDocument<'r, 'tag>],
     ) -> MResult<()>
     {
-        prepare_raw_matches(documents, ctx.postings_lists, ctx.query_enhancer);
+        prepare_bare_matches(documents, ctx.postings_lists, ctx.query_enhancer);
         Ok(())
     }
 

meilisearch-core/src/criterion/exact.rs

@@ -21,11 +21,11 @@ impl Criterion for Exact {
         let reader = ctx.reader;
 
         'documents: for doc in documents {
-            doc.raw_matches.sort_unstable_by_key(|bm| (bm.query_index, Reverse(bm.is_exact)));
+            doc.bare_matches.sort_unstable_by_key(|bm| (bm.query_index, Reverse(bm.is_exact)));
 
             // mark the document if we find a "one word field" that matches
             let mut fields_counts = HashMap::new();
-            for group in doc.raw_matches.linear_group_by_key(|bm| bm.query_index) {
+            for group in doc.bare_matches.linear_group_by_key(|bm| bm.query_index) {
                 for group in group.linear_group_by_key(|bm| bm.is_exact) {
                     if !group[0].is_exact { break }
 
@@ -70,8 +70,8 @@ impl Criterion for Exact {
         lhs.contains_one_word_field.cmp(&rhs.contains_one_word_field).reverse()
         // if not, with document contains the more exact words
         .then_with(|| {
-            let lhs = sum_exact_query_words(&lhs.raw_matches);
-            let rhs = sum_exact_query_words(&rhs.raw_matches);
+            let lhs = sum_exact_query_words(&lhs.bare_matches);
+            let rhs = sum_exact_query_words(&rhs.bare_matches);
             lhs.cmp(&rhs).reverse()
         })
     }

meilisearch-core/src/criterion/mod.rs

@@ -145,7 +145,7 @@ fn prepare_query_distances<'a, 'tag, 'txn>(
         if !document.processed_distances.is_empty() { continue }
 
         let mut processed = Vec::new();
-        for m in document.raw_matches.iter() {
+        for m in document.bare_matches.iter() {
             if postings_lists[m.postings_list].is_empty() { continue }
 
             let range = query_enhancer.replacement(m.query_index as u32);
@@ -166,7 +166,7 @@ fn prepare_query_distances<'a, 'tag, 'txn>(
     }
 }
 
-fn prepare_raw_matches<'a, 'tag, 'txn>(
+fn prepare_bare_matches<'a, 'tag, 'txn>(
     documents: &mut [RawDocument<'a, 'tag>],
     postings_lists: &mut SmallArena<'tag, PostingsListView<'txn>>,
     query_enhancer: &QueryEnhancer,
@@ -175,7 +175,7 @@ fn prepare_raw_matches<'a, 'tag, 'txn>(
         if !document.processed_matches.is_empty() { continue }
 
         let mut processed = Vec::new();
-        for m in document.raw_matches.iter() {
+        for m in document.bare_matches.iter() {
             let postings_list = &postings_lists[m.postings_list];
             processed.reserve(postings_list.len());
             for di in postings_list.as_ref() {

meilisearch-core/src/criterion/proximity.rs

@@ -2,7 +2,7 @@ use std::cmp::{self, Ordering};
 use slice_group_by::GroupBy;
 use crate::bucket_sort::{SimpleMatch};
 use crate::{RawDocument, MResult};
-use super::{Criterion, Context, ContextMut, prepare_raw_matches};
+use super::{Criterion, Context, ContextMut, prepare_bare_matches};
 
 const MAX_DISTANCE: u16 = 8;
 
@@ -17,7 +17,7 @@ impl Criterion for Proximity {
         documents: &mut [RawDocument<'r, 'tag>],
     ) -> MResult<()>
     {
-        prepare_raw_matches(documents, ctx.postings_lists, ctx.query_enhancer);
+        prepare_bare_matches(documents, ctx.postings_lists, ctx.query_enhancer);
         Ok(())
     }
 

meilisearch-core/src/criterion/words_position.rs

@@ -2,7 +2,7 @@ use std::cmp::Ordering;
 use slice_group_by::GroupBy;
 use crate::bucket_sort::SimpleMatch;
 use crate::{RawDocument, MResult};
-use super::{Criterion, Context, ContextMut, prepare_raw_matches};
+use super::{Criterion, Context, ContextMut, prepare_bare_matches};
 
 pub struct WordsPosition;
 
@@ -15,7 +15,7 @@ impl Criterion for WordsPosition {
         documents: &mut [RawDocument<'r, 'tag>],
     ) -> MResult<()>
     {
-        prepare_raw_matches(documents, ctx.postings_lists, ctx.query_enhancer);
+        prepare_bare_matches(documents, ctx.postings_lists, ctx.query_enhancer);
         Ok(())
     }