rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-27 18:10:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement from_bytes for XLogPageHeader structs

Browse Source
This commit is contained in:
anastasia
2021-06-04 15:46:47 +03:00
committed by lubennikovaav
parent c31a5e2c8f
commit 2b0193e6bf
2 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pageserver/src/waldecoder.rs
View File

@@ -79,7 +79,8 @@ impl WalStreamDecoder {
return Ok(None);
}
let hdr = self.decode_XLogLongPageHeaderData();
let hdr = XLogLongPageHeaderData::from_bytes(&mut self.inputbuf);
if hdr.std.xlp_pageaddr != self.lsn.0 {
return Err(WalDecodeError {
msg: "invalid xlog segment header".into(),
@@ -95,7 +96,8 @@ impl WalStreamDecoder {
return Ok(None);
}
let hdr = self.decode_XLogPageHeaderData();
let hdr = XLogPageHeaderData::from_bytes(&mut self.inputbuf);
if hdr.xlp_pageaddr != self.lsn.0 {
return Err(WalDecodeError {
msg: "invalid xlog page header".into(),
@@ -184,40 +186,6 @@ impl WalStreamDecoder {
// deal with xlog_switch records
}
#[allow(non_snake_case)]
fn decode_XLogPageHeaderData(&mut self) -> XLogPageHeaderData {
let buf = &mut self.inputbuf;
// FIXME: Assume little-endian
let hdr: XLogPageHeaderData = XLogPageHeaderData {
xlp_magic: buf.get_u16_le(),
xlp_info: buf.get_u16_le(),
xlp_tli: buf.get_u32_le(),
xlp_pageaddr: buf.get_u64_le(),
xlp_rem_len: buf.get_u32_le(),
};
// 4 bytes of padding, on 64-bit systems
buf.advance(4);
// FIXME: check that hdr.xlp_rem_len matches self.contlen
//println!("next xlog page (xlp_rem_len: {})", hdr.xlp_rem_len);
hdr
}
#[allow(non_snake_case)]
fn decode_XLogLongPageHeaderData(&mut self) -> XLogLongPageHeaderData {
let hdr: XLogLongPageHeaderData = XLogLongPageHeaderData {
std: self.decode_XLogPageHeaderData(),
xlp_sysid: self.inputbuf.get_u64_le(),
xlp_seg_size: self.inputbuf.get_u32_le(),
xlp_xlog_blcksz: self.inputbuf.get_u32_le(),
};
hdr
}
}
#[allow(dead_code)]

26
postgres_ffi/src/xlog_utils.rs
View File

@@ -301,8 +301,23 @@ pub struct XLogPageHeaderData {
pub xlp_tli: u32, /* TimeLineID of first record on page */
pub xlp_pageaddr: u64, /* XLOG address of this page */
pub xlp_rem_len: u32, /* total len of remaining data for record */
padding: u32, /* Add explicit padding */
}
impl XLogPageHeaderData {
pub fn from_bytes<B: Buf>(buf: &mut B) -> XLogPageHeaderData {
XLogPageHeaderData {
xlp_magic: buf.get_u16_le(),
xlp_info: buf.get_u16_le(),
xlp_tli: buf.get_u32_le(),
xlp_pageaddr: buf.get_u64_le(),
xlp_rem_len: buf.get_u32_le(),
padding: buf.get_u32_le(),
}
}
}
#[repr(C)]
#[derive(Debug)]
pub struct XLogLongPageHeaderData {
@@ -311,3 +326,14 @@ pub struct XLogLongPageHeaderData {
pub xlp_seg_size: u32, /* just as a cross-check */
pub xlp_xlog_blcksz: u32, /* just as a cross-check */
}
impl XLogLongPageHeaderData {
pub fn from_bytes<B: Buf>(buf: &mut B) -> XLogLongPageHeaderData {
XLogLongPageHeaderData {
std: XLogPageHeaderData::from_bytes(buf),
xlp_sysid: buf.get_u64_le(),
xlp_seg_size: buf.get_u32_le(),
xlp_xlog_blcksz: buf.get_u32_le(),
}
}
}