diff --git a/src/pagecache/constants.rs b/src/pagecache/constants.rs index 563a95f8e..a796b7d28 100644 --- a/src/pagecache/constants.rs +++ b/src/pagecache/constants.rs @@ -1,12 +1,12 @@ use super::*; -// kind: u8 1 -// pid: u64 8 -// lsn: i64 8 -// len: u64 8 // crc: u32 4 +// kind: u8 1 +// seg num: u64 9 (varint) +// pid: u64 9 (varint) +// len: u64 9 (varint) /// Log messages have a header that might eb up to this length. -pub const MAX_MSG_HEADER_LEN: usize = 29; +pub const MAX_MSG_HEADER_LEN: usize = 32; /// Log segments have a header of this length. pub const SEG_HEADER_LEN: usize = 20; diff --git a/src/pagecache/logger.rs b/src/pagecache/logger.rs index 63e71bb29..c42769bf3 100644 --- a/src/pagecache/logger.rs +++ b/src/pagecache/logger.rs @@ -488,11 +488,11 @@ impl Drop for Log { /// All log messages are prepended with this header #[derive(Debug, Copy, Clone, PartialEq)] pub struct MessageHeader { + pub crc32: u32, pub kind: MessageKind, pub segment_number: SegmentNumber, pub pid: PageId, pub len: u64, - pub crc32: u32, } /// A number representing a segment number.