snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-31 16:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename the Snapshot task into SnapshotCreation

Browse Source
This commit is contained in:
Kerollmops
2022-10-25 10:44:58 +02:00
committed by Clément Renault
parent 4d43a9f5b1
commit e0548e42e7
6 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dump/src/lib.rs
View File

@@ -129,7 +129,7 @@ pub enum KindDump {
keys: Vec<Key>,
instance_uid: Option<InstanceUid>,
},
Snapshot,
SnapshotCreation,
}
impl From<Task> for TaskDump {
@@ -191,7 +191,7 @@ impl From<KindWithContent> for KindDump {
KindWithContent::DumpCreation { dump_uid, keys, instance_uid } => {
KindDump::DumpCreation { dump_uid, keys, instance_uid }
}
KindWithContent::Snapshot => KindDump::Snapshot,
KindWithContent::SnapshotCreation => KindDump::SnapshotCreation,
}
}
}

2
index-scheduler/src/autobatcher.rs
View File

@@ -60,7 +60,7 @@ impl From<KindWithContent> for AutobatchKind {
KindWithContent::TaskCancelation { .. }
| KindWithContent::TaskDeletion { .. }
| KindWithContent::DumpCreation { .. }
| KindWithContent::Snapshot => {
| KindWithContent::SnapshotCreation => {
panic!("The autobatcher should never be called with tasks that don't apply to an index.")
}
}

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

@@ -50,7 +50,7 @@ use crate::{Error, IndexScheduler, Query, Result, TaskId};
pub(crate) enum Batch {
TaskCancelation(Task),
TaskDeletion(Task),
Snapshot(Vec<Task>),
SnapshotCreation(Vec<Task>),
Dump(Task),
IndexOperation { op: IndexOperation, must_create_index: bool },
IndexCreation { index_uid: String, primary_key: Option<String>, task: Task },
@@ -118,7 +118,7 @@ impl Batch {
| Batch::Dump(task)
| Batch::IndexCreation { task, .. }
| Batch::IndexUpdate { task, .. } => vec![task.uid],
Batch::Snapshot(tasks) | Batch::IndexDeletion { tasks, .. } => {
Batch::SnapshotCreation(tasks) | Batch::IndexDeletion { tasks, .. } => {
tasks.iter().map(|task| task.uid).collect()
}
Batch::IndexOperation { op, .. } => match op {
@@ -406,9 +406,9 @@ impl IndexScheduler {
}
// 3. we batch the snapshot.
let to_snapshot = self.get_kind(rtxn, Kind::Snapshot)? & enqueued;
let to_snapshot = self.get_kind(rtxn, Kind::SnapshotCreation)? & enqueued;
if !to_snapshot.is_empty() {
return Ok(Some(Batch::Snapshot(self.get_existing_tasks(rtxn, to_snapshot)?)));
return Ok(Some(Batch::SnapshotCreation(self.get_existing_tasks(rtxn, to_snapshot)?)));
}
// 4. we batch the dumps.
@@ -552,7 +552,7 @@ impl IndexScheduler {
wtxn.commit()?;
Ok(vec![task])
}
Batch::Snapshot(_) => todo!(),
Batch::SnapshotCreation(_) => todo!(),
Batch::Dump(mut task) => {
let started_at = OffsetDateTime::now_utc();
let (keys, instance_uid, dump_uid) =

2
index-scheduler/src/lib.rs
View File

@@ -708,7 +708,7 @@ impl IndexScheduler {
KindDump::DumpCreation { dump_uid, keys, instance_uid } => {
KindWithContent::DumpCreation { dump_uid, keys, instance_uid }
}
KindDump::Snapshot => KindWithContent::Snapshot,
KindDump::SnapshotCreation => KindWithContent::SnapshotCreation,
},
};

2
index-scheduler/src/utils.rs
View File

@@ -256,7 +256,7 @@ pub fn swap_index_uid_in_task(task: &mut Task, swap: (&str, &str)) {
K::TaskCancelation { .. }
| K::TaskDeletion { .. }
| K::DumpCreation { .. }
| K::Snapshot => {}
| K::SnapshotCreation => (),
};
if let Some(Details::IndexSwap { swaps }) = &mut task.details {
for (lhs, rhs) in swaps.iter_mut() {

23
meilisearch-types/src/tasks.rs
View File

@@ -42,7 +42,7 @@ impl Task {
match &self.kind {
DumpCreation { .. }
| Snapshot
| SnapshotCreation
| TaskCancelation { .. }
| TaskDeletion { .. }
| IndexSwap { .. } => None,
@@ -77,7 +77,7 @@ impl Task {
| KindWithContent::TaskCancelation { .. }
| KindWithContent::TaskDeletion { .. }
| KindWithContent::DumpCreation { .. }
| KindWithContent::Snapshot => None,
| KindWithContent::SnapshotCreation => None,
}
}
}
@@ -133,7 +133,7 @@ pub enum KindWithContent {
keys: Vec<Key>,
instance_uid: Option<InstanceUid>,
},
Snapshot,
SnapshotCreation,
}
impl KindWithContent {
@@ -150,7 +150,7 @@ impl KindWithContent {
KindWithContent::TaskCancelation { .. } => Kind::TaskCancelation,
KindWithContent::TaskDeletion { .. } => Kind::TaskDeletion,
KindWithContent::DumpCreation { .. } => Kind::DumpCreation,
KindWithContent::Snapshot => Kind::Snapshot,
KindWithContent::SnapshotCreation => Kind::SnapshotCreation,
}
}
@@ -158,7 +158,10 @@ impl KindWithContent {
use KindWithContent::*;
match self {
DumpCreation { .. } | Snapshot | TaskCancelation { .. } | TaskDeletion { .. } => vec![],
DumpCreation { .. }
| SnapshotCreation
| TaskCancelation { .. }
| TaskDeletion { .. } => vec![],
DocumentAdditionOrUpdate { index_uid, .. }
| DocumentDeletion { index_uid, .. }
| DocumentClear { index_uid }
@@ -218,7 +221,7 @@ impl KindWithContent {
original_query: query.clone(),
}),
KindWithContent::DumpCreation { .. } => None,
KindWithContent::Snapshot => None,
KindWithContent::SnapshotCreation => None,
}
}
@@ -261,7 +264,7 @@ impl KindWithContent {
original_query: query.clone(),
}),
KindWithContent::DumpCreation { .. } => None,
KindWithContent::Snapshot => None,
KindWithContent::SnapshotCreation => None,
}
}
}
@@ -301,7 +304,7 @@ impl From<&KindWithContent> for Option<Details> {
KindWithContent::DumpCreation { dump_uid, .. } => {
Some(Details::Dump { dump_uid: dump_uid.clone() })
}
KindWithContent::Snapshot => None,
KindWithContent::SnapshotCreation => None,
}
}
}
@@ -371,7 +374,7 @@ pub enum Kind {
TaskCancelation,
TaskDeletion,
DumpCreation,
Snapshot,
SnapshotCreation,
}
impl FromStr for Kind {
@@ -396,6 +399,8 @@ impl FromStr for Kind {
Ok(Kind::TaskDeletion)
} else if kind.eq_ignore_ascii_case("dumpCreation") {
Ok(Kind::DumpCreation)
} else if kind.eq_ignore_ascii_case("snapshotCreation") {
Ok(Kind::SnapshotCreation)
} else {
Err(ResponseError::from_msg(
format!(