From bd641b68102728b9b980b0d5f039bf7e33b13efe Mon Sep 17 00:00:00 2001 From: serprex <159546+serprex@users.noreply.github.com> Date: Sun, 8 Nov 2026 06:53:01 +0000 Subject: [PATCH] SpillEntry: box all contents Reduces SpillEntry size from 72 bytes to 16 bytes --- src/ch.rs | 2 +- src/xact/spill.rs | 30 ++++++++++++++++++++---------- src/xact/xact_buffer.rs | 8 ++++---- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/ch.rs b/src/ch.rs index 24a3f571..0a424431 100644 --- a/src/ch.rs +++ b/src/ch.rs @@ -318,7 +318,7 @@ pub struct ChConn { instance: Option, selected: Option>, active: Connection, - parked: std::collections::HashMap, Connection>, + parked: ahash::HashMap, Connection>, dest: Arc, dials: u64, } diff --git a/src/xact/spill.rs b/src/xact/spill.rs index 746b92ff..f548c5c5 100644 --- a/src/xact/spill.rs +++ b/src/xact/spill.rs @@ -70,14 +70,16 @@ use ahash::{HashMap, HashMapExt}; #[derive(Debug, Clone, PartialEq)] pub enum SpillEntry { Heap(Box), - Chunk(ToastChunk), - ToastDelete(ToastDelete), + Chunk(Box), + ToastDelete(Box), /// Undecoded record on a filenode invisible at record time (same-xact /// CREATE / TRUNCATE / rewrite generation); decoded at commit once /// `relation_at(rfn, commit_lsn)` resolves the survivor Raw(Box), } +const _: () = assert!(std::mem::size_of::() <= 16); + /// Raw decode inputs for one WAL record, enough to re-run /// [`crate::decode::heap_decoder::decode_heap_record`] after commit-time /// resolution. Block images survive so an insert whose tuple lives only @@ -752,8 +754,10 @@ impl SpillReader { descriptor_valid_from: valid_from, })) } - TAG_CHUNK => SpillEntry::Chunk(decode_chunk(&mut cur)?), - TAG_TOAST_DELETE => SpillEntry::ToastDelete(decode_toast_delete(&mut cur)?), + TAG_CHUNK => SpillEntry::Chunk(Box::new(decode_chunk(&mut cur)?)), + TAG_TOAST_DELETE => { + SpillEntry::ToastDelete(Box::new(decode_toast_delete(&mut cur)?)) + } TAG_RAW => SpillEntry::Raw(Box::new(decode_raw(&mut cur)?)), TAG_DESCRIPTOR => { let valid_from = cur.u64()?; @@ -1531,12 +1535,12 @@ mod tests { for remaining in [1, 3, 5, 31] { let mut writer = store.writer(42, remaining).await.unwrap(); writer - .write_batch(vec![SpillEntry::Chunk(sample_chunk( + .write_batch(vec![SpillEntry::Chunk(Box::new(sample_chunk( 99, 0, 0x2000, &vec![7; IO_CHUNK + 1], - ))]) + )))]) .await .unwrap(); let mut reader = writer.finish().await.unwrap(); @@ -1564,7 +1568,7 @@ mod tests { w.write_batch(vec![SpillEntry::Heap(Box::new(h.clone()))]) .await .unwrap(); - w.write_batch(vec![SpillEntry::Chunk(c.clone())]) + w.write_batch(vec![SpillEntry::Chunk(Box::new(c.clone()))]) .await .unwrap(); let bc = w.byte_count(); @@ -1574,7 +1578,10 @@ mod tests { r.next().await.unwrap().unwrap(), SpillEntry::Heap(Box::new(h)) ); - assert_eq!(r.next().await.unwrap().unwrap(), SpillEntry::Chunk(c)); + assert_eq!( + r.next().await.unwrap().unwrap(), + SpillEntry::Chunk(Box::new(c)) + ); assert!(r.next().await.unwrap().is_none(), "EOF expected"); r.unlink().await.unwrap(); } @@ -1591,11 +1598,14 @@ mod tests { offnum: 9, source_lsn: 0x2200, }; - w.write_batch(vec![SpillEntry::ToastDelete(d)]) + w.write_batch(vec![SpillEntry::ToastDelete(Box::new(d))]) .await .unwrap(); let mut r = w.finish().await.unwrap(); - assert_eq!(r.next().await.unwrap().unwrap(), SpillEntry::ToastDelete(d)); + assert_eq!( + r.next().await.unwrap().unwrap(), + SpillEntry::ToastDelete(Box::new(d)) + ); assert!(r.next().await.unwrap().is_none()); r.unlink().await.unwrap(); } diff --git a/src/xact/xact_buffer.rs b/src/xact/xact_buffer.rs index c72c51bf..243187e0 100644 --- a/src/xact/xact_buffer.rs +++ b/src/xact/xact_buffer.rs @@ -966,7 +966,7 @@ impl XactBuffer { xid: u32, ) -> std::result::Result<(), XactBufferError> { let first_lsn = chunk.source_lsn; - let entry = SpillEntry::Chunk(chunk); + let entry = SpillEntry::Chunk(Box::new(chunk)); self.absorb(xid, first_lsn, entry).await } @@ -979,7 +979,7 @@ impl XactBuffer { xid: u32, ) -> std::result::Result<(), XactBufferError> { let first_lsn = delete.source_lsn; - self.absorb(xid, first_lsn, SpillEntry::ToastDelete(delete)) + self.absorb(xid, first_lsn, SpillEntry::ToastDelete(Box::new(delete))) .await } @@ -1795,8 +1795,8 @@ impl MergedDrain { self.check_owned(h.decoded.xid)?; return Ok(Some(MergeItem::Heap(h))); } - SpillEntry::Chunk(c) => self.fold_chunk(c)?, - SpillEntry::ToastDelete(d) => self.fold_delete(d)?, + SpillEntry::Chunk(c) => self.fold_chunk(*c)?, + SpillEntry::ToastDelete(d) => self.fold_delete(*d)?, SpillEntry::Raw(raw) => self.fold_raw(&raw)?, } }