mirror of
https://github.com/meilisearch/meilisearch.git
synced 2024-11-26 20:15:07 +08:00
Merge #2034
2034: Fix typo r=curquiza a=curquiza Fix `Meilisearch` typo into `MeiliSearch` Co-authored-by: Clémentine Urquizar <clementine@meilisearch.com>
This commit is contained in:
commit
2f3faadcbf
@ -77,7 +77,7 @@ impl SegmentAnalytics {
|
|||||||
let user = User::UserId { user_id };
|
let user = User::UserId { user_id };
|
||||||
let mut batcher = AutoBatcher::new(client, Batcher::new(None), SEGMENT_API_KEY.to_string());
|
let mut batcher = AutoBatcher::new(client, Batcher::new(None), SEGMENT_API_KEY.to_string());
|
||||||
|
|
||||||
// If Meilisearch is Launched for the first time:
|
// If MeiliSearch is Launched for the first time:
|
||||||
// 1. Send an event Launched associated to the user `total_launch`.
|
// 1. Send an event Launched associated to the user `total_launch`.
|
||||||
// 2. Batch an event Launched with the real instance-id and send it in one hour.
|
// 2. Batch an event Launched with the real instance-id and send it in one hour.
|
||||||
if first_time_run {
|
if first_time_run {
|
||||||
|
@ -117,7 +117,7 @@ impl IndexUpdateResponse {
|
|||||||
/// Always return a 200 with:
|
/// Always return a 200 with:
|
||||||
/// ```json
|
/// ```json
|
||||||
/// {
|
/// {
|
||||||
/// "status": "Meilisearch is running"
|
/// "status": "MeiliSearch is running"
|
||||||
/// }
|
/// }
|
||||||
/// ```
|
/// ```
|
||||||
pub async fn running() -> HttpResponse {
|
pub async fn running() -> HttpResponse {
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
#[derive(thiserror::Error, Debug)]
|
#[derive(thiserror::Error, Debug)]
|
||||||
pub enum VersionFileError {
|
pub enum VersionFileError {
|
||||||
#[error("Version file is missing or the previous MeiliSearch engine version was below 0.24.0. Use a dump to update Meilisearch.")]
|
#[error("Version file is missing or the previous MeiliSearch engine version was below 0.24.0. Use a dump to update MeiliSearch.")]
|
||||||
MissingVersionFile,
|
MissingVersionFile,
|
||||||
#[error("Version file is corrupted and thus MeiliSearch is unable to determine the version of the database.")]
|
#[error("Version file is corrupted and thus MeiliSearch is unable to determine the version of the database.")]
|
||||||
MalformedVersionFile,
|
MalformedVersionFile,
|
||||||
#[error(
|
#[error(
|
||||||
"Expected MeiliSearch engine version: {major}.{minor}.{patch}, current engine version: {}. To update Meilisearch use a dump.",
|
"Expected MeiliSearch engine version: {major}.{minor}.{patch}, current engine version: {}. To update MeiliSearch use a dump.",
|
||||||
env!("CARGO_PKG_VERSION").to_string()
|
env!("CARGO_PKG_VERSION").to_string()
|
||||||
)]
|
)]
|
||||||
VersionMismatch {
|
VersionMismatch {
|
||||||
|
@ -23,7 +23,7 @@ pub fn create_version_file(db_path: &Path) -> anyhow::Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ensures Meilisearch version is compatible with the database, returns an error versions mismatch.
|
// Ensures MeiliSearch version is compatible with the database, returns an error versions mismatch.
|
||||||
pub fn check_version_file(db_path: &Path) -> anyhow::Result<()> {
|
pub fn check_version_file(db_path: &Path) -> anyhow::Result<()> {
|
||||||
let version_path = db_path.join(VERSION_FILE_NAME);
|
let version_path = db_path.join(VERSION_FILE_NAME);
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ pub enum TaskEvent {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A task represents an operation that Meilisearch must do.
|
/// A task represents an operation that MeiliSearch must do.
|
||||||
/// It's stored on disk and executed from the lowest to highest Task id.
|
/// 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.
|
/// Everytime a new task is created it has a higher Task id than the previous one.
|
||||||
/// See also `Job`.
|
/// See also `Job`.
|
||||||
@ -91,7 +91,7 @@ impl Task {
|
|||||||
|
|
||||||
/// A job is like a volatile priority `Task`.
|
/// A job is like a volatile priority `Task`.
|
||||||
/// It should be processed as fast as possible and is not stored on disk.
|
/// It should be processed as fast as possible and is not stored on disk.
|
||||||
/// This means, when Meilisearch is closed all your unprocessed jobs will disappear.
|
/// This means, when MeiliSearch is closed all your unprocessed jobs will disappear.
|
||||||
#[derive(Debug, derivative::Derivative)]
|
#[derive(Debug, derivative::Derivative)]
|
||||||
#[derivative(PartialEq)]
|
#[derivative(PartialEq)]
|
||||||
pub enum Job {
|
pub enum Job {
|
||||||
|
@ -78,7 +78,7 @@ impl Store {
|
|||||||
/// This function should be called *right after* creating the store.
|
/// This function should be called *right after* creating the store.
|
||||||
/// It put back all unfinished update in the `Created` state. This
|
/// It put back all unfinished update in the `Created` state. This
|
||||||
/// allow us to re-enqueue an update that didn't had the time to finish
|
/// allow us to re-enqueue an update that didn't had the time to finish
|
||||||
/// when Meilisearch closed.
|
/// when MeiliSearch closed.
|
||||||
pub fn reset_and_return_unfinished_tasks(&mut self) -> Result<BinaryHeap<Pending<TaskId>>> {
|
pub fn reset_and_return_unfinished_tasks(&mut self) -> Result<BinaryHeap<Pending<TaskId>>> {
|
||||||
let mut unfinished_tasks: BinaryHeap<Pending<TaskId>> = BinaryHeap::new();
|
let mut unfinished_tasks: BinaryHeap<Pending<TaskId>> = BinaryHeap::new();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user