2022-09-13 11:46:07 +02:00
|
|
|
use crate::{
|
|
|
|
autobatcher::BatchKind,
|
2022-09-18 22:04:36 +02:00
|
|
|
task::{Details, Kind, KindWithContent, Status, Task},
|
2022-09-16 01:58:08 +02:00
|
|
|
Error, IndexScheduler, Result, TaskId,
|
2022-09-13 11:46:07 +02:00
|
|
|
};
|
2022-09-29 18:15:50 +02:00
|
|
|
use index::apply_settings_to_builder;
|
|
|
|
use index::error::{IndexError, MilliError};
|
2022-09-13 22:38:43 +02:00
|
|
|
use index::{Settings, Unchecked};
|
2022-09-29 18:15:50 +02:00
|
|
|
use log::{debug, info};
|
|
|
|
use milli::documents::DocumentsBatchReader;
|
|
|
|
use milli::heed::{RoTxn, RwTxn};
|
|
|
|
use milli::update::IndexDocumentsConfig;
|
2022-09-29 11:49:47 +02:00
|
|
|
use milli::update::{DocumentAdditionResult, DocumentDeletionResult, IndexDocumentsMethod};
|
2022-09-09 01:09:50 +02:00
|
|
|
use uuid::Uuid;
|
2022-09-07 00:10:14 +02:00
|
|
|
|
2022-09-07 20:08:07 +02:00
|
|
|
pub(crate) enum Batch {
|
2022-09-07 00:10:14 +02:00
|
|
|
Cancel(Task),
|
|
|
|
Snapshot(Vec<Task>),
|
|
|
|
Dump(Vec<Task>),
|
2022-09-29 18:15:50 +02:00
|
|
|
IndexOperation(IndexOperation),
|
|
|
|
IndexCreation {
|
|
|
|
index_uid: String,
|
|
|
|
primary_key: Option<String>,
|
|
|
|
task: Task,
|
|
|
|
},
|
|
|
|
IndexUpdate {
|
|
|
|
index_uid: String,
|
|
|
|
primary_key: Option<String>,
|
|
|
|
task: Task,
|
|
|
|
},
|
|
|
|
IndexDeletion {
|
|
|
|
index_uid: String,
|
|
|
|
tasks: Vec<Task>,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
pub(crate) enum IndexOperation {
|
2022-09-29 15:49:54 +02:00
|
|
|
DocumentImport {
|
2022-09-16 16:31:16 +02:00
|
|
|
index_uid: String,
|
|
|
|
primary_key: Option<String>,
|
2022-09-29 15:49:54 +02:00
|
|
|
method: IndexDocumentsMethod,
|
2022-09-16 16:31:16 +02:00
|
|
|
content_files: Vec<Uuid>,
|
|
|
|
tasks: Vec<Task>,
|
|
|
|
},
|
|
|
|
DocumentDeletion {
|
|
|
|
index_uid: String,
|
2022-09-22 12:14:51 +02:00
|
|
|
documents: Vec<String>,
|
2022-09-16 16:31:16 +02:00
|
|
|
tasks: Vec<Task>,
|
|
|
|
},
|
|
|
|
DocumentClear {
|
|
|
|
index_uid: String,
|
|
|
|
tasks: Vec<Task>,
|
|
|
|
},
|
|
|
|
Settings {
|
|
|
|
index_uid: String,
|
2022-09-29 13:57:28 +02:00
|
|
|
// TODO what's that boolean, does it mean that it removes things or what?
|
2022-09-16 16:31:16 +02:00
|
|
|
settings: Vec<(bool, Settings<Unchecked>)>,
|
|
|
|
tasks: Vec<Task>,
|
|
|
|
},
|
|
|
|
DocumentClearAndSetting {
|
|
|
|
index_uid: String,
|
|
|
|
cleared_tasks: Vec<Task>,
|
|
|
|
|
2022-09-29 14:31:01 +02:00
|
|
|
// TODO what's that boolean, does it mean that it removes things or what?
|
2022-09-16 16:31:16 +02:00
|
|
|
settings: Vec<(bool, Settings<Unchecked>)>,
|
|
|
|
settings_tasks: Vec<Task>,
|
|
|
|
},
|
2022-09-29 15:49:54 +02:00
|
|
|
SettingsAndDocumentImport {
|
2022-09-16 16:31:16 +02:00
|
|
|
index_uid: String,
|
|
|
|
|
|
|
|
primary_key: Option<String>,
|
2022-09-29 15:49:54 +02:00
|
|
|
method: IndexDocumentsMethod,
|
2022-09-16 16:31:16 +02:00
|
|
|
content_files: Vec<Uuid>,
|
2022-09-29 15:49:54 +02:00
|
|
|
document_import_tasks: Vec<Task>,
|
2022-09-16 16:31:16 +02:00
|
|
|
|
2022-09-29 14:31:01 +02:00
|
|
|
// TODO what's that boolean, does it mean that it removes things or what?
|
2022-09-16 16:31:16 +02:00
|
|
|
settings: Vec<(bool, Settings<Unchecked>)>,
|
2022-09-13 11:46:07 +02:00
|
|
|
settings_tasks: Vec<Task>,
|
|
|
|
},
|
2022-09-09 01:09:50 +02:00
|
|
|
}
|
|
|
|
|
2022-09-16 01:58:08 +02:00
|
|
|
impl Batch {
|
|
|
|
pub fn ids(&self) -> Vec<TaskId> {
|
|
|
|
match self {
|
2022-09-16 21:24:49 +02:00
|
|
|
Batch::Cancel(task)
|
|
|
|
| Batch::IndexCreation { task, .. }
|
|
|
|
| Batch::IndexUpdate { task, .. } => vec![task.uid],
|
2022-09-29 18:15:50 +02:00
|
|
|
Batch::Snapshot(tasks) | Batch::Dump(tasks) | Batch::IndexDeletion { tasks, .. } => {
|
|
|
|
tasks.iter().map(|task| task.uid).collect()
|
2022-09-16 16:31:16 +02:00
|
|
|
}
|
2022-09-29 18:15:50 +02:00
|
|
|
Batch::IndexOperation(operation) => match operation {
|
|
|
|
IndexOperation::DocumentImport { tasks, .. }
|
|
|
|
| IndexOperation::DocumentDeletion { tasks, .. }
|
|
|
|
| IndexOperation::Settings { tasks, .. }
|
|
|
|
| IndexOperation::DocumentClear { tasks, .. } => {
|
|
|
|
tasks.iter().map(|task| task.uid).collect()
|
|
|
|
}
|
|
|
|
IndexOperation::SettingsAndDocumentImport {
|
|
|
|
document_import_tasks: tasks,
|
|
|
|
settings_tasks: other,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| IndexOperation::DocumentClearAndSetting {
|
|
|
|
cleared_tasks: tasks,
|
|
|
|
settings_tasks: other,
|
|
|
|
..
|
|
|
|
} => tasks.iter().chain(other).map(|task| task.uid).collect(),
|
|
|
|
},
|
2022-09-16 01:58:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-09-07 00:10:14 +02:00
|
|
|
impl IndexScheduler {
|
2022-09-13 11:46:07 +02:00
|
|
|
pub(crate) fn create_next_batch_index(
|
|
|
|
&self,
|
|
|
|
rtxn: &RoTxn,
|
|
|
|
index_uid: String,
|
|
|
|
batch: BatchKind,
|
|
|
|
) -> Result<Option<Batch>> {
|
|
|
|
match batch {
|
2022-09-29 18:15:50 +02:00
|
|
|
BatchKind::DocumentClear { ids } => {
|
|
|
|
Ok(Some(Batch::IndexOperation(IndexOperation::DocumentClear {
|
|
|
|
tasks: self.get_existing_tasks(rtxn, ids)?,
|
|
|
|
index_uid,
|
|
|
|
})))
|
|
|
|
}
|
2022-09-29 15:49:54 +02:00
|
|
|
BatchKind::DocumentImport { method, import_ids } => {
|
|
|
|
let tasks = self.get_existing_tasks(rtxn, import_ids)?;
|
2022-09-16 16:31:16 +02:00
|
|
|
let primary_key = match &tasks[0].kind {
|
2022-09-29 15:49:54 +02:00
|
|
|
KindWithContent::DocumentImport { primary_key, .. } => primary_key.clone(),
|
2022-09-13 11:46:07 +02:00
|
|
|
_ => unreachable!(),
|
|
|
|
};
|
2022-09-16 16:31:16 +02:00
|
|
|
let content_files = tasks
|
2022-09-13 11:46:07 +02:00
|
|
|
.iter()
|
|
|
|
.map(|task| match task.kind {
|
2022-09-29 15:49:54 +02:00
|
|
|
KindWithContent::DocumentImport { content_file, .. } => content_file,
|
2022-09-13 11:46:07 +02:00
|
|
|
_ => unreachable!(),
|
|
|
|
})
|
|
|
|
.collect();
|
|
|
|
|
2022-09-29 18:15:50 +02:00
|
|
|
Ok(Some(Batch::IndexOperation(
|
|
|
|
IndexOperation::DocumentImport {
|
|
|
|
index_uid,
|
|
|
|
primary_key,
|
|
|
|
method,
|
|
|
|
content_files,
|
|
|
|
tasks,
|
|
|
|
},
|
|
|
|
)))
|
2022-09-16 16:31:16 +02:00
|
|
|
}
|
|
|
|
BatchKind::DocumentDeletion { deletion_ids } => {
|
|
|
|
let tasks = self.get_existing_tasks(rtxn, deletion_ids)?;
|
|
|
|
|
|
|
|
let mut documents = Vec::new();
|
|
|
|
for task in &tasks {
|
|
|
|
match task.kind {
|
|
|
|
KindWithContent::DocumentDeletion {
|
|
|
|
ref documents_ids, ..
|
|
|
|
} => documents.extend_from_slice(documents_ids),
|
|
|
|
_ => unreachable!(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-09-29 18:15:50 +02:00
|
|
|
Ok(Some(Batch::IndexOperation(
|
|
|
|
IndexOperation::DocumentDeletion {
|
|
|
|
index_uid,
|
|
|
|
documents,
|
|
|
|
tasks,
|
|
|
|
},
|
|
|
|
)))
|
2022-09-16 16:31:16 +02:00
|
|
|
}
|
|
|
|
BatchKind::Settings { settings_ids } => {
|
|
|
|
let tasks = self.get_existing_tasks(rtxn, settings_ids)?;
|
|
|
|
|
|
|
|
let mut settings = Vec::new();
|
|
|
|
for task in &tasks {
|
|
|
|
match task.kind {
|
|
|
|
KindWithContent::Settings {
|
|
|
|
ref new_settings,
|
|
|
|
is_deletion,
|
|
|
|
..
|
|
|
|
} => settings.push((is_deletion, new_settings.clone())),
|
|
|
|
_ => unreachable!(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-09-29 18:15:50 +02:00
|
|
|
Ok(Some(Batch::IndexOperation(IndexOperation::Settings {
|
2022-09-16 16:31:16 +02:00
|
|
|
index_uid,
|
|
|
|
settings,
|
|
|
|
tasks,
|
2022-09-29 18:15:50 +02:00
|
|
|
})))
|
2022-09-16 16:31:16 +02:00
|
|
|
}
|
|
|
|
BatchKind::ClearAndSettings {
|
|
|
|
other,
|
|
|
|
settings_ids,
|
|
|
|
} => {
|
|
|
|
let (index_uid, settings, settings_tasks) = match self
|
|
|
|
.create_next_batch_index(rtxn, index_uid, BatchKind::Settings { settings_ids })?
|
|
|
|
.unwrap()
|
|
|
|
{
|
2022-09-29 18:15:50 +02:00
|
|
|
Batch::IndexOperation(IndexOperation::Settings {
|
2022-09-16 16:31:16 +02:00
|
|
|
index_uid,
|
|
|
|
settings,
|
|
|
|
tasks,
|
2022-09-29 18:15:50 +02:00
|
|
|
}) => (index_uid, settings, tasks),
|
2022-09-16 16:31:16 +02:00
|
|
|
_ => unreachable!(),
|
|
|
|
};
|
|
|
|
let (index_uid, cleared_tasks) = match self
|
|
|
|
.create_next_batch_index(
|
|
|
|
rtxn,
|
|
|
|
index_uid,
|
|
|
|
BatchKind::DocumentClear { ids: other },
|
|
|
|
)?
|
|
|
|
.unwrap()
|
|
|
|
{
|
2022-09-29 18:15:50 +02:00
|
|
|
Batch::IndexOperation(IndexOperation::DocumentClear { index_uid, tasks }) => {
|
|
|
|
(index_uid, tasks)
|
|
|
|
}
|
2022-09-16 16:31:16 +02:00
|
|
|
_ => unreachable!(),
|
|
|
|
};
|
|
|
|
|
2022-09-29 18:15:50 +02:00
|
|
|
Ok(Some(Batch::IndexOperation(
|
|
|
|
IndexOperation::DocumentClearAndSetting {
|
|
|
|
index_uid,
|
|
|
|
cleared_tasks,
|
|
|
|
settings,
|
|
|
|
settings_tasks,
|
|
|
|
},
|
|
|
|
)))
|
2022-09-16 16:31:16 +02:00
|
|
|
}
|
2022-09-29 15:49:54 +02:00
|
|
|
BatchKind::SettingsAndDocumentImport {
|
2022-09-16 16:31:16 +02:00
|
|
|
settings_ids,
|
2022-09-29 15:49:54 +02:00
|
|
|
method,
|
|
|
|
import_ids,
|
2022-09-16 16:31:16 +02:00
|
|
|
} => {
|
|
|
|
let settings = self.create_next_batch_index(
|
|
|
|
rtxn,
|
|
|
|
index_uid.clone(),
|
|
|
|
BatchKind::Settings { settings_ids },
|
|
|
|
)?;
|
|
|
|
|
2022-09-29 15:49:54 +02:00
|
|
|
let document_import = self.create_next_batch_index(
|
2022-09-16 16:31:16 +02:00
|
|
|
rtxn,
|
|
|
|
index_uid.clone(),
|
2022-09-29 15:49:54 +02:00
|
|
|
BatchKind::DocumentImport { method, import_ids },
|
2022-09-16 16:31:16 +02:00
|
|
|
)?;
|
|
|
|
|
2022-09-29 15:49:54 +02:00
|
|
|
match (document_import, settings) {
|
2022-09-16 16:31:16 +02:00
|
|
|
(
|
2022-09-29 18:15:50 +02:00
|
|
|
Some(Batch::IndexOperation(IndexOperation::DocumentImport {
|
2022-09-16 16:31:16 +02:00
|
|
|
primary_key,
|
|
|
|
content_files,
|
2022-09-29 15:49:54 +02:00
|
|
|
tasks: document_import_tasks,
|
2022-09-16 16:31:16 +02:00
|
|
|
..
|
2022-09-29 18:15:50 +02:00
|
|
|
})),
|
|
|
|
Some(Batch::IndexOperation(IndexOperation::Settings {
|
2022-09-16 16:31:16 +02:00
|
|
|
settings,
|
|
|
|
tasks: settings_tasks,
|
|
|
|
..
|
2022-09-29 18:15:50 +02:00
|
|
|
})),
|
|
|
|
) => Ok(Some(Batch::IndexOperation(
|
|
|
|
IndexOperation::SettingsAndDocumentImport {
|
|
|
|
index_uid,
|
|
|
|
primary_key,
|
|
|
|
method,
|
|
|
|
content_files,
|
|
|
|
document_import_tasks,
|
|
|
|
settings,
|
|
|
|
settings_tasks,
|
|
|
|
},
|
|
|
|
))),
|
2022-09-16 16:31:16 +02:00
|
|
|
_ => unreachable!(),
|
|
|
|
}
|
|
|
|
}
|
2022-09-16 21:24:49 +02:00
|
|
|
BatchKind::IndexCreation { id } => {
|
|
|
|
let task = self.get_task(rtxn, id)?.ok_or(Error::CorruptedTaskQueue)?;
|
|
|
|
let (index_uid, primary_key) = match &task.kind {
|
|
|
|
KindWithContent::IndexCreation {
|
|
|
|
index_uid,
|
|
|
|
primary_key,
|
|
|
|
} => (index_uid.clone(), primary_key.clone()),
|
|
|
|
_ => unreachable!(),
|
|
|
|
};
|
|
|
|
Ok(Some(Batch::IndexCreation {
|
|
|
|
index_uid,
|
|
|
|
primary_key,
|
|
|
|
task,
|
|
|
|
}))
|
|
|
|
}
|
|
|
|
BatchKind::IndexUpdate { id } => {
|
|
|
|
let task = self.get_task(rtxn, id)?.ok_or(Error::CorruptedTaskQueue)?;
|
|
|
|
let primary_key = match &task.kind {
|
|
|
|
KindWithContent::IndexUpdate { primary_key, .. } => primary_key.clone(),
|
|
|
|
_ => unreachable!(),
|
|
|
|
};
|
|
|
|
Ok(Some(Batch::IndexUpdate {
|
|
|
|
index_uid,
|
|
|
|
primary_key,
|
|
|
|
task,
|
|
|
|
}))
|
|
|
|
}
|
|
|
|
BatchKind::IndexDeletion { ids } => Ok(Some(Batch::IndexDeletion {
|
|
|
|
index_uid,
|
|
|
|
tasks: self.get_existing_tasks(rtxn, ids)?,
|
|
|
|
})),
|
2022-09-14 13:13:44 +02:00
|
|
|
BatchKind::IndexSwap { id: _ } => todo!(),
|
|
|
|
BatchKind::IndexRename { id: _ } => todo!(),
|
2022-09-13 11:46:07 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-09-07 00:10:14 +02:00
|
|
|
/// Create the next batch to be processed;
|
|
|
|
/// 1. We get the *last* task to cancel.
|
|
|
|
/// 2. We get the *next* snapshot to process.
|
|
|
|
/// 3. We get the *next* dump to process.
|
|
|
|
/// 4. We get the *next* tasks to process for a specific index.
|
2022-09-09 01:40:28 +02:00
|
|
|
pub(crate) fn create_next_batch(&self, rtxn: &RoTxn) -> Result<Option<Batch>> {
|
2022-09-07 00:10:14 +02:00
|
|
|
let enqueued = &self.get_status(rtxn, Status::Enqueued)?;
|
|
|
|
let to_cancel = self.get_kind(rtxn, Kind::CancelTask)? & enqueued;
|
|
|
|
|
|
|
|
// 1. we get the last task to cancel.
|
|
|
|
if let Some(task_id) = to_cancel.max() {
|
2022-09-09 01:40:28 +02:00
|
|
|
return Ok(Some(Batch::Cancel(
|
2022-09-07 00:10:14 +02:00
|
|
|
self.get_task(rtxn, task_id)?
|
|
|
|
.ok_or(Error::CorruptedTaskQueue)?,
|
2022-09-09 01:40:28 +02:00
|
|
|
)));
|
2022-09-07 00:10:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// 2. we batch the snapshot.
|
|
|
|
let to_snapshot = self.get_kind(rtxn, Kind::Snapshot)? & enqueued;
|
|
|
|
if !to_snapshot.is_empty() {
|
2022-09-09 01:40:28 +02:00
|
|
|
return Ok(Some(Batch::Snapshot(
|
|
|
|
self.get_existing_tasks(rtxn, to_snapshot)?,
|
|
|
|
)));
|
2022-09-07 00:10:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// 3. we batch the dumps.
|
|
|
|
let to_dump = self.get_kind(rtxn, Kind::DumpExport)? & enqueued;
|
|
|
|
if !to_dump.is_empty() {
|
2022-09-09 01:40:28 +02:00
|
|
|
return Ok(Some(Batch::Dump(self.get_existing_tasks(rtxn, to_dump)?)));
|
2022-09-07 00:10:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// 4. We take the next task and try to batch all the tasks associated with this index.
|
|
|
|
if let Some(task_id) = enqueued.min() {
|
|
|
|
let task = self
|
|
|
|
.get_task(rtxn, task_id)?
|
|
|
|
.ok_or(Error::CorruptedTaskQueue)?;
|
2022-09-09 01:40:28 +02:00
|
|
|
|
|
|
|
// This is safe because all the remaining task are associated with
|
|
|
|
// AT LEAST one index. We can use the right or left one it doesn't
|
|
|
|
// matter.
|
|
|
|
let index_name = task.indexes().unwrap()[0];
|
|
|
|
|
2022-10-03 15:29:37 +02:00
|
|
|
let _index = self.get_index(rtxn, index_name)? & enqueued;
|
2022-09-09 01:40:28 +02:00
|
|
|
|
|
|
|
let enqueued = enqueued
|
|
|
|
.into_iter()
|
|
|
|
.map(|task_id| {
|
|
|
|
self.get_task(rtxn, task_id)
|
|
|
|
.and_then(|task| task.ok_or(Error::CorruptedTaskQueue))
|
|
|
|
.map(|task| (task.uid, task.kind.as_kind()))
|
|
|
|
})
|
|
|
|
.collect::<Result<Vec<_>>>()?;
|
|
|
|
|
2022-09-13 11:46:07 +02:00
|
|
|
if let Some(batchkind) = crate::autobatcher::autobatch(enqueued) {
|
|
|
|
return self.create_next_batch_index(rtxn, index_name.to_string(), batchkind);
|
|
|
|
}
|
2022-09-07 00:10:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// If we found no tasks then we were notified for something that got autobatched
|
|
|
|
// somehow and there is nothing to do.
|
2022-09-09 01:40:28 +02:00
|
|
|
Ok(None)
|
2022-09-07 00:10:14 +02:00
|
|
|
}
|
|
|
|
|
2022-09-26 22:26:30 +02:00
|
|
|
pub(crate) fn process_batch(&self, batch: Batch) -> Result<Vec<Task>> {
|
2022-09-09 12:16:19 +02:00
|
|
|
match batch {
|
2022-09-13 11:46:07 +02:00
|
|
|
Batch::Cancel(_) => todo!(),
|
|
|
|
Batch::Snapshot(_) => todo!(),
|
|
|
|
Batch::Dump(_) => todo!(),
|
2022-09-29 18:15:50 +02:00
|
|
|
Batch::IndexOperation(operation) => {
|
|
|
|
let index = match operation {
|
|
|
|
IndexOperation::DocumentDeletion { ref index_uid, .. }
|
|
|
|
| IndexOperation::DocumentClear { ref index_uid, .. } => {
|
|
|
|
// only get the index, don't create it
|
|
|
|
let rtxn = self.env.read_txn()?;
|
2022-10-03 15:29:37 +02:00
|
|
|
self.index_mapper.index(&rtxn, index_uid)?
|
2022-09-29 14:31:01 +02:00
|
|
|
}
|
2022-09-29 18:15:50 +02:00
|
|
|
IndexOperation::DocumentImport { ref index_uid, .. }
|
|
|
|
| IndexOperation::Settings { ref index_uid, .. }
|
|
|
|
| IndexOperation::DocumentClearAndSetting { ref index_uid, .. }
|
|
|
|
| IndexOperation::SettingsAndDocumentImport { ref index_uid, .. } => {
|
|
|
|
// create the index if it doesn't already exist
|
|
|
|
let mut wtxn = self.env.write_txn()?;
|
2022-10-03 15:29:37 +02:00
|
|
|
let index = self.index_mapper.create_index(&mut wtxn, index_uid)?;
|
2022-09-29 18:15:50 +02:00
|
|
|
wtxn.commit()?;
|
|
|
|
index
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut index_wtxn = index.write_txn()?;
|
|
|
|
let tasks = self.apply_index_operation(&mut index_wtxn, &index, operation)?;
|
|
|
|
index_wtxn.commit()?;
|
2022-09-29 14:31:01 +02:00
|
|
|
|
|
|
|
Ok(tasks)
|
|
|
|
}
|
2022-09-29 18:15:50 +02:00
|
|
|
Batch::IndexCreation {
|
2022-09-18 22:04:36 +02:00
|
|
|
index_uid,
|
|
|
|
primary_key,
|
2022-09-29 18:15:50 +02:00
|
|
|
task,
|
|
|
|
} => todo!(),
|
|
|
|
Batch::IndexUpdate {
|
|
|
|
index_uid,
|
|
|
|
primary_key,
|
|
|
|
task,
|
|
|
|
} => todo!(),
|
|
|
|
Batch::IndexDeletion { index_uid, tasks } => todo!(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn apply_index_operation<'txn, 'i>(
|
|
|
|
&self,
|
|
|
|
index_wtxn: &'txn mut RwTxn<'i, '_>,
|
|
|
|
index: &'i milli::Index,
|
|
|
|
operation: IndexOperation,
|
|
|
|
) -> Result<Vec<Task>> {
|
|
|
|
match operation {
|
|
|
|
IndexOperation::DocumentClear {
|
|
|
|
index_uid,
|
2022-09-18 22:04:36 +02:00
|
|
|
mut tasks,
|
|
|
|
} => {
|
2022-09-29 18:15:50 +02:00
|
|
|
let result = milli::update::ClearDocuments::new(index_wtxn, index).execute();
|
|
|
|
for task in &mut tasks {
|
|
|
|
match result {
|
|
|
|
Ok(deleted_documents) => {
|
|
|
|
task.details = Some(Details::ClearAll {
|
|
|
|
deleted_documents: Some(deleted_documents),
|
|
|
|
})
|
2022-09-18 22:04:36 +02:00
|
|
|
}
|
2022-09-29 18:15:50 +02:00
|
|
|
Err(ref error) => task.error = Some(MilliError(error).into()),
|
2022-09-18 22:04:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-09-21 12:01:46 +02:00
|
|
|
Ok(tasks)
|
2022-09-18 22:04:36 +02:00
|
|
|
}
|
2022-09-29 18:15:50 +02:00
|
|
|
IndexOperation::DocumentImport {
|
2022-09-13 11:46:07 +02:00
|
|
|
index_uid,
|
|
|
|
primary_key,
|
2022-09-29 15:49:54 +02:00
|
|
|
method,
|
2022-09-13 11:46:07 +02:00
|
|
|
content_files,
|
2022-09-29 18:15:50 +02:00
|
|
|
mut tasks,
|
2022-09-13 11:46:07 +02:00
|
|
|
} => {
|
2022-09-29 18:15:50 +02:00
|
|
|
let indexer_config = self.index_mapper.indexer_config();
|
|
|
|
if let Some(primary_key) = primary_key {
|
|
|
|
if index.primary_key(index_wtxn)?.is_none() {
|
|
|
|
let mut builder =
|
|
|
|
milli::update::Settings::new(index_wtxn, index, indexer_config);
|
|
|
|
builder.set_primary_key(primary_key);
|
|
|
|
builder.execute(|_| ())?;
|
2022-09-29 16:04:23 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-09-29 18:15:50 +02:00
|
|
|
let config = IndexDocumentsConfig {
|
|
|
|
update_method: method,
|
|
|
|
..Default::default()
|
|
|
|
};
|
2022-09-29 16:04:23 +02:00
|
|
|
|
2022-09-29 18:15:50 +02:00
|
|
|
let mut builder = milli::update::IndexDocuments::new(
|
|
|
|
index_wtxn,
|
|
|
|
index,
|
|
|
|
indexer_config,
|
|
|
|
config,
|
|
|
|
|indexing_step| debug!("update: {:?}", indexing_step),
|
2022-09-29 16:04:23 +02:00
|
|
|
)?;
|
|
|
|
|
2022-09-29 18:15:50 +02:00
|
|
|
let mut results = Vec::new();
|
|
|
|
for content_uuid in content_files.into_iter() {
|
|
|
|
let content_file = self.file_store.get_update(content_uuid)?;
|
|
|
|
let reader = DocumentsBatchReader::from_reader(content_file)
|
|
|
|
.map_err(IndexError::from)?;
|
|
|
|
let (new_builder, user_result) = builder.add_documents(reader)?;
|
|
|
|
builder = new_builder;
|
|
|
|
|
|
|
|
let user_result = match user_result {
|
|
|
|
Ok(count) => {
|
|
|
|
let addition = DocumentAdditionResult {
|
|
|
|
indexed_documents: count,
|
|
|
|
number_of_documents: count,
|
|
|
|
};
|
|
|
|
Ok(addition)
|
|
|
|
}
|
|
|
|
Err(e) => Err(IndexError::from(e)),
|
|
|
|
};
|
|
|
|
|
|
|
|
results.push(user_result);
|
|
|
|
}
|
|
|
|
|
|
|
|
if results.iter().any(|res| res.is_ok()) {
|
|
|
|
let addition = builder.execute()?;
|
|
|
|
info!("document addition done: {:?}", addition);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (task, ret) in tasks.iter_mut().zip(results) {
|
2022-09-29 16:04:23 +02:00
|
|
|
match ret {
|
|
|
|
Ok(DocumentAdditionResult {
|
|
|
|
indexed_documents,
|
|
|
|
number_of_documents,
|
|
|
|
}) => {
|
|
|
|
task.details = Some(Details::DocumentAddition {
|
|
|
|
received_documents: number_of_documents,
|
|
|
|
indexed_documents,
|
2022-09-29 18:15:50 +02:00
|
|
|
})
|
2022-09-29 16:04:23 +02:00
|
|
|
}
|
|
|
|
Err(error) => task.error = Some(error.into()),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(tasks)
|
2022-09-09 12:16:19 +02:00
|
|
|
}
|
2022-09-29 18:15:50 +02:00
|
|
|
IndexOperation::DocumentDeletion {
|
2022-09-16 16:31:16 +02:00
|
|
|
index_uid,
|
|
|
|
documents,
|
2022-09-29 12:04:58 +02:00
|
|
|
mut tasks,
|
2022-09-29 11:49:47 +02:00
|
|
|
} => {
|
2022-09-29 18:15:50 +02:00
|
|
|
let mut builder = milli::update::DeleteDocuments::new(index_wtxn, index)?;
|
|
|
|
documents.iter().for_each(|id| {
|
|
|
|
builder.delete_external_id(id);
|
|
|
|
});
|
|
|
|
let result = builder.execute();
|
|
|
|
|
|
|
|
for (task, documents) in tasks.iter_mut().zip(documents) {
|
|
|
|
match result {
|
2022-09-29 11:49:47 +02:00
|
|
|
Ok(DocumentDeletionResult {
|
|
|
|
deleted_documents,
|
|
|
|
remaining_documents: _,
|
|
|
|
}) => {
|
|
|
|
task.details = Some(Details::DocumentDeletion {
|
|
|
|
received_document_ids: documents.len(),
|
|
|
|
deleted_documents: Some(deleted_documents),
|
|
|
|
});
|
|
|
|
}
|
2022-09-29 18:15:50 +02:00
|
|
|
Err(ref error) => task.error = Some(MilliError(error).into()),
|
2022-09-29 11:49:47 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(tasks)
|
|
|
|
}
|
2022-09-29 18:15:50 +02:00
|
|
|
IndexOperation::Settings {
|
2022-09-16 16:31:16 +02:00
|
|
|
index_uid,
|
|
|
|
settings,
|
2022-09-29 13:57:28 +02:00
|
|
|
mut tasks,
|
|
|
|
} => {
|
2022-09-29 18:15:50 +02:00
|
|
|
let indexer_config = self.index_mapper.indexer_config();
|
|
|
|
// TODO merge the settings to only do *one* reindexation.
|
2022-09-29 13:57:28 +02:00
|
|
|
for (task, (_, settings)) in tasks.iter_mut().zip(settings) {
|
|
|
|
let checked_settings = settings.clone().check();
|
|
|
|
task.details = Some(Details::Settings { settings });
|
2022-09-29 18:15:50 +02:00
|
|
|
|
|
|
|
let mut builder =
|
|
|
|
milli::update::Settings::new(index_wtxn, index, indexer_config);
|
|
|
|
apply_settings_to_builder(&checked_settings, &mut builder);
|
|
|
|
let result = builder.execute(|indexing_step| {
|
|
|
|
debug!("update: {:?}", indexing_step);
|
|
|
|
});
|
|
|
|
|
|
|
|
if let Err(ref error) = result {
|
|
|
|
task.error = Some(MilliError(error).into());
|
2022-09-29 13:57:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(tasks)
|
|
|
|
}
|
2022-09-29 18:15:50 +02:00
|
|
|
IndexOperation::SettingsAndDocumentImport {
|
2022-09-16 16:31:16 +02:00
|
|
|
index_uid,
|
2022-09-29 18:15:50 +02:00
|
|
|
primary_key,
|
|
|
|
method,
|
|
|
|
content_files,
|
|
|
|
document_import_tasks,
|
2022-09-16 16:31:16 +02:00
|
|
|
settings,
|
2022-09-29 18:15:50 +02:00
|
|
|
settings_tasks,
|
2022-09-29 14:19:13 +02:00
|
|
|
} => {
|
2022-09-29 18:15:50 +02:00
|
|
|
let settings_tasks = self.apply_index_operation(
|
|
|
|
index_wtxn,
|
|
|
|
index,
|
|
|
|
IndexOperation::Settings {
|
|
|
|
index_uid: index_uid.clone(),
|
|
|
|
settings,
|
|
|
|
tasks: settings_tasks,
|
|
|
|
},
|
|
|
|
)?;
|
2022-09-29 14:19:13 +02:00
|
|
|
|
2022-09-29 18:15:50 +02:00
|
|
|
let mut import_tasks = self.apply_index_operation(
|
|
|
|
index_wtxn,
|
|
|
|
index,
|
|
|
|
IndexOperation::DocumentImport {
|
|
|
|
index_uid,
|
|
|
|
primary_key,
|
|
|
|
method,
|
|
|
|
content_files,
|
|
|
|
tasks: document_import_tasks,
|
|
|
|
},
|
|
|
|
)?;
|
2022-09-29 14:19:13 +02:00
|
|
|
|
2022-09-29 18:15:50 +02:00
|
|
|
let mut tasks = settings_tasks;
|
|
|
|
tasks.append(&mut import_tasks);
|
2022-09-29 14:19:13 +02:00
|
|
|
Ok(tasks)
|
|
|
|
}
|
2022-09-29 18:15:50 +02:00
|
|
|
IndexOperation::DocumentClearAndSetting {
|
2022-09-16 21:24:49 +02:00
|
|
|
index_uid,
|
2022-09-29 18:15:50 +02:00
|
|
|
cleared_tasks,
|
|
|
|
settings,
|
|
|
|
settings_tasks,
|
|
|
|
} => {
|
|
|
|
let mut import_tasks = self.apply_index_operation(
|
|
|
|
index_wtxn,
|
|
|
|
index,
|
|
|
|
IndexOperation::DocumentClear {
|
|
|
|
index_uid: index_uid.clone(),
|
|
|
|
tasks: cleared_tasks,
|
|
|
|
},
|
|
|
|
)?;
|
|
|
|
|
|
|
|
let settings_tasks = self.apply_index_operation(
|
|
|
|
index_wtxn,
|
|
|
|
index,
|
|
|
|
IndexOperation::Settings {
|
|
|
|
index_uid,
|
|
|
|
settings,
|
|
|
|
tasks: settings_tasks,
|
|
|
|
},
|
|
|
|
)?;
|
|
|
|
|
|
|
|
let mut tasks = settings_tasks;
|
|
|
|
tasks.append(&mut import_tasks);
|
|
|
|
Ok(tasks)
|
|
|
|
}
|
2022-09-07 00:10:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|