searchengines-web/MeiliSearch
searchengines-web
/
MeiliSearch
mirror of https://github.com/meilisearch/MeiliSearch
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor process_document_addition_batch

This commit is contained in:
ad hoc 2022-06-02 15:11:50 +02:00
parent 64e3096790
commit 8fc3b7d3b0
No known key found for this signature in database
GPG Key ID: 4F00A782990CC643
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meilisearch-lib/src/index_resolver/mod.rs
View File

@ -170,7 +170,7 @@ mod real {
} }
} }
pub async fn process_document_addition_batch(&self, mut tasks: Vec<Task>) -> Vec<Task> { pub async fn process_document_addition_batch(&self, tasks: &mut [Task]) {
fn get_content_uuid(task: &Task) -> Uuid { fn get_content_uuid(task: &Task) -> Uuid {
match task { match task {
Task { Task {
@ -218,7 +218,8 @@ mod real {
timestamp: now, timestamp: now,
}); });
} }
return tasks;
return;
} }
}; };
@ -253,8 +254,6 @@ mod real {
for task in tasks.iter_mut() { for task in tasks.iter_mut() {
task.events.push(event.clone()); task.events.push(event.clone());
} }
tasks
} }
_ => panic!("invalid batch!"), _ => panic!("invalid batch!"),
} }
@ -355,7 +354,7 @@ mod real {
} }
pub async fn process_task(&self, task: &mut Task) { pub async fn process_task(&self, task: &mut Task) {
match self.process_task_inner(&task).await { match self.process_task_inner(task).await {
Ok(res) => task.events.push(TaskEvent::succeeded(res)), Ok(res) => task.events.push(TaskEvent::succeeded(res)),
Err(e) => task.events.push(TaskEvent::failed(e)), Err(e) => task.events.push(TaskEvent::failed(e)),
} }
@ -509,7 +508,7 @@ mod test {
Self::Mock(mocker) Self::Mock(mocker)
} }
pub async fn process_document_addition_batch(&self, tasks: Vec<Task>) -> Vec<Task> { pub async fn process_document_addition_batch(&self, tasks: &mut [Task]) {
match self { match self {
IndexResolver::Real(r) => r.process_document_addition_batch(tasks).await, IndexResolver::Real(r) => r.process_document_addition_batch(tasks).await,
IndexResolver::Mock(m) => unsafe { IndexResolver::Mock(m) => unsafe {

6
meilisearch-lib/src/tasks/handlers/index_resolver_handler.rs
View File

@ -19,9 +19,7 @@ where
async fn process_batch(&self, mut batch: Batch) -> Batch { async fn process_batch(&self, mut batch: Batch) -> Batch {
match batch.content { match batch.content {
BatchContent::DocumentsAdditionBatch(ref mut tasks) => { BatchContent::DocumentsAdditionBatch(ref mut tasks) => {
*tasks = self self.process_document_addition_batch(tasks).await;
.process_document_addition_batch(std::mem::take(tasks))
.await;
} }
BatchContent::IndexUpdate(ref mut task) => { BatchContent::IndexUpdate(ref mut task) => {
self.process_task(task).await; self.process_task(task).await;
@ -174,7 +172,7 @@ mod test {
let mocker = Mocker::default(); let mocker = Mocker::default();
match task.content { match task.content {
TaskContent::DocumentAddition { .. } => { TaskContent::DocumentAddition { .. } => {
mocker.when::<Vec<Task>, Vec<Task>>("process_document_addition_batch").then(|tasks| tasks); mocker.when::<&mut [Task], ()>("process_document_addition_batch").then(|_| ());
} }
TaskContent::Dump { .. } => (), TaskContent::Dump { .. } => (),
_ => { _ => {