Improve the DocumentsIdsIter internal

This commit is contained in:
Clément Renault 2019-10-10 13:09:29 +02:00
parent da0168bd82
commit 7b26bd88c0
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
3 changed files with 4 additions and 5 deletions

View File

@ -307,7 +307,7 @@ fn search_command(command: SearchCommand, database: Database) -> Result<(), Box<
doc.highlights.sort_unstable_by_key(|m| (m.char_index, m.char_length));
let start_retrieve = Instant::now();
let result = index.document::<Document, _>(&reader, Some(&fields), doc.id);
let result = index.document::<_, Document>(&reader, Some(&fields), doc.id);
retrieve_duration += start_retrieve.elapsed();
match result {

View File

@ -146,15 +146,14 @@ impl<'r> Iterator for DocumentsIdsIter<'r> {
fn next(&mut self) -> Option<Self::Item> {
for result in self.iter.next() {
match result {
Ok((key, Some(rkv::Value::Blob(bytes)))) => {
Ok((key, _)) => {
let array = TryFrom::try_from(key).unwrap();
let (document_id, attr) = document_attribute_from_key(array);
let (document_id, _) = document_attribute_from_key(array);
if Some(document_id) != self.last_seen_id {
self.last_seen_id = Some(document_id);
return Some(Ok(document_id))
}
},
Ok((key, data)) => panic!("{:?}, {:?}", key, data),
Err(e) => return Some(Err(e)),
}
}

View File

@ -66,7 +66,7 @@ pub struct Index {
}
impl Index {
pub fn document<T: de::DeserializeOwned, R: rkv::Readable>(
pub fn document<R: rkv::Readable, T: de::DeserializeOwned>(
&self,
reader: &R,
attributes: Option<&HashSet<&str>>,