snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-12-02 01:55:03 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix the failed document addition with a primary key

Browse Source
This commit is contained in:
Irevoire 2022-10-22 14:45:20 +02:00 committed by Clément Renault
parent cb48a02f94
commit 9bb2e3c790
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
index-scheduler/src/batch.rs
View File

@ -821,6 +821,7 @@ impl IndexScheduler {
content_files, content_files,
mut tasks, mut tasks,
} => { } => {
let mut primary_key_has_been_set = false;
let must_stop_processing = self.must_stop_processing.clone(); let must_stop_processing = self.must_stop_processing.clone();
let indexer_config = self.index_mapper.indexer_config(); let indexer_config = self.index_mapper.indexer_config();
// TODO use the code from the IndexCreate operation // TODO use the code from the IndexCreate operation
@ -833,6 +834,7 @@ impl IndexScheduler {
|indexing_step| debug!("update: {:?}", indexing_step), |indexing_step| debug!("update: {:?}", indexing_step),
|| must_stop_processing.clone().get(), || must_stop_processing.clone().get(),
)?; )?;
primary_key_has_been_set = true;
} }
} }
@ -869,6 +871,16 @@ impl IndexScheduler {
if results.iter().any(|res| res.is_ok()) { if results.iter().any(|res| res.is_ok()) {
let addition = builder.execute()?; let addition = builder.execute()?;
info!("document addition done: {:?}", addition); info!("document addition done: {:?}", addition);
} else if primary_key_has_been_set {
// Everything failed but we've set a primary key.
// We need to remove it.
let mut builder =
milli::update::Settings::new(index_wtxn, index, indexer_config);
builder.reset_primary_key();
builder.execute(
|indexing_step| debug!("update: {:?}", indexing_step),
|| must_stop_processing.clone().get(),
)?;
} }
for (task, (ret, count)) in for (task, (ret, count)) in