snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 10:37:41 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Bump the sdset dependency to 0.3.6

Browse Source
This commit is contained in:
Clément Renault 2019-12-11 12:08:30 +01:00
parent 8d71112dcb
commit efc2be0b7b
No known key found for this signature in database
GPG Key ID: 0151CDAB43460DAE
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -962,7 +962,7 @@ dependencies = [
"once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustyline 5.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustyline 5.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"sdset 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "sdset 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
"siphasher 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "siphasher 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1692,7 +1692,7 @@ dependencies = [
[[package]] [[package]]
name = "sdset" name = "sdset"
version = "0.3.3" version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -2807,7 +2807,7 @@ dependencies = [
"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
"checksum sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c" "checksum sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
"checksum sdset 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b6d2447743d6c37b6d67af88d9c0f1fc92989e2d9745d9b2f3d305b906a90195" "checksum sdset 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "5bfd7aab2bcae693c563b40fbbaf87d60c9b6f2a60d55ed69a9c761e3d4c63c9"
"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
"checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" "checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"

2
meilisearch-core/Cargo.toml
View File

@ -25,7 +25,7 @@ meilisearch-tokenizer = { path = "../meilisearch-tokenizer", version = "0.8.4" }
meilisearch-types = { path = "../meilisearch-types", version = "0.8.4" } meilisearch-types = { path = "../meilisearch-types", version = "0.8.4" }
once_cell = "1.2.0" once_cell = "1.2.0"
ordered-float = { version = "1.0.2", features = ["serde"] } ordered-float = { version = "1.0.2", features = ["serde"] }
sdset = "0.3.3" sdset = "0.3.6"
serde = { version = "1.0.101", features = ["derive"] } serde = { version = "1.0.101", features = ["derive"] }
serde_json = "1.0.41" serde_json = "1.0.41"
siphasher = "0.3.1" siphasher = "0.3.1"

18
meilisearch-core/src/bucket_sort.rs
View File

@ -121,7 +121,6 @@ pub fn bucket_sort<'c>(
let postings_list = &arena[sm.postings_list]; let postings_list = &arena[sm.postings_list];
let input = postings_list.input(); let input = postings_list.input();
let query = &automatons[sm.query_index as usize].query; let query = &automatons[sm.query_index as usize].query;
debug!("{:?} contains {:?}", d.raw_matches[0].document_id, query);
postings_list.iter().map(move |m| { postings_list.iter().map(move |m| {
let covered_area = if query.len() > input.len() { let covered_area = if query.len() > input.len() {
input.len() input.len()
@ -132,8 +131,6 @@ pub fn bucket_sort<'c>(
}) })
}).collect(); }).collect();
debug!("{:?} contains {:?}", d.raw_matches[0].document_id, d.processed_distances);
Document { Document {
id: d.raw_matches[0].document_id, id: d.raw_matches[0].document_id,
highlights, highlights,
@ -170,13 +167,13 @@ impl<'a, 'tag> RawDocument<'a, 'tag> {
let b = match raw_matches.get(i + 1) { let b = match raw_matches.get(i + 1) {
Some(b) => b, Some(b) => b,
None => { None => {
postings_lists[a.postings_list].rewrite_with(SetBuf::new_unchecked(Vec::new())); postings_lists[a.postings_list].rewrite_with(SetBuf::default());
continue; continue;
} }
}; };
if a.query_index + 1 != b.query_index { if a.query_index + 1 != b.query_index {
postings_lists[a.postings_list].rewrite_with(SetBuf::new_unchecked(Vec::new())); postings_lists[a.postings_list].rewrite_with(SetBuf::default());
continue continue
} }
@ -197,21 +194,16 @@ impl<'a, 'tag> RawDocument<'a, 'tag> {
} }
} }
if !newa.is_empty() { if !newa.is_empty() {
previous_word = Some(a.query_index); previous_word = Some(a.query_index);
}
postings_lists[a.postings_list].rewrite_with(SetBuf::new_unchecked(newa)); postings_lists[a.postings_list].rewrite_with(SetBuf::new_unchecked(newa));
postings_lists[b.postings_list].rewrite_with(SetBuf::new_unchecked(newb)); postings_lists[b.postings_list].rewrite_with(SetBuf::new_unchecked(newb));
} else {
// TODO use SetBuf::default when merged
postings_lists[a.postings_list].rewrite_with(SetBuf::new_unchecked(Vec::new()));
postings_lists[b.postings_list].rewrite_with(SetBuf::new_unchecked(Vec::new()));
}
}, },
Some((1, _)) => { Some((1, _)) => {
if previous_word.take() != Some(a.query_index - 1) { if previous_word.take() != Some(a.query_index - 1) {
postings_lists[a.postings_list].rewrite_with(SetBuf::new_unchecked(Vec::new())); postings_lists[a.postings_list].rewrite_with(SetBuf::default());
} }
}, },
Some((_, _)) => unreachable!(), Some((_, _)) => unreachable!(),