rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-06 21:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts with main branch

Browse Source
This commit is contained in:
Konstantin Knizhnik
2021-05-20 14:39:27 +03:00
parent 20b6279beb
commit 3645133700
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
walkeeper/src/receive_wal.rs
View File

@@ -360,7 +360,7 @@ impl ReceiveWalConn {
const ZERO_BLOCK: &[u8] = &[0u8; XLOG_BLCKSZ];
/* Extract WAL location for this block */
let mut xlogoff = start_pos.segment_offset(wal_seg_size as u64) as usize;
let mut xlogoff = start_pos.segment_offset(wal_seg_size) as usize;
while bytes_left != 0 {
let bytes_to_write;
@@ -376,7 +376,7 @@ impl ReceiveWalConn {
}
/* Open file */
let segno = start_pos.segment_number(wal_seg_size as u64);
let segno = start_pos.segment_number(wal_seg_size);
let wal_file_name = XLogFileName(timeline, segno, wal_seg_size);
let wal_file_path = self
.conf
@@ -435,7 +435,7 @@ impl ReceiveWalConn {
xlogoff += bytes_to_write;
/* Did we reach the end of a WAL segment? */
if start_pos.segment_offset(wal_seg_size as u64) == 0 {
if start_pos.segment_offset(wal_seg_size) == 0 {
xlogoff = 0;
if partial {
fs::rename(&wal_file_partial_path, &wal_file_path)?;

6
walkeeper/src/replication.rs
View File

@@ -175,7 +175,7 @@ impl ReplicationConn {
Some(file) => file,
None => {
// Open a new file.
let segno = start_pos.segment_number(wal_seg_size as u64);
let segno = start_pos.segment_number(wal_seg_size);
let wal_file_name = XLogFileName(timeline, segno, wal_seg_size);
let timeline_id = self.timeline.get().timelineid.to_string();
let wal_file_path = self.conf.data_dir.join(timeline_id).join(wal_file_name);
@@ -183,7 +183,7 @@ impl ReplicationConn {
}
};
let xlogoff = start_pos.segment_offset(wal_seg_size as u64) as usize;
let xlogoff = start_pos.segment_offset(wal_seg_size) as usize;
// How much to read and send in message? We cannot cross the WAL file
// boundary, and we don't want send more than MAX_SEND_SIZE.
@@ -223,7 +223,7 @@ impl ReplicationConn {
// Decide whether to reuse this file. If we don't set wal_file here
// a new file will be opened next time.
if start_pos.segment_offset(wal_seg_size as u64) != 0 {
if start_pos.segment_offset(wal_seg_size) != 0 {
wal_file = Some(file);
}
}