Inline a few more tuple related things, +~5% throughput bench improve…

…ment
rdaum · Jan 7, 2024 · 85d3a47 · 85d3a47
1 parent de1dd9f
commit 85d3a47
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/crates/db/src/tuplebox/tuples/slotbox.rs b/crates/db/src/tuplebox/tuples/slotbox.rs
@@ -117,6 +117,7 @@ impl SlotBox {
         Ok(refs)
     }
 
+    #[inline(always)]
     pub(crate) fn page_for<'a>(&self, id: PageId) -> Result<SlottedPage<'a>, SlotBoxError> {
         let inner = self.inner.lock().unwrap();
         inner.page_for(id)
@@ -128,12 +129,14 @@ impl SlotBox {
         page_handle.refcount(id.slot)
     }
 
+    #[inline(always)]
     pub fn upcount(&self, id: TupleId) -> Result<(), SlotBoxError> {
         let inner = self.inner.lock().unwrap();
         let page_handle = inner.page_for(id.page)?;
         page_handle.upcount(id.slot)
     }
 
+    #[inline(always)]
     pub fn dncount(&self, id: TupleId) -> Result<(), SlotBoxError> {
         let mut inner = self.inner.lock().unwrap();
         let page_handle = inner.page_for(id.page)?;
@@ -143,6 +146,7 @@ impl SlotBox {
         Ok(())
     }
 
+    #[inline(always)]
     pub fn get(&self, id: TupleId) -> Result<Pin<&[u8]>, SlotBoxError> {
         let inner = self.inner.lock().unwrap();
         let page_handle = inner.page_for(id.page)?;
@@ -448,15 +452,18 @@ impl PageSpace {
         }
     }
 
+    #[inline(always)]
     fn sort(&mut self) {
         self.entries.sort()
     }
 
+    #[inline(always)]
     fn insert(&mut self, available: usize, bid: Bid) {
         self.entries.push(encode(bid.0 as PageId, available));
         self.sort();
     }
 
+    #[inline(always)]
     fn seek(&self, pid: PageId) -> Option<usize> {
         self.entries
             .iter()
@@ -529,6 +536,7 @@ impl PageSpace {
             .map(|entry| (entry & 0xFFFF_FFFF_FFFF) as PageId)
     }
 
+    #[inline(always)]
     fn len(&self) -> usize {
         self.entries.len()
     }

diff --git a/crates/db/src/tuplebox/tuples/slotted_page.rs b/crates/db/src/tuplebox/tuples/slotted_page.rs
@@ -693,6 +693,7 @@ impl<'a> PageWriteGuard<'a> {
         sp.remove_slot(slot_id)
     }
 
+    #[inline(always)]
     pub fn upcount(&mut self, slot_id: SlotId) -> Result<(), SlotBoxError> {
         let sp = SlottedPage {
             base_address: self.base_address,
@@ -711,6 +712,7 @@ impl<'a> PageWriteGuard<'a> {
 }
 
 impl<'a> Drop for PageWriteGuard<'a> {
+    #[inline(always)]
     fn drop(&mut self) {
         let header = self.header_mut();
         header.unlock_for_writes();
@@ -725,13 +727,14 @@ pub struct PageReadGuard<'a> {
 }
 
 impl<'a> PageReadGuard<'a> {
+    #[inline(always)]
     fn header(&self) -> Pin<&SlottedPageHeader> {
         let header_ptr = self.base_address as *const SlottedPageHeader;
 
         unsafe { Pin::new_unchecked(&*header_ptr) }
     }
 
-    #[inline]
+    #[inline(always)]
     pub fn get_slot(&self, slot_id: SlotId) -> Result<Pin<&'a [u8]>, SlotBoxError> {
         let sp = SlottedPage {
             base_address: self.base_address as _,
@@ -743,6 +746,7 @@ impl<'a> PageReadGuard<'a> {
 }
 
 impl<'a> Drop for PageReadGuard<'a> {
+    #[inline(always)]
     fn drop(&mut self) {
         let header = self.header();
         // Decrement the state by 2 to remove one read-lock.