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

Merge #2404

Browse Source 
2404: Bring `release-v0.27.1` into `main` r=curquiza a=curquiza

Following the v0.27.1 hotfixes

Co-authored-by: ad hoc <postma.marin@protonmail.com>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: Tamo <tamo@meilisearch.com>
Co-authored-by: Clémentine Urquizar <clementine@meilisearch.com>
This commit is contained in:
bors[bot]
2022-05-17 16:11:17 +00:00
committed by GitHub
parent b9866d8df2 a23998f2e3
commit 6d221058f1
8 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meilisearch-lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "meilisearch-lib"
version = "0.27.0"
version = "0.27.1"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -30,7 +30,7 @@ lazy_static = "1.4.0"
log = "0.4.14"
meilisearch-auth = { path = "../meilisearch-auth" }
meilisearch-error = { path = "../meilisearch-error" }
milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.26.4" }
milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.26.5" }
mime = "0.3.16"
num_cpus = "1.13.1"
obkv = "0.2.0"

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

@ -135,7 +135,7 @@ impl Index {
.map(|fields| fields.into_iter().map(String::from).collect());
let searchable_attributes = self
.searchable_fields(txn)?
.user_defined_searchable_fields(txn)?
.map(|fields| fields.into_iter().map(String::from).collect());
let filterable_attributes = self.filterable_fields(txn)?.into_iter().collect();

5
meilisearch-lib/src/index_controller/mod.rs
View File

@ -196,10 +196,7 @@ impl IndexControllerBuilder {
task_store_size,
&indexer_options,
)?;
}
let db_exists = db_path.as_ref().exists();
if db_exists {
} else if db_path.as_ref().exists() {
// Directory could be pre-created without any database in.
let db_is_empty = db_path.as_ref().read_dir()?.next().is_none();
if !db_is_empty {