Merge branch 'main' into stable

meilisearch-lib/Cargo.toml

@@ -9,7 +9,7 @@ anyhow = { version = "1.0.56", features = ["backtrace"] }
 async-stream = "0.3.3"
 async-trait = "0.1.52"
 atomic_refcell = "0.1.8"
-byte-unit = { version = "4.0.14", default-features = false, features = ["std"] }
+byte-unit = { version = "4.0.14", default-features = false, features = ["std", "serde"] }
 bytes = "1.1.0"
 clap = { version = "3.1.6", features = ["derive", "env"] }
 crossbeam-channel = "0.5.2"

meilisearch-lib/src/tasks/batch.rs

@@ -38,7 +38,7 @@ impl BatchContent {
 
 #[derive(Debug)]
 pub struct Batch {
-    // Only batches that contains a persistant tasks are given an id. Snapshot batches don't have
+    // Only batches that contains a persistent tasks are given an id. Snapshot batches don't have
     // an id.
     pub id: Option<BatchId>,
     pub created_at: OffsetDateTime,

meilisearch-lib/src/tasks/mod.rs

@@ -33,7 +33,7 @@ pub trait BatchHandler: Sync + Send + 'static {
     /// `accept` beforehand.
     async fn process_batch(&self, batch: Batch) -> Batch;
 
-    /// `finish` is called when the result of `process` has been commited to the task store. This
+    /// `finish` is called when the result of `process` has been committed to the task store. This
     /// method can be used to perform cleanup after the update has been completed for example.
     async fn finish(&self, batch: &Batch);
 }

meilisearch-lib/src/tasks/scheduler.rs

@@ -189,7 +189,7 @@ impl TaskQueue {
             Entry::Occupied(entry) => {
                 // A task list already exists for this index, all we have to to is to push the new
                 // update to the end of the list. This won't change the order since ids are
-                // monotically increasing.
+                // monotonically increasing.
                 let mut list = entry.get().borrow_mut();
 
                 // We only need the first element to be lower than the one we want to

meilisearch-lib/src/tasks/task.rs

@@ -78,7 +78,7 @@ impl TaskEvent {
 
 /// A task represents an operation that Meilisearch must do.
 /// It's stored on disk and executed from the lowest to highest Task id.
-/// Everytime a new task is created it has a higher Task id than the previous one.
+/// Every time a new task is created it has a higher Task id than the previous one.
 /// See also `Job`.
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 #[cfg_attr(test, derive(proptest_derive::Arbitrary))]

meilisearch-lib/src/tasks/task_store/mod.rs

@@ -122,7 +122,7 @@ impl TaskStore {
     }
 
     /// This methods takes a `Processing` which contains the next task ids to process, and returns
-    /// the coresponding tasks along with the ownership to the passed processing.
+    /// the corresponding tasks along with the ownership to the passed processing.
     ///
     /// We need get_processing_tasks to take ownership over `Processing` because we need it to be
     /// valid for 'static.

meilisearch-lib/src/tasks/update_loop.rs

@@ -49,7 +49,7 @@ impl UpdateLoop {
             };
 
             if let Err(e) = self.process_next_batch().await {
-                log::error!("an error occured while processing an update batch: {}", e);
+                log::error!("an error occurred while processing an update batch: {}", e);
             }
         }
     }