searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-22 21:04:27 +01:00
Code Issues Releases Wiki Activity

fix(dump): Fix the loading of dump with empty indexes

Browse Source
This commit is contained in:
Tamo 2022-01-05 14:56:12 +01:00
parent d53c61a6d0
commit eea483c470
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
meilisearch-lib/src/index/dump.rs
View File

@ -8,7 +8,7 @@ use indexmap::IndexMap;
use milli::documents::DocumentBatchReader; use milli::documents::DocumentBatchReader;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::document_formats::read_ndjson; use crate::document_formats::{read_ndjson, DocumentFormatError};
use crate::index::update_handler::UpdateHandler; use crate::index::update_handler::UpdateHandler;
use crate::index::updates::apply_settings_to_builder; use crate::index::updates::apply_settings_to_builder;
@ -128,23 +128,29 @@ impl Index {
let mut tmp_doc_file = tempfile::tempfile()?; let mut tmp_doc_file = tempfile::tempfile()?;
read_ndjson(reader, &mut tmp_doc_file)?; let empty = match read_ndjson(reader, &mut tmp_doc_file) {
// if there was no document in the file it's because the index was empty
Ok(_) => false,
Err(DocumentFormatError::EmptyPayload(_)) => true,
Err(e) => return Err(e.into()),
};
tmp_doc_file.seek(SeekFrom::Start(0))?; if !empty {
tmp_doc_file.seek(SeekFrom::Start(0))?;
let documents_reader = DocumentBatchReader::from_reader(tmp_doc_file)?; let documents_reader = DocumentBatchReader::from_reader(tmp_doc_file)?;
//If the document file is empty, we don't perform the document addition, to prevent //If the document file is empty, we don't perform the document addition, to prevent
//a primary key error to be thrown. //a primary key error to be thrown.
if !documents_reader.is_empty() { if !documents_reader.is_empty() {
let builder = update_handler let builder = update_handler
.update_builder() .update_builder()
.index_documents(&mut txn, &index); .index_documents(&mut txn, &index);
builder.execute(documents_reader, |_| ())?; builder.execute(documents_reader, |_| ())?;
}
} }
txn.commit()?; txn.commit()?;
index.prepare_for_closing().wait(); index.prepare_for_closing().wait();
Ok(()) Ok(())