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

Fix some issues after a rebase

Browse Source
This commit is contained in:
Clément Renault 2024-12-17 17:16:41 +01:00 committed by Kerollmops
parent d43ddd7205
commit ecc7741212
No known key found for this signature in database
GPG Key ID: F250A4C4E3AE5F5F
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/milli/src/update/new/extract/documents/mod.rs
View File

@ -7,8 +7,8 @@ use zstd::bulk::Compressor;
use zstd::dict::EncoderDictionary; use zstd::dict::EncoderDictionary;
use super::DelAddRoaringBitmap; use super::DelAddRoaringBitmap;
use crate::heed_codec::CompressedObkvU16;
use crate::constants::RESERVED_GEO_FIELD_NAME; use crate::constants::RESERVED_GEO_FIELD_NAME;
use crate::heed_codec::CompressedObkvU16;
use crate::update::new::channel::DocumentsSender; use crate::update::new::channel::DocumentsSender;
use crate::update::new::document::{write_to_obkv, Document as _}; use crate::update::new::document::{write_to_obkv, Document as _};
use crate::update::new::indexer::document_changes::{DocumentChangeContext, Extractor}; use crate::update::new::indexer::document_changes::{DocumentChangeContext, Extractor};
@ -126,6 +126,7 @@ impl<'a, 'b, 'extractor> Extractor<'extractor> for DocumentsExtractor<'a, 'b> {
&context.rtxn, &context.rtxn,
context.index, context.index,
&context.db_fields_ids_map, &context.db_fields_ids_map,
context.db_document_decompression_dictionary,
&context.doc_alloc, &context.doc_alloc,
)?; )?;
let geo_iter = content let geo_iter = content

1
crates/milli/src/update/new/indexer/mod.rs
View File

@ -7,6 +7,7 @@ use big_s::S;
use bumpalo::Bump; use bumpalo::Bump;
pub use document_changes::{extract, DocumentChanges, IndexingContext}; pub use document_changes::{extract, DocumentChanges, IndexingContext};
use document_changes::{DocumentChangeContext, Extractor}; use document_changes::{DocumentChangeContext, Extractor};
use bumparaw_collections::RawMap;
pub use document_deletion::DocumentDeletion; pub use document_deletion::DocumentDeletion;
pub use document_operation::{DocumentOperation, PayloadStats}; pub use document_operation::{DocumentOperation, PayloadStats};
use hashbrown::HashMap; use hashbrown::HashMap;

17
crates/milli/src/update/new/reindex.rs
View File

@ -1,4 +1,5 @@
use heed::RwTxn; use heed::RwTxn;
use zstd::dict::DecoderDictionary;
use super::document::{Document, DocumentFromDb}; use super::document::{Document, DocumentFromDb};
use crate::progress::{self, AtomicSubStep, Progress}; use crate::progress::{self, AtomicSubStep, Progress};
@ -17,10 +18,23 @@ pub fn field_distribution(index: &Index, wtxn: &mut RwTxn<'_>, progress: &Progre
let docids = index.documents_ids(wtxn)?; let docids = index.documents_ids(wtxn)?;
let mut doc_alloc = bumpalo::Bump::new(); let mut doc_alloc = bumpalo::Bump::new();
let db_document_decompression_dictionary =
match index.document_compression_raw_dictionary(wtxn)? {
Some(raw) => Some(DecoderDictionary::copy(raw)),
None => None,
};
for docid in docids { for docid in docids {
update_document_count.fetch_add(1, std::sync::atomic::Ordering::Relaxed); update_document_count.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
let Some(document) = DocumentFromDb::new(docid, wtxn, index, &field_id_map, &doc_alloc)? let Some(document) = DocumentFromDb::new(
docid,
wtxn,
index,
&field_id_map,
db_document_decompression_dictionary.as_ref(),
&doc_alloc,
)?
else { else {
continue; continue;
}; };
@ -38,5 +52,6 @@ pub fn field_distribution(index: &Index, wtxn: &mut RwTxn<'_>, progress: &Progre
} }
index.put_field_distribution(wtxn, &distribution)?; index.put_field_distribution(wtxn, &distribution)?;
Ok(()) Ok(())
} }