Skip to content

fix last on iterators with dup values #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix last on iterators with dup values #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions heed/src/databases/database.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@ impl<KC, DC, C, CDUP> Database<KC, DC, C, CDUP> {
/// drop(iter);
///
/// let mut iter = db.get_duplicates(&wtxn, &68)?.expect("the key exists");
/// assert_eq!(iter.next().transpose()?, Some((68, 120)));
/// assert_eq!(iter.last().transpose()?, Some((68, 123)));
///
/// wtxn.commit()?;
Expand Down
48 changes: 4 additions & 44 deletions heed/src/iterator/iter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,17 +179,7 @@ where
}

fn last(mut self) -> Option<Self::Item> {
let result = if self.move_on_first {
self.cursor.move_on_last(IM::MOVE_OPERATION)
} else {
match (self.cursor.current(), self.cursor.move_on_last(IM::MOVE_OPERATION)) {
(Ok(Some((ckey, _))), Ok(Some((key, data)))) if ckey != key => {
Ok(Some((key, data)))
}
(Ok(_), Ok(_)) => Ok(None),
(Err(e), _) | (_, Err(e)) => Err(e),
}
};
let result = self.cursor.move_on_last(IM::MOVE_OPERATION);

match result {
Ok(Some((key, data))) => match (KC::bytes_decode(key), DC::bytes_decode(data)) {
Expand Down Expand Up @@ -408,17 +398,7 @@ where
}

fn last(mut self) -> Option<Self::Item> {
let result = if self.move_on_first {
self.cursor.move_on_last(IM::MOVE_OPERATION)
} else {
match (self.cursor.current(), self.cursor.move_on_last(IM::MOVE_OPERATION)) {
(Ok(Some((ckey, _))), Ok(Some((key, data)))) if ckey != key => {
Ok(Some((key, data)))
}
(Ok(_), Ok(_)) => Ok(None),
(Err(e), _) | (_, Err(e)) => Err(e),
}
};
let result = self.cursor.move_on_last(IM::MOVE_OPERATION);

match result {
Ok(Some((key, data))) => match (KC::bytes_decode(key), DC::bytes_decode(data)) {
Expand Down Expand Up @@ -525,17 +505,7 @@ where
}

fn last(mut self) -> Option<Self::Item> {
let result = if self.move_on_last {
self.cursor.move_on_first(IM::MOVE_OPERATION)
} else {
match (self.cursor.current(), self.cursor.move_on_first(IM::MOVE_OPERATION)) {
(Ok(Some((ckey, _))), Ok(Some((key, data)))) if ckey != key => {
Ok(Some((key, data)))
}
(Ok(_), Ok(_)) => Ok(None),
(Err(e), _) | (_, Err(e)) => Err(e),
}
};
let result = self.cursor.move_on_first(IM::MOVE_OPERATION);

match result {
Ok(Some((key, data))) => match (KC::bytes_decode(key), DC::bytes_decode(data)) {
Expand Down Expand Up @@ -756,17 +726,7 @@ where
}

fn last(mut self) -> Option<Self::Item> {
let result = if self.move_on_last {
self.cursor.move_on_first(IM::MOVE_OPERATION)
} else {
match (self.cursor.current(), self.cursor.move_on_first(IM::MOVE_OPERATION)) {
(Ok(Some((ckey, _))), Ok(Some((key, data)))) if ckey != key => {
Ok(Some((key, data)))
}
(Ok(_), Ok(_)) => Ok(None),
(Err(e), _) | (_, Err(e)) => Err(e),
}
};
let result = self.cursor.move_on_first(IM::MOVE_OPERATION);

match result {
Ok(Some((key, data))) => match (KC::bytes_decode(key), DC::bytes_decode(data)) {
Expand Down
6 changes: 3 additions & 3 deletions heed/src/iterator/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,15 +227,15 @@ mod tests {
assert_eq!(iter.next().transpose().unwrap(), Some((2, ())));
assert_eq!(iter.next().transpose().unwrap(), Some((3, ())));
assert_eq!(iter.next().transpose().unwrap(), Some((4, ())));
assert_eq!(iter.last().transpose().unwrap(), None);
assert_eq!(iter.last().transpose().unwrap(), Some((4, ())));

let mut iter = db.iter(&wtxn).unwrap();
assert_eq!(iter.next().transpose().unwrap(), Some((1, ())));
assert_eq!(iter.next().transpose().unwrap(), Some((2, ())));
assert_eq!(iter.next().transpose().unwrap(), Some((3, ())));
assert_eq!(iter.next().transpose().unwrap(), Some((4, ())));
assert_eq!(iter.next().transpose().unwrap(), None);
assert_eq!(iter.last().transpose().unwrap(), None);
assert_eq!(iter.last().transpose().unwrap(), Some((4, ())));

wtxn.abort();

Expand All @@ -249,7 +249,7 @@ mod tests {

let mut iter = db.iter(&wtxn).unwrap();
assert_eq!(iter.next().transpose().unwrap(), Some((1, ())));
assert_eq!(iter.last().transpose().unwrap(), None);
assert_eq!(iter.last().transpose().unwrap(), Some((1, ())));

wtxn.abort();
}
Expand Down
Loading