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 pull request #251 from meilisearch/update-heed

Browse Source 
Moving to heed 0.3.0
This commit is contained in:
Clément Renault 2019-10-31 16:20:07 +01:00 committed by GitHub
commit 996763cc52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meilidb-core/Cargo.toml
View File

@ -12,7 +12,7 @@ crossbeam-channel = "0.3.9"
deunicode = "1.0.0" deunicode = "1.0.0"
env_logger = "0.7.0" env_logger = "0.7.0"
hashbrown = { version = "0.6.0", features = ["serde"] } hashbrown = { version = "0.6.0", features = ["serde"] }
heed = "0.1.0" heed = "0.3.0"
log = "0.4.8" log = "0.4.8"
meilidb-schema = { path = "../meilidb-schema", version = "0.6.0" } meilidb-schema = { path = "../meilidb-schema", version = "0.6.0" }
meilidb-tokenizer = { path = "../meilidb-tokenizer", version = "0.6.0" } meilidb-tokenizer = { path = "../meilidb-tokenizer", version = "0.6.0" }

2
meilidb-core/src/database.rs
View File

@ -72,7 +72,7 @@ impl Database {
.max_dbs(3000) .max_dbs(3000)
.open(path)?; .open(path)?;
let common_store = env.create_dyn_database(Some("common"))?; let common_store = env.create_poly_database(Some("common"))?;
let indexes_store = env.create_database::<Str, Unit>(Some("indexes"))?; let indexes_store = env.create_database::<Str, Unit>(Some("indexes"))?;
// list all indexes that needs to be opened // list all indexes that needs to be opened

4
meilidb-core/src/store/documents_fields.rs
View File

@ -29,7 +29,7 @@ impl DocumentsFields {
) -> ZResult<usize> { ) -> ZResult<usize> {
let start = DocumentAttrKey::new(document_id, SchemaAttr::min()); let start = DocumentAttrKey::new(document_id, SchemaAttr::min());
let end = DocumentAttrKey::new(document_id, SchemaAttr::max()); let end = DocumentAttrKey::new(document_id, SchemaAttr::max());
self.documents_fields.delete_range(writer, start..=end) self.documents_fields.delete_range(writer, &(start..=end))
} }
pub fn clear(self, writer: &mut heed::RwTxn) -> ZResult<()> { pub fn clear(self, writer: &mut heed::RwTxn) -> ZResult<()> {
@ -53,7 +53,7 @@ impl DocumentsFields {
) -> ZResult<DocumentFieldsIter<'txn>> { ) -> ZResult<DocumentFieldsIter<'txn>> {
let start = DocumentAttrKey::new(document_id, SchemaAttr::min()); let start = DocumentAttrKey::new(document_id, SchemaAttr::min());
let end = DocumentAttrKey::new(document_id, SchemaAttr::max()); let end = DocumentAttrKey::new(document_id, SchemaAttr::max());
let iter = self.documents_fields.range(reader, start..=end)?; let iter = self.documents_fields.range(reader, &(start..=end))?;
Ok(DocumentFieldsIter { iter }) Ok(DocumentFieldsIter { iter })
} }
} }

4
meilidb-core/src/store/documents_fields_counts.rs
View File

@ -29,7 +29,7 @@ impl DocumentsFieldsCounts {
let start = DocumentAttrKey::new(document_id, SchemaAttr::min()); let start = DocumentAttrKey::new(document_id, SchemaAttr::min());
let end = DocumentAttrKey::new(document_id, SchemaAttr::max()); let end = DocumentAttrKey::new(document_id, SchemaAttr::max());
self.documents_fields_counts self.documents_fields_counts
.delete_range(writer, start..=end) .delete_range(writer, &(start..=end))
} }
pub fn clear(self, writer: &mut heed::RwTxn) -> ZResult<()> { pub fn clear(self, writer: &mut heed::RwTxn) -> ZResult<()> {
@ -56,7 +56,7 @@ impl DocumentsFieldsCounts {
) -> ZResult<DocumentFieldsCountsIter<'txn>> { ) -> ZResult<DocumentFieldsCountsIter<'txn>> {
let start = DocumentAttrKey::new(document_id, SchemaAttr::min()); let start = DocumentAttrKey::new(document_id, SchemaAttr::min());
let end = DocumentAttrKey::new(document_id, SchemaAttr::max()); let end = DocumentAttrKey::new(document_id, SchemaAttr::max());
let iter = self.documents_fields_counts.range(reader, start..=end)?; let iter = self.documents_fields_counts.range(reader, &(start..=end))?;
Ok(DocumentFieldsCountsIter { iter }) Ok(DocumentFieldsCountsIter { iter })
} }

4
meilidb-core/src/store/mod.rs
View File

@ -283,7 +283,7 @@ pub fn create(
let updates_results_name = updates_results_name(name); let updates_results_name = updates_results_name(name);
// open all the stores // open all the stores
let main = env.create_dyn_database(Some(&main_name))?; let main = env.create_poly_database(Some(&main_name))?;
let postings_lists = env.create_database(Some(&postings_lists_name))?; let postings_lists = env.create_database(Some(&postings_lists_name))?;
let documents_fields = env.create_database(Some(&documents_fields_name))?; let documents_fields = env.create_database(Some(&documents_fields_name))?;
let documents_fields_counts = env.create_database(Some(&documents_fields_counts_name))?; let documents_fields_counts = env.create_database(Some(&documents_fields_counts_name))?;
@ -323,7 +323,7 @@ pub fn open(
let updates_results_name = updates_results_name(name); let updates_results_name = updates_results_name(name);
// open all the stores // open all the stores
let main = match env.open_dyn_database(Some(&main_name))? { let main = match env.open_poly_database(Some(&main_name))? {
Some(main) => main, Some(main) => main,
None => return Ok(None), None => return Ok(None),
}; };

2
meilidb-http/Cargo.toml
View File

@ -13,7 +13,7 @@ chrono = { version = "0.4.9", features = ["serde"] }
crossbeam-channel = "0.3.9" crossbeam-channel = "0.3.9"
envconfig = "0.5.1" envconfig = "0.5.1"
envconfig_derive = "0.5.1" envconfig_derive = "0.5.1"
heed = "0.1.0" heed = "0.3.0"
http = "0.1.19" http = "0.1.19"
indexmap = { version = "1.3.0", features = ["serde-1"] } indexmap = { version = "1.3.0", features = ["serde-1"] }
jemallocator = "0.3.2" jemallocator = "0.3.2"