fix tikv storage

main
Ziyang Hu 1 year ago
parent e3e155cfa3
commit aa77ee02e9

@ -207,7 +207,7 @@ impl<'s> StoreTx<'s> for SledTx {
self.db self.db
.range(lower.to_vec()..upper.to_vec()) .range(lower.to_vec()..upper.to_vec())
.map(|d| d.into_diagnostic()) .map(|d| d.into_diagnostic())
.map_ok(|(k, v)| decode_tuple_from_kv(&k, &v)), .map_ok(|(k, v)| decode_tuple_from_kv(&k, &v, None)),
) )
} }
} }
@ -369,12 +369,12 @@ impl SledIter {
if cv[0] == DEL_MARKER { if cv[0] == DEL_MARKER {
continue; continue;
} else { } else {
return Ok(Some(decode_tuple_from_kv(&k, &cv[1..]))); return Ok(Some(decode_tuple_from_kv(&k, &cv[1..], None)));
} }
} }
(None, Some(_)) => { (None, Some(_)) => {
let (k, v) = self.db_cache.take().unwrap(); let (k, v) = self.db_cache.take().unwrap();
return Ok(Some(decode_tuple_from_kv(&k, &v))); return Ok(Some(decode_tuple_from_kv(&k, &v, None)));
} }
(Some((ck, _)), Some((dk, _))) => match ck.cmp(dk) { (Some((ck, _)), Some((dk, _))) => match ck.cmp(dk) {
Ordering::Less => { Ordering::Less => {
@ -382,12 +382,12 @@ impl SledIter {
if sv[0] == DEL_MARKER { if sv[0] == DEL_MARKER {
continue; continue;
} else { } else {
return Ok(Some(decode_tuple_from_kv(&k, &sv[1..]))); return Ok(Some(decode_tuple_from_kv(&k, &sv[1..], None)));
} }
} }
Ordering::Greater => { Ordering::Greater => {
let (k, v) = self.db_cache.take().unwrap(); let (k, v) = self.db_cache.take().unwrap();
return Ok(Some(decode_tuple_from_kv(&k, &v))); return Ok(Some(decode_tuple_from_kv(&k, &v, None)));
} }
Ordering::Equal => { Ordering::Equal => {
self.db_cache.take(); self.db_cache.take();

@ -307,7 +307,7 @@ impl Iterator for BatchScanner {
swap_option_result( swap_option_result(
self.raw self.raw
.next_inner() .next_inner()
.map(|mkv| mkv.map(|(k, v)| decode_tuple_from_kv(k, v))), .map(|mkv| mkv.map(|(k, v)| decode_tuple_from_kv(k, v, None))),
) )
} }
} }

Loading…
Cancel
Save