rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-09 22:42:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup/simplify logical size calculation (#2459)

Browse Source 
Should produce identical results; replaces an error case that shouldn't
be possible with `expect`.
This commit is contained in:
sharnoff
2022-09-15 23:50:46 -07:00
committed by GitHub
parent 031e57a973
commit db5ec0dae7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pageserver/src/tenant/timeline.rs
View File

@@ -232,14 +232,16 @@ impl LogicalSize {
}
fn current_size(&self) -> anyhow::Result<CurrentLogicalSize> {
let size_increment = self.size_added_after_initial.load(AtomicOrdering::Acquire);
let size_increment: i64 = self.size_added_after_initial.load(AtomicOrdering::Acquire);
// ^^^ keep this type explicit so that the casts in this function break if
// we change the type.
match self.initial_logical_size.get() {
Some(initial_size) => {
let absolute_size_increment = u64::try_from(
size_increment
.checked_abs()
.with_context(|| format!("Size added after initial {size_increment} is not expected to be i64::MIN"))?,
).with_context(|| format!("Failed to convert size increment {size_increment} to u64"))?;
).expect("casting nonnegative i64 to u64 should not fail");
if size_increment < 0 {
initial_size.checked_sub(absolute_size_increment)
@@ -249,11 +251,7 @@ impl LogicalSize {
.map(CurrentLogicalSize::Exact)
}
None => {
let non_negative_size_increment = if size_increment < 0 {
0
} else {
u64::try_from(size_increment).expect("not negative, cannot fail")
};
let non_negative_size_increment = u64::try_from(size_increment).unwrap_or(0);
Ok(CurrentLogicalSize::Approximate(non_negative_size_increment))
}
}