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

Merge #2246

Browse Source 
2246: Release v0.26.1: bring "fix panic at start" commit (#2243) into stable r=MarinPostma a=curquiza

2 commits
- cherry pick `32843f30d973349122ec5a37469ee09e6002b6f3` (merged in #2243)
- change the version in the Cargo toml files (from v0.26.0 to v0.26.1)

Co-authored-by: ad hoc <postma.marin@protonmail.com>
Co-authored-by: Clémentine Urquizar <clementine@meilisearch.com>
This commit is contained in:
bors[bot] 2022-03-16 18:32:47 +00:00 committed by GitHub
commit 3273fe0470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -1713,7 +1713,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
[[package]] [[package]]
name = "meilisearch-auth" name = "meilisearch-auth"
version = "0.26.0" version = "0.26.1"
dependencies = [ dependencies = [
"enum-iterator", "enum-iterator",
"heed", "heed",
@ -1728,7 +1728,7 @@ dependencies = [
[[package]] [[package]]
name = "meilisearch-error" name = "meilisearch-error"
version = "0.26.0" version = "0.26.1"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"proptest", "proptest",
@ -1739,7 +1739,7 @@ dependencies = [
[[package]] [[package]]
name = "meilisearch-http" name = "meilisearch-http"
version = "0.26.0" version = "0.26.1"
dependencies = [ dependencies = [
"actix-cors", "actix-cors",
"actix-rt", "actix-rt",
@ -1814,7 +1814,7 @@ dependencies = [
[[package]] [[package]]
name = "meilisearch-lib" name = "meilisearch-lib"
version = "0.26.0" version = "0.26.1"
dependencies = [ dependencies = [
"actix-rt", "actix-rt",
"actix-web", "actix-web",

2
meilisearch-auth/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "meilisearch-auth" name = "meilisearch-auth"
version = "0.26.0" version = "0.26.1"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

2
meilisearch-error/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "meilisearch-error" name = "meilisearch-error"
version = "0.26.0" version = "0.26.1"
authors = ["marin <postma.marin@protonmail.com>"] authors = ["marin <postma.marin@protonmail.com>"]
edition = "2021" edition = "2021"

2
meilisearch-http/Cargo.toml
View File

@ -4,7 +4,7 @@ description = "Meilisearch HTTP server"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
name = "meilisearch-http" name = "meilisearch-http"
version = "0.26.0" version = "0.26.1"
[[bin]] [[bin]]
name = "meilisearch" name = "meilisearch"

2
meilisearch-lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "meilisearch-lib" name = "meilisearch-lib"
version = "0.26.0" version = "0.26.1"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

6
meilisearch-lib/src/options.rs
View File

@ -52,20 +52,20 @@ pub struct SchedulerConfig {
// The maximum number of updates of the same type that can be batched together. // The maximum number of updates of the same type that can be batched together.
// If unspecified, this is unlimited. A value of 0 is interpreted as 1. // If unspecified, this is unlimited. A value of 0 is interpreted as 1.
#[clap(long, requires = "enable-autobatching", hide = true)] #[clap(long, requires = "enable-auto-batching", hide = true)]
pub max_batch_size: Option<usize>, pub max_batch_size: Option<usize>,
// The maximum number of documents in a document batch. Since batches must contain at least one // The maximum number of documents in a document batch. Since batches must contain at least one
// update for the scheduler to make progress, the number of documents in a batch will be at // update for the scheduler to make progress, the number of documents in a batch will be at
// least the number of documents of its first update. // least the number of documents of its first update.
#[clap(long, requires = "enable-autobatching", hide = true)] #[clap(long, requires = "enable-auto-batching", hide = true)]
pub max_documents_per_batch: Option<usize>, pub max_documents_per_batch: Option<usize>,
/// Debounce duration in seconds /// Debounce duration in seconds
/// ///
/// When a new task is enqueued, the scheduler waits for `debounce_duration_sec` seconds for new updates before /// When a new task is enqueued, the scheduler waits for `debounce_duration_sec` seconds for new updates before
/// starting to process a batch of updates. /// starting to process a batch of updates.
#[clap(long, requires = "enable-autobatching", hide = true)] #[clap(long, requires = "enable-auto-batching", hide = true)]
pub debounce_duration_sec: Option<u64>, pub debounce_duration_sec: Option<u64>,
} }