rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-15 17:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source 
Signed-off-by: Alex Chi Z <chi@neon.tech>
This commit is contained in:
Alex Chi Z
2023-06-29 14:57:42 -04:00
parent d28e309c06
commit 8aede79abf
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pageserver/src/tenant/layer_map.rs
View File

@@ -286,21 +286,17 @@ impl LayerMap {
let image_is_newer = image.get_lsn_range().end >= delta.get_lsn_range().end;
let image_exact_match = img_lsn + 1 == end_lsn;
if image_is_newer || image_exact_match {
if img_lsn + 1 == delta.get_lsn_range().end {
if image.get_lsn_range().end == delta.get_lsn_range().end {
// incremental, image lsn N, if it does not contain the image, we should start with
// delta lsn N+1 instead of N.
let lsn_floor = std::cmp::max(
delta.get_lsn_range().start,
image.get_lsn_range().start + 1,
);
Some((
SearchResult {
layer: image,
lsn_floor: img_lsn,
},
Some(SearchResult {
lsn_floor: delta.get_lsn_range().start,
layer: delta,
lsn_floor,
}),
))
} else {