snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-30 23:46:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the docid_word_positions_merge method that must never be called

Browse Source
This commit is contained in:
Kerollmops
2021-06-09 14:49:06 +02:00
parent 93a8633f18
commit ab727e428b
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
milli/src/update/index_documents/merge_function.rs
View File

@@ -18,10 +18,6 @@ pub fn fst_merge(_key: &[u8], values: &[Cow<[u8]>]) -> anyhow::Result<Vec<u8>> {
Ok(build.into_inner().unwrap())
}
pub fn docid_word_positions_merge(key: &[u8], _values: &[Cow<[u8]>]) -> anyhow::Result<Vec<u8>> {
panic!("merging docid word positions is an error ({:?})", key.as_bstr())
}
pub fn keep_first(_key: &[u8], values: &[Cow<[u8]>]) -> anyhow::Result<Vec<u8>> {
Ok(values.first().unwrap().to_vec())
}

7
milli/src/update/index_documents/mod.rs
View File

@@ -25,8 +25,7 @@ use crate::update::{
};
use self::store::{Store, Readers};
pub use self::merge_function::{
fst_merge, cbo_roaring_bitmap_merge, roaring_bitmap_merge,
docid_word_positions_merge, keep_first
fst_merge, cbo_roaring_bitmap_merge, roaring_bitmap_merge, keep_first
};
pub use self::transform::{Transform, TransformOutput};
@@ -619,12 +618,12 @@ impl<'t, 'u, 'i, 'a> IndexDocuments<'t, 'u, 'i, 'a> {
total_databases,
});
debug!("Writing the docid word positions into LMDB on disk...");
debug!("Inserting the docid word positions into LMDB on disk...");
merge_into_lmdb_database(
self.wtxn,
*self.index.docid_word_positions.as_polymorph(),
docid_word_positions_readers,
docid_word_positions_merge,
keep_first,
write_method
)?;