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

Remove unnecessary dependency to 'log' crate (#12763)

Browse Source 
We use 'tracing' everywhere.
This commit is contained in:
Heikki Linnakangas
2025-07-29 14:08:22 +03:00
committed by GitHub
parent 1ed7252950
commit 568927a8a0
5 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@@ -5077,7 +5077,6 @@ dependencies = [
"crc32c", "crc32c",
"criterion", "criterion",
"env_logger", "env_logger",
"log",
"once_cell", "once_cell",
"postgres", "postgres",
"postgres_ffi_types", "postgres_ffi_types",

1
libs/postgres_ffi/Cargo.toml
View File

@@ -11,7 +11,6 @@ anyhow.workspace = true
crc32c.workspace = true crc32c.workspace = true
criterion.workspace = true criterion.workspace = true
once_cell.workspace = true once_cell.workspace = true
log.workspace = true
pprof.workspace = true pprof.workspace = true
thiserror.workspace = true thiserror.workspace = true
serde.workspace = true serde.workspace = true

3
libs/postgres_ffi/src/nonrelfile_utils.rs
View File

@@ -4,12 +4,11 @@
use crate::pg_constants; use crate::pg_constants;
use crate::transaction_id_precedes; use crate::transaction_id_precedes;
use bytes::BytesMut; use bytes::BytesMut;
use log::*;
use super::bindings::MultiXactId; use super::bindings::MultiXactId;
pub fn transaction_id_set_status(xid: u32, status: u8, page: &mut BytesMut) { pub fn transaction_id_set_status(xid: u32, status: u8, page: &mut BytesMut) {
trace!( tracing::trace!(
"handle_apply_request for RM_XACT_ID-{} (1-commit, 2-abort, 3-sub_commit)", "handle_apply_request for RM_XACT_ID-{} (1-commit, 2-abort, 3-sub_commit)",
status status
); );

3
libs/postgres_ffi/src/waldecoder_handler.rs
View File

@@ -14,7 +14,6 @@ use super::xlog_utils::*;
use crate::WAL_SEGMENT_SIZE; use crate::WAL_SEGMENT_SIZE;
use bytes::{Buf, BufMut, Bytes, BytesMut}; use bytes::{Buf, BufMut, Bytes, BytesMut};
use crc32c::*; use crc32c::*;
use log::*;
use std::cmp::min; use std::cmp::min;
use std::num::NonZeroU32; use std::num::NonZeroU32;
use utils::lsn::Lsn; use utils::lsn::Lsn;
@@ -236,7 +235,7 @@ impl WalStreamDecoderHandler for WalStreamDecoder {
// XLOG_SWITCH records are special. If we see one, we need to skip // XLOG_SWITCH records are special. If we see one, we need to skip
// to the next WAL segment. // to the next WAL segment.
let next_lsn = if xlogrec.is_xlog_switch_record() { let next_lsn = if xlogrec.is_xlog_switch_record() {
trace!("saw xlog switch record at {}", self.lsn); tracing::trace!("saw xlog switch record at {}", self.lsn);
self.lsn + self.lsn.calc_padding(WAL_SEGMENT_SIZE as u64) self.lsn + self.lsn.calc_padding(WAL_SEGMENT_SIZE as u64)
} else { } else {
// Pad to an 8-byte boundary // Pad to an 8-byte boundary

10
libs/postgres_ffi/src/xlog_utils.rs
View File

@@ -23,8 +23,6 @@ use crate::{WAL_SEGMENT_SIZE, XLOG_BLCKSZ};
use bytes::BytesMut; use bytes::BytesMut;
use bytes::{Buf, Bytes}; use bytes::{Buf, Bytes};
use log::*;
use serde::Serialize; use serde::Serialize;
use std::ffi::{CString, OsStr}; use std::ffi::{CString, OsStr};
use std::fs::File; use std::fs::File;
@@ -235,7 +233,7 @@ pub fn find_end_of_wal(
let mut curr_lsn = start_lsn; let mut curr_lsn = start_lsn;
let mut buf = [0u8; XLOG_BLCKSZ]; let mut buf = [0u8; XLOG_BLCKSZ];
let pg_version = MY_PGVERSION; let pg_version = MY_PGVERSION;
debug!("find_end_of_wal PG_VERSION: {}", pg_version); tracing::debug!("find_end_of_wal PG_VERSION: {}", pg_version);
let mut decoder = WalStreamDecoder::new(start_lsn, pg_version); let mut decoder = WalStreamDecoder::new(start_lsn, pg_version);
@@ -247,7 +245,7 @@ pub fn find_end_of_wal(
match open_wal_segment(&seg_file_path)? { match open_wal_segment(&seg_file_path)? {
None => { None => {
// no more segments // no more segments
debug!( tracing::debug!(
"find_end_of_wal reached end at {:?}, segment {:?} doesn't exist", "find_end_of_wal reached end at {:?}, segment {:?} doesn't exist",
result, seg_file_path result, seg_file_path
); );
@@ -260,7 +258,7 @@ pub fn find_end_of_wal(
while curr_lsn.segment_number(wal_seg_size) == segno { while curr_lsn.segment_number(wal_seg_size) == segno {
let bytes_read = segment.read(&mut buf)?; let bytes_read = segment.read(&mut buf)?;
if bytes_read == 0 { if bytes_read == 0 {
debug!( tracing::debug!(
"find_end_of_wal reached end at {:?}, EOF in segment {:?} at offset {}", "find_end_of_wal reached end at {:?}, EOF in segment {:?} at offset {}",
result, result,
seg_file_path, seg_file_path,
@@ -276,7 +274,7 @@ pub fn find_end_of_wal(
match decoder.poll_decode() { match decoder.poll_decode() {
Ok(Some(record)) => result = record.0, Ok(Some(record)) => result = record.0,
Err(e) => { Err(e) => {
debug!( tracing::debug!(
"find_end_of_wal reached end at {:?}, decode error: {:?}", "find_end_of_wal reached end at {:?}, decode error: {:?}",
result, e result, e
); );