From c9efdec8db8115a56bb6044e0d0547aac7583872 Mon Sep 17 00:00:00 2001 From: Egor Suvorov Date: Thu, 21 Apr 2022 23:08:13 +0300 Subject: [PATCH] postgres_ffi: find_end_of_wal_segment: improve name of wal_crc variable Now it reflects the field it's mirroring. --- libs/postgres_ffi/src/xlog_utils.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/postgres_ffi/src/xlog_utils.rs b/libs/postgres_ffi/src/xlog_utils.rs index ce036bc49a..9fcf78acb1 100644 --- a/libs/postgres_ffi/src/xlog_utils.rs +++ b/libs/postgres_ffi/src/xlog_utils.rs @@ -150,7 +150,7 @@ fn find_end_of_wal_segment( // step back to the beginning of the page to read it in... let mut offs: usize = start_offset - start_offset % XLOG_BLCKSZ; let mut contlen: usize = 0; - let mut wal_crc: u32 = 0; + let mut xl_crc: u32 = 0; let mut crc: u32 = 0; let mut rec_offs: usize = 0; let mut buf = [0u8; XLOG_BLCKSZ]; @@ -231,7 +231,7 @@ fn find_end_of_wal_segment( } if rec_offs <= XLOG_RECORD_CRC_OFFS && rec_offs + n >= XLOG_SIZE_OF_XLOG_RECORD { let crc_offs = page_offs - rec_offs + XLOG_RECORD_CRC_OFFS; - wal_crc = LittleEndian::read_u32(&buf[crc_offs..crc_offs + 4]); + xl_crc = LittleEndian::read_u32(&buf[crc_offs..crc_offs + 4]); crc = crc32c_append(0, &buf[crc_offs + 4..page_offs + n]); } else { crc = crc32c_append(crc, &buf[page_offs..page_offs + n]); @@ -243,14 +243,14 @@ fn find_end_of_wal_segment( if contlen == 0 { crc = crc32c_append(crc, &rec_hdr); offs = (offs + 7) & !7; // pad on 8 bytes boundary */ - if crc == wal_crc { + if crc == xl_crc { // record is valid, advance the result to its end (with // alignment to the next record taken into account) last_valid_rec_pos = offs; } else { info!( "CRC mismatch {} vs {} at {}", - crc, wal_crc, last_valid_rec_pos + crc, xl_crc, last_valid_rec_pos ); break; }