snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-22 18:17:39 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

chore: bump milli

Browse Source
This commit is contained in:
Tamo 2022-01-17 19:16:20 +01:00
parent 0515c6e844
commit 3fab5869fa
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
4 changed files with 24 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -942,7 +942,7 @@ dependencies = [
[[package]] [[package]]
name = "filter-parser" name = "filter-parser"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/meilisearch/milli.git?tag=v0.21.0#c83b77304a3062bdbb5b2a3503a710711caebdea" source = "git+https://github.com/meilisearch/milli.git?tag=v0.21.1#7f50ca9a20090fc4fe2abae0394c1e6fdd351ebd"
dependencies = [ dependencies = [
"nom", "nom",
"nom_locate", "nom_locate",
@ -1825,8 +1825,8 @@ dependencies = [
[[package]] [[package]]
name = "milli" name = "milli"
version = "0.21.0" version = "0.21.1"
source = "git+https://github.com/meilisearch/milli.git?tag=v0.21.0#c83b77304a3062bdbb5b2a3503a710711caebdea" source = "git+https://github.com/meilisearch/milli.git?tag=v0.21.1#7f50ca9a20090fc4fe2abae0394c1e6fdd351ebd"
dependencies = [ dependencies = [
"bimap", "bimap",
"bincode", "bincode",

74
meilisearch-http/tests/common/index.rs
View File

@ -35,15 +35,12 @@ pub struct Index<'a> {
#[allow(dead_code)] #[allow(dead_code)]
impl Index<'_> { impl Index<'_> {
pub async fn get(&self) -> (Value, StatusCode) { pub async fn get(&self) -> (Value, StatusCode) {
let url = format!("/indexes/{}", encode(self.uid.as_ref()).to_string()); let url = format!("/indexes/{}", encode(self.uid.as_ref()));
self.service.get(url).await self.service.get(url).await
} }
pub async fn load_test_set(&self) -> u64 { pub async fn load_test_set(&self) -> u64 {
let url = format!( let url = format!("/indexes/{}/documents", encode(self.uid.as_ref()));
"/indexes/{}/documents",
encode(self.uid.as_ref()).to_string()
);
let (response, code) = self let (response, code) = self
.service .service
.post_str(url, include_str!("../assets/test_set.json")) .post_str(url, include_str!("../assets/test_set.json"))
@ -66,13 +63,13 @@ impl Index<'_> {
let body = json!({ let body = json!({
"primaryKey": primary_key, "primaryKey": primary_key,
}); });
let url = format!("/indexes/{}", encode(self.uid.as_ref()).to_string()); let url = format!("/indexes/{}", encode(self.uid.as_ref()));
self.service.put(url, body).await self.service.put(url, body).await
} }
pub async fn delete(&self) -> (Value, StatusCode) { pub async fn delete(&self) -> (Value, StatusCode) {
let url = format!("/indexes/{}", encode(self.uid.as_ref()).to_string()); let url = format!("/indexes/{}", encode(self.uid.as_ref()));
self.service.delete(url).await self.service.delete(url).await
} }
@ -84,13 +81,10 @@ impl Index<'_> {
let url = match primary_key { let url = match primary_key {
Some(key) => format!( Some(key) => format!(
"/indexes/{}/documents?primaryKey={}", "/indexes/{}/documents?primaryKey={}",
encode(self.uid.as_ref()).to_string(), encode(self.uid.as_ref()),
key key
), ),
None => format!( None => format!("/indexes/{}/documents", encode(self.uid.as_ref())),
"/indexes/{}/documents",
encode(self.uid.as_ref()).to_string()
),
}; };
self.service.post(url, documents).await self.service.post(url, documents).await
} }
@ -103,13 +97,10 @@ impl Index<'_> {
let url = match primary_key { let url = match primary_key {
Some(key) => format!( Some(key) => format!(
"/indexes/{}/documents?primaryKey={}", "/indexes/{}/documents?primaryKey={}",
encode(self.uid.as_ref()).to_string(), encode(self.uid.as_ref()),
key key
), ),
None => format!( None => format!("/indexes/{}/documents", encode(self.uid.as_ref())),
"/indexes/{}/documents",
encode(self.uid.as_ref()).to_string()
),
}; };
self.service.put(url, documents).await self.service.put(url, documents).await
} }
@ -145,19 +136,12 @@ impl Index<'_> {
id: u64, id: u64,
_options: Option<GetDocumentOptions>, _options: Option<GetDocumentOptions>,
) -> (Value, StatusCode) { ) -> (Value, StatusCode) {
let url = format!( let url = format!("/indexes/{}/documents/{}", encode(self.uid.as_ref()), id);
"/indexes/{}/documents/{}",
encode(self.uid.as_ref()).to_string(),
id
);
self.service.get(url).await self.service.get(url).await
} }
pub async fn get_all_documents(&self, options: GetAllDocumentsOptions) -> (Value, StatusCode) { pub async fn get_all_documents(&self, options: GetAllDocumentsOptions) -> (Value, StatusCode) {
let mut url = format!( let mut url = format!("/indexes/{}/documents?", encode(self.uid.as_ref()));
"/indexes/{}/documents?",
encode(self.uid.as_ref()).to_string()
);
if let Some(limit) = options.limit { if let Some(limit) = options.limit {
url.push_str(&format!("limit={}&", limit)); url.push_str(&format!("limit={}&", limit));
} }
@ -177,26 +161,19 @@ impl Index<'_> {
} }
pub async fn delete_document(&self, id: u64) -> (Value, StatusCode) { pub async fn delete_document(&self, id: u64) -> (Value, StatusCode) {
let url = format!( let url = format!("/indexes/{}/documents/{}", encode(self.uid.as_ref()), id);
"/indexes/{}/documents/{}",
encode(self.uid.as_ref()).to_string(),
id
);
self.service.delete(url).await self.service.delete(url).await
} }
pub async fn clear_all_documents(&self) -> (Value, StatusCode) { pub async fn clear_all_documents(&self) -> (Value, StatusCode) {
let url = format!( let url = format!("/indexes/{}/documents", encode(self.uid.as_ref()));
"/indexes/{}/documents",
encode(self.uid.as_ref()).to_string()
);
self.service.delete(url).await self.service.delete(url).await
} }
pub async fn delete_batch(&self, ids: Vec<u64>) -> (Value, StatusCode) { pub async fn delete_batch(&self, ids: Vec<u64>) -> (Value, StatusCode) {
let url = format!( let url = format!(
"/indexes/{}/documents/delete-batch", "/indexes/{}/documents/delete-batch",
encode(self.uid.as_ref()).to_string() encode(self.uid.as_ref())
); );
self.service self.service
.post(url, serde_json::to_value(&ids).unwrap()) .post(url, serde_json::to_value(&ids).unwrap())
@ -204,31 +181,22 @@ impl Index<'_> {
} }
pub async fn settings(&self) -> (Value, StatusCode) { pub async fn settings(&self) -> (Value, StatusCode) {
let url = format!( let url = format!("/indexes/{}/settings", encode(self.uid.as_ref()));
"/indexes/{}/settings",
encode(self.uid.as_ref()).to_string()
);
self.service.get(url).await self.service.get(url).await
} }
pub async fn update_settings(&self, settings: Value) -> (Value, StatusCode) { pub async fn update_settings(&self, settings: Value) -> (Value, StatusCode) {
let url = format!( let url = format!("/indexes/{}/settings", encode(self.uid.as_ref()));
"/indexes/{}/settings",
encode(self.uid.as_ref()).to_string()
);
self.service.post(url, settings).await self.service.post(url, settings).await
} }
pub async fn delete_settings(&self) -> (Value, StatusCode) { pub async fn delete_settings(&self) -> (Value, StatusCode) {
let url = format!( let url = format!("/indexes/{}/settings", encode(self.uid.as_ref()));
"/indexes/{}/settings",
encode(self.uid.as_ref()).to_string()
);
self.service.delete(url).await self.service.delete(url).await
} }
pub async fn stats(&self) -> (Value, StatusCode) { pub async fn stats(&self) -> (Value, StatusCode) {
let url = format!("/indexes/{}/stats", encode(self.uid.as_ref()).to_string()); let url = format!("/indexes/{}/stats", encode(self.uid.as_ref()));
self.service.get(url).await self.service.get(url).await
} }
@ -253,17 +221,13 @@ impl Index<'_> {
} }
pub async fn search_post(&self, query: Value) -> (Value, StatusCode) { pub async fn search_post(&self, query: Value) -> (Value, StatusCode) {
let url = format!("/indexes/{}/search", encode(self.uid.as_ref()).to_string()); let url = format!("/indexes/{}/search", encode(self.uid.as_ref()));
self.service.post(url, query).await self.service.post(url, query).await
} }
pub async fn search_get(&self, query: Value) -> (Value, StatusCode) { pub async fn search_get(&self, query: Value) -> (Value, StatusCode) {
let params = serde_url_params::to_string(&query).unwrap(); let params = serde_url_params::to_string(&query).unwrap();
let url = format!( let url = format!("/indexes/{}/search?{}", encode(self.uid.as_ref()), params);
"/indexes/{}/search?{}",
encode(self.uid.as_ref()).to_string(),
params
);
self.service.get(url).await self.service.get(url).await
} }

2
meilisearch-lib/Cargo.toml
View File

@ -30,7 +30,7 @@ lazy_static = "1.4.0"
log = "0.4.14" log = "0.4.14"
meilisearch-error = { path = "../meilisearch-error" } meilisearch-error = { path = "../meilisearch-error" }
meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-auth = { path = "../meilisearch-auth" }
milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.21.0" } milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.21.1" }
mime = "0.3.16" mime = "0.3.16"
num_cpus = "1.13.0" num_cpus = "1.13.0"
once_cell = "1.8.0" once_cell = "1.8.0"

4
meilisearch-lib/src/index/dump.rs
View File

@ -28,9 +28,7 @@ impl Index {
pub fn dump(&self, path: impl AsRef<Path>) -> Result<()> { pub fn dump(&self, path: impl AsRef<Path>) -> Result<()> {
// acquire write txn make sure any ongoing write is finished before we start. // acquire write txn make sure any ongoing write is finished before we start.
let txn = self.env.write_txn()?; let txn = self.env.write_txn()?;
let path = path let path = path.as_ref().join(format!("indexes/{}", self.uuid));
.as_ref()
.join(format!("indexes/{}", self.uuid.to_string()));
create_dir_all(&path)?; create_dir_all(&path)?;