searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-26 23:04:26 +01:00
Code Issues Releases Wiki Activity

fix: Change the way the BTreeMap store entries

Browse Source
This commit is contained in:
Clément Renault 2018-12-07 15:09:55 +01:00
parent 9342290afe
commit 4626c77eac
No known key found for this signature in database
GPG Key ID: 0151CDAB43460DAE
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/database/document_key.rs
View File

@ -57,7 +57,7 @@ impl fmt::Debug for DocumentKey {
} }
} }
#[derive(Copy, Clone)] #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
pub struct DocumentKeyAttr([u8; DOC_KEY_ATTR_LEN]); pub struct DocumentKeyAttr([u8; DOC_KEY_ATTR_LEN]);
impl DocumentKeyAttr { impl DocumentKeyAttr {

23
src/database/update/positive/update.rs
View File

@ -26,7 +26,7 @@ pub struct PositiveUpdateBuilder<B> {
schema: Schema, schema: Schema,
tokenizer_builder: B, tokenizer_builder: B,
builder: UnorderedPositiveBlobBuilder<Vec<u8>, Vec<u8>>, builder: UnorderedPositiveBlobBuilder<Vec<u8>, Vec<u8>>,
new_states: BTreeMap<(DocumentId, SchemaAttr), NewState>, new_states: BTreeMap<DocumentKeyAttr, NewState>,
} }
impl<B> PositiveUpdateBuilder<B> { impl<B> PositiveUpdateBuilder<B> {
@ -55,13 +55,13 @@ impl<B> PositiveUpdateBuilder<B> {
} }
// TODO value must be a field that can be indexed // TODO value must be a field that can be indexed
pub fn update_field(&mut self, id: DocumentId, field: SchemaAttr, value: String) { pub fn update_field(&mut self, id: DocumentId, attr: SchemaAttr, value: String) {
let value = bincode::serialize(&value).unwrap(); let value = bincode::serialize(&value).unwrap();
self.new_states.insert((id, field), NewState::Updated { value }); self.new_states.insert(DocumentKeyAttr::new(id, attr), NewState::Updated { value });
} }
pub fn remove_field(&mut self, id: DocumentId, field: SchemaAttr) { pub fn remove_field(&mut self, id: DocumentId, attr: SchemaAttr) {
self.new_states.insert((id, field), NewState::Removed); self.new_states.insert(DocumentKeyAttr::new(id, attr), NewState::Removed);
} }
} }
@ -101,7 +101,7 @@ struct Serializer<'a, B> {
tokenizer_builder: &'a B, tokenizer_builder: &'a B,
document_id: DocumentId, document_id: DocumentId,
builder: &'a mut UnorderedPositiveBlobBuilder<Vec<u8>, Vec<u8>>, builder: &'a mut UnorderedPositiveBlobBuilder<Vec<u8>, Vec<u8>>,
new_states: &'a mut BTreeMap<(DocumentId, SchemaAttr), NewState>, new_states: &'a mut BTreeMap<DocumentKeyAttr, NewState>,
} }
macro_rules! forward_to_unserializable_type { macro_rules! forward_to_unserializable_type {
@ -272,7 +272,7 @@ struct StructSerializer<'a, B> {
tokenizer_builder: &'a B, tokenizer_builder: &'a B,
document_id: DocumentId, document_id: DocumentId,
builder: &'a mut UnorderedPositiveBlobBuilder<Vec<u8>, Vec<u8>>, builder: &'a mut UnorderedPositiveBlobBuilder<Vec<u8>, Vec<u8>>,
new_states: &'a mut BTreeMap<(DocumentId, SchemaAttr), NewState>, new_states: &'a mut BTreeMap<DocumentKeyAttr, NewState>,
} }
impl<'a, B> ser::SerializeStruct for StructSerializer<'a, B> impl<'a, B> ser::SerializeStruct for StructSerializer<'a, B>
@ -293,7 +293,8 @@ where B: TokenizerBuilder
let props = self.schema.props(attr); let props = self.schema.props(attr);
if props.is_stored() { if props.is_stored() {
let value = bincode::serialize(value).unwrap(); let value = bincode::serialize(value).unwrap();
self.new_states.insert((self.document_id, attr), NewState::Updated { value }); let key = DocumentKeyAttr::new(self.document_id, attr);
self.new_states.insert(key, NewState::Updated { value });
} }
if props.is_indexed() { if props.is_indexed() {
let serializer = IndexerSerializer { let serializer = IndexerSerializer {
@ -498,11 +499,9 @@ impl<B> PositiveUpdateBuilder<B> {
file_writer.merge(DATA_INDEX, &bytes)?; file_writer.merge(DATA_INDEX, &bytes)?;
// write all the documents fields updates // write all the documents fields updates
for ((id, attr), state) in self.new_states { for (key, state) in self.new_states {
let key = DocumentKeyAttr::new(id, attr);
let props = self.schema.props(attr);
match state { match state {
NewState::Updated { value } => if props.is_stored() { NewState::Updated { value } => {
file_writer.put(key.as_ref(), &value)? file_writer.put(key.as_ref(), &value)?
}, },
NewState::Removed => file_writer.delete(key.as_ref())?, NewState::Removed => file_writer.delete(key.as_ref())?,