snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-25 19:45:05 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #58 from Kerollmops/clean-up

Browse Source 
Clean up some database functions
This commit is contained in:
Clément Renault 2019-01-01 11:43:27 +01:00 committed by GitHub
commit 9dd68b4eaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/database/mod.rs
View File

@ -38,29 +38,25 @@ where D: Deref<Target=DB>
fn retrieve_data_index<D>(snapshot: &Snapshot<D>) -> Result<Index, Box<Error>> fn retrieve_data_index<D>(snapshot: &Snapshot<D>) -> Result<Index, Box<Error>>
where D: Deref<Target=DB> where D: Deref<Target=DB>
{ {
match snapshot.get(DATA_INDEX)? { let index = match snapshot.get(DATA_INDEX)? {
Some(vector) => { Some(vector) => {
let bytes_len = vector.as_ref().len(); let bytes = vector.as_ref().to_vec();
let bytes = Arc::new(vector.as_ref().to_vec()); Index::from_bytes(bytes)?
Ok(Index::from_shared_bytes(bytes, 0, bytes_len)?)
}, },
None => Ok(Index::default()), None => Index::default(),
} };
Ok(index)
} }
fn merge_indexes(key: &[u8], existing: Option<&[u8]>, operands: &mut MergeOperands) -> Vec<u8> { fn merge_indexes(key: &[u8], existing: Option<&[u8]>, operands: &mut MergeOperands) -> Vec<u8> {
assert_eq!(key, DATA_INDEX, "The merge operator only supports \"data-index\" merging"); assert_eq!(key, DATA_INDEX, "The merge operator only supports \"data-index\" merging");
let mut index: Option<Index> = None; let mut index: Option<Index> = None;
for bytes in existing.into_iter().chain(operands) { for bytes in existing.into_iter().chain(operands) {
let bytes_len = bytes.len(); let operand = Index::from_bytes(bytes.to_vec()).unwrap();
let bytes = Arc::new(bytes.to_vec());
let operand = Index::from_shared_bytes(bytes, 0, bytes_len);
let operand = operand.expect("BUG: could not deserialize index");
let merged = match index { let merged = match index {
Some(ref index) => index.merge(&operand).expect("BUG: could not merge index"), Some(ref index) => index.merge(&operand).unwrap(),
None => operand, None => operand,
}; };