snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-29 08:35:15 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

remove typo in BatchContent variant

Browse Source
This commit is contained in:
ad hoc 2022-05-25 14:39:07 +02:00
parent 3015265bde
commit 6b2016b350
No known key found for this signature in database
GPG Key ID: 4F00A782990CC643
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meilisearch-lib/src/tasks/batch.rs
View File

@ -8,7 +8,7 @@ pub type BatchId = u64;
#[derive(Debug)] #[derive(Debug)]
pub enum BatchContent { pub enum BatchContent {
DocumentAddtitionBatch(Vec<Task>), DocumentsAdditionBatch(Vec<Task>),
IndexUpdate(Task), IndexUpdate(Task),
Dump(Task), Dump(Task),
Snapshot(SnapshotJob), Snapshot(SnapshotJob),
@ -19,7 +19,7 @@ pub enum BatchContent {
impl BatchContent { impl BatchContent {
pub fn first(&self) -> Option<&Task> { pub fn first(&self) -> Option<&Task> {
match self { match self {
BatchContent::DocumentAddtitionBatch(ts) => ts.first(), BatchContent::DocumentsAdditionBatch(ts) => ts.first(),
BatchContent::Dump(t) | BatchContent::IndexUpdate(t) => Some(t), BatchContent::Dump(t) | BatchContent::IndexUpdate(t) => Some(t),
BatchContent::Snapshot(_) | BatchContent::Empty => None, BatchContent::Snapshot(_) | BatchContent::Empty => None,
} }
@ -27,7 +27,7 @@ impl BatchContent {
pub fn push_event(&mut self, event: TaskEvent) { pub fn push_event(&mut self, event: TaskEvent) {
match self { match self {
BatchContent::DocumentAddtitionBatch(ts) => { BatchContent::DocumentsAdditionBatch(ts) => {
ts.iter_mut().for_each(|t| t.events.push(event.clone())) ts.iter_mut().for_each(|t| t.events.push(event.clone()))
} }
BatchContent::IndexUpdate(t) | BatchContent::Dump(t) => t.events.push(event), BatchContent::IndexUpdate(t) | BatchContent::Dump(t) => t.events.push(event),
@ -55,7 +55,7 @@ impl Batch {
} }
pub fn len(&self) -> usize { pub fn len(&self) -> usize {
match self.content { match self.content {
BatchContent::DocumentAddtitionBatch(ref ts) => ts.len(), BatchContent::DocumentsAdditionBatch(ref ts) => ts.len(),
BatchContent::IndexUpdate(_) | BatchContent::Dump(_) | BatchContent::Snapshot(_) => 1, BatchContent::IndexUpdate(_) | BatchContent::Dump(_) | BatchContent::Snapshot(_) => 1,
BatchContent::Empty => 0, BatchContent::Empty => 0,
} }

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

@ -14,14 +14,14 @@ where
{ {
fn accept(&self, batch: &Batch) -> bool { fn accept(&self, batch: &Batch) -> bool {
match batch.content { match batch.content {
BatchContent::DocumentAddtitionBatch(_) | BatchContent::IndexUpdate(_) => true, BatchContent::DocumentsAdditionBatch(_) | BatchContent::IndexUpdate(_) => true,
_ => false, _ => false,
} }
} }
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::DocumentAddtitionBatch(ref mut tasks) => { BatchContent::DocumentsAdditionBatch(ref mut tasks) => {
*tasks = self *tasks = self
.process_document_addition_batch(std::mem::take(tasks)) .process_document_addition_batch(std::mem::take(tasks))
.await; .await;
@ -45,7 +45,7 @@ where
} }
async fn finish(&self, batch: &Batch) { async fn finish(&self, batch: &Batch) {
if let BatchContent::DocumentAddtitionBatch(ref tasks) = batch.content { if let BatchContent::DocumentsAdditionBatch(ref tasks) = batch.content {
for task in tasks { for task in tasks {
if let Some(content_uuid) = task.get_content_uuid() { if let Some(content_uuid) = task.get_content_uuid() {
if let Err(e) = self.file_store.delete(content_uuid).await { if let Err(e) = self.file_store.delete(content_uuid).await {
@ -86,7 +86,7 @@ mod test {
let index_resolver = IndexResolver::new(meta_store, index_store, update_file_store); let index_resolver = IndexResolver::new(meta_store, index_store, update_file_store);
match batch.content { match batch.content {
BatchContent::DocumentAddtitionBatch(_) BatchContent::DocumentsAdditionBatch(_)
| BatchContent::IndexUpdate(_) => assert!(index_resolver.accept(&batch)), | BatchContent::IndexUpdate(_) => assert!(index_resolver.accept(&batch)),
BatchContent::Dump(_) BatchContent::Dump(_)
| BatchContent::Snapshot(_) | BatchContent::Snapshot(_)

2
meilisearch-lib/src/tasks/handlers/mod.rs
View File

@ -15,7 +15,7 @@ mod test {
pub fn task_to_batch(task: Task) -> Batch { pub fn task_to_batch(task: Task) -> Batch {
let content = match task.content { let content = match task.content {
TaskContent::DocumentAddition { .. } => { TaskContent::DocumentAddition { .. } => {
BatchContent::DocumentAddtitionBatch(vec![task]) BatchContent::DocumentsAdditionBatch(vec![task])
} }
TaskContent::DocumentDeletion(_) TaskContent::DocumentDeletion(_)
| TaskContent::SettingsUpdate { .. } | TaskContent::SettingsUpdate { .. }

4
meilisearch-lib/src/tasks/scheduler.rs
View File

@ -296,9 +296,9 @@ impl Scheduler {
pub async fn update_tasks(&self, content: BatchContent) -> Result<BatchContent> { pub async fn update_tasks(&self, content: BatchContent) -> Result<BatchContent> {
match content { match content {
BatchContent::DocumentAddtitionBatch(tasks) => { BatchContent::DocumentsAdditionBatch(tasks) => {
let tasks = self.store.update_tasks(tasks).await?; let tasks = self.store.update_tasks(tasks).await?;
Ok(BatchContent::DocumentAddtitionBatch(tasks)) Ok(BatchContent::DocumentsAdditionBatch(tasks))
} }
BatchContent::IndexUpdate(t) => { BatchContent::IndexUpdate(t) => {
let mut tasks = self.store.update_tasks(vec![t]).await?; let mut tasks = self.store.update_tasks(vec![t]).await?;

2
meilisearch-lib/src/tasks/task_store/mod.rs
View File

@ -147,7 +147,7 @@ impl TaskStore {
.ok_or(TaskError::UnexistingTask(*id))?; .ok_or(TaskError::UnexistingTask(*id))?;
tasks.push(task); tasks.push(task);
} }
BatchContent::DocumentAddtitionBatch(tasks) BatchContent::DocumentsAdditionBatch(tasks)
} }
Processing::IndexUpdate(id) => { Processing::IndexUpdate(id) => {
let task = store.get(&txn, id)?.ok_or(TaskError::UnexistingTask(id))?; let task = store.get(&txn, id)?.ok_or(TaskError::UnexistingTask(id))?;