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

remove small code duplication involving InMemoryLayer::get_seg_size, and remove redundant Option around new snapshot layer in InMemoryLayer::freeze

Browse Source
This commit is contained in:
Dmitry Rodionov
2021-08-20 15:36:48 +03:00
committed by Dmitry
parent 798160544c
commit d989580c1c
2 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pageserver/src/layered_repository.rs
View File

@@ -1138,15 +1138,13 @@ impl LayeredTimeline {
// (removes it if new_open is None)
iter.replace(new_open);
if let Some(historic) = new_historic {
trace!(
"freeze returned layer {} {}-{}",
historic.get_seg_tag(),
historic.get_start_lsn(),
historic.get_end_lsn()
);
iter.insert_historic(historic);
}
trace!(
"freeze returned layer {} {}-{}",
new_historic.get_seg_tag(),
new_historic.get_start_lsn(),
new_historic.get_end_lsn()
);
iter.insert_historic(new_historic);
}
for layer in layers.iter_historic_layers() {

44
pageserver/src/layered_repository/inmemory_layer.rs
View File

@@ -53,6 +53,22 @@ pub struct InMemoryLayerInner {
segsizes: BTreeMap<Lsn, u32>,
}
impl InMemoryLayerInner {
fn get_seg_size(&self, seg: SegmentTag, lsn: Lsn) -> Result<u32> {
// Scan the BTreeMap backwards, starting from the given entry.
let mut iter = self.segsizes.range((Included(&Lsn(0)), Included(&lsn)));
if let Some((_entry_lsn, entry)) = iter.next_back() {
let result = *entry;
trace!("get_seg_size: {} at {} -> {}", seg, lsn, result);
Ok(result)
} else {
bail!("No size found for {} at {} in memory", seg, lsn);
}
}
}
impl Layer for InMemoryLayer {
fn get_timeline_id(&self) -> ZTimelineId {
return self.timelineid;
@@ -128,18 +144,8 @@ impl Layer for InMemoryLayer {
/// Get size of the relation at given LSN
fn get_seg_size(&self, lsn: Lsn) -> Result<u32> {
// Scan the BTreeMap backwards, starting from the given entry.
let inner = self.inner.lock().unwrap();
let mut iter = inner.segsizes.range((Included(&Lsn(0)), Included(&lsn)));
if let Some((_entry_lsn, entry)) = iter.next_back() {
let result = *entry;
drop(inner);
trace!("get_seg_size: {} at {} -> {}", self.seg, lsn, result);
Ok(result)
} else {
bail!("No size found for {} at {} in memory", self.seg, lsn);
}
inner.get_seg_size(self.seg, lsn)
}
/// Does this segment exist at given LSN?
@@ -244,15 +250,9 @@ impl InMemoryLayer {
if self.seg.rel.is_blocky() {
let newsize = blknum - self.seg.segno * RELISH_SEG_SIZE + 1;
let mut iter = inner.segsizes.range((Included(&Lsn(0)), Included(&lsn)));
let oldsize;
if let Some((_entry_lsn, entry)) = iter.next_back() {
oldsize = *entry;
} else {
oldsize = 0;
//bail!("No old size found for {} at {}", self.tag, lsn);
}
// use inner get_seg_size, since calling self.get_seg_size will try to acquire self.inner.lock
// which we've just acquired above
let oldsize = inner.get_seg_size(self.seg, lsn).unwrap_or(0);
if newsize > oldsize {
trace!(
"enlarging segment {} from {} to {} blocks at {}",
@@ -366,7 +366,7 @@ impl InMemoryLayer {
cutoff_lsn: Lsn,
// This is needed just to call materialize_page()
timeline: &LayeredTimeline,
) -> Result<(Option<Arc<SnapshotLayer>>, Option<Arc<InMemoryLayer>>)> {
) -> Result<(Arc<SnapshotLayer>, Option<Arc<InMemoryLayer>>)> {
info!(
"freezing in memory layer for {} on timeline {} at {}",
self.seg, self.timelineid, cutoff_lsn
@@ -458,7 +458,7 @@ impl InMemoryLayer {
None
};
let new_historic = Some(Arc::new(snapfile));
let new_historic = Arc::new(snapfile);
Ok((new_historic, new_open))
}