grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix iterator issues

Browse Source
This commit is contained in:
efyang 2017-10-28 16:59:00 -05:00
parent 56b6adec68
commit 9b4db8b4f0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util/kvdb-rocksdb/src/lib.rs
View File

@ -515,13 +515,14 @@ impl Database {
match *self.db.read() { match *self.db.read() {
Some(DBAndColumns { ref db, ref cfs }) => { Some(DBAndColumns { ref db, ref cfs }) => {
let overlay = &self.overlay.read()[Self::to_overlay_column(col)]; let overlay = &self.overlay.read()[Self::to_overlay_column(col)];
let overlay_data = overlay.iter() let mut overlay_data = overlay.iter()
.filter_map(|(k, v)| match v { .filter_map(|(k, v)| match *v {
&KeyState::Insert(ref value) | KeyState::Insert(ref value) |
&KeyState::InsertCompressed(ref value) => KeyState::InsertCompressed(ref value) =>
Some((k.clone().into_vec().into_boxed_slice(), value.clone().into_vec().into_boxed_slice())), Some((k.clone().into_vec().into_boxed_slice(), value.clone().into_vec().into_boxed_slice())),
&KeyState::Delete => None, KeyState::Delete => None,
}).collect::<Vec<_>>(); }).collect::<Vec<_>>();
overlay_data.sort();
let iter = col.map_or_else( let iter = col.map_or_else(
|| db.iterator_opt(IteratorMode::Start, &self.read_opts), || db.iterator_opt(IteratorMode::Start, &self.read_opts),