From 32a1b821e43acd34e9f873c6627fc36180576c73 Mon Sep 17 00:00:00 2001 From: zhuxiujia Date: Tue, 19 Jul 2022 21:37:30 +0800 Subject: [PATCH 1/2] add doc --- src/appender.rs | 1 - src/date.rs | 281 ------------------------------------------------ src/lib.rs | 1 - 3 files changed, 283 deletions(-) delete mode 100644 src/date.rs diff --git a/src/appender.rs b/src/appender.rs index 561f035..e5b5b59 100644 --- a/src/appender.rs +++ b/src/appender.rs @@ -1,5 +1,4 @@ use crate::appender::Command::CommandRecord; -use crate::date; use crossbeam_utils::sync::WaitGroup; use log::LevelFilter; use std::ops::{Add, Sub}; diff --git a/src/date.rs b/src/date.rs deleted file mode 100644 index 59e6024..0000000 --- a/src/date.rs +++ /dev/null @@ -1,281 +0,0 @@ -use std::cmp; -use std::fmt::{self, Display, Formatter, Pointer}; -use std::str::FromStr; -use std::time::{Duration, SystemTime, UNIX_EPOCH}; - -use crate::error::LogError as Error; - -/// Log timestamp type. -/// -/// Parse using `FromStr` impl. -/// Format using the `Display` trait. -/// Convert timestamp into/from `SytemTime` to use. -/// Supports comparsion and sorting. -#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)] -pub struct LogDate { - /// 0...999999 - pub micro: u32, - /// 0...59 - pub sec: u8, - /// 0...59 - pub min: u8, - /// 0...23 - pub hour: u8, - /// 1...31 - pub day: u8, - /// 1...12 - pub mon: u8, - /// 1970...9999 - pub year: u16, -} - -impl LogDate { - fn is_valid(&self) -> bool { - self.sec < 60 - && self.min < 60 - && self.hour < 24 - && self.day > 0 - && self.day < 32 - && self.mon > 0 - && self.mon <= 12 - && self.year >= 1970 - && self.year <= 9999 - && &LogDate::from(SystemTime::from(*self)) == self - } -} - -impl From for LogDate { - fn from(v: SystemTime) -> LogDate { - let dur = v - .duration_since(UNIX_EPOCH) - .expect("all times should be after the epoch"); - let secs_since_epoch = dur.as_secs(); - - if secs_since_epoch >= 253402300800 { - // year 9999 - panic!("date must be before year 9999"); - } - - /* 2000-03-01 (mod 400 year, immediately after feb29 */ - const LEAPOCH: i64 = 11017; - const DAYS_PER_400Y: i64 = 365 * 400 + 97; - const DAYS_PER_100Y: i64 = 365 * 100 + 24; - const DAYS_PER_4Y: i64 = 365 * 4 + 1; - - let days = (secs_since_epoch / 86400) as i64 - LEAPOCH; - let secs_of_day = secs_since_epoch % 86400; - - let mut qc_cycles = days / DAYS_PER_400Y; - let mut remdays = days % DAYS_PER_400Y; - - if remdays < 0 { - remdays += DAYS_PER_400Y; - qc_cycles -= 1; - } - - let mut c_cycles = remdays / DAYS_PER_100Y; - if c_cycles == 4 { - c_cycles -= 1; - } - remdays -= c_cycles * DAYS_PER_100Y; - - let mut q_cycles = remdays / DAYS_PER_4Y; - if q_cycles == 25 { - q_cycles -= 1; - } - remdays -= q_cycles * DAYS_PER_4Y; - - let mut remyears = remdays / 365; - if remyears == 4 { - remyears -= 1; - } - remdays -= remyears * 365; - - let mut year = 2000 + remyears + 4 * q_cycles + 100 * c_cycles + 400 * qc_cycles; - - let months = [31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31, 29]; - let mut mon = 0; - for mon_len in months.iter() { - mon += 1; - if remdays < *mon_len { - break; - } - remdays -= *mon_len; - } - let mday = remdays + 1; - let mon = if mon + 2 > 12 { - year += 1; - mon - 10 - } else { - mon + 2 - }; - - LogDate { - micro: (dur - Duration::from_secs(dur.as_secs())).as_micros() as u32, - sec: (secs_of_day % 60) as u8, - min: ((secs_of_day % 3600) / 60) as u8, - hour: (secs_of_day / 3600) as u8, - day: mday as u8, - mon: mon as u8, - year: year as u16, - } - } -} - -impl From for SystemTime { - fn from(v: LogDate) -> SystemTime { - let leap_years = - ((v.year - 1) - 1968) / 4 - ((v.year - 1) - 1900) / 100 + ((v.year - 1) - 1600) / 400; - let mut ydays = match v.mon { - 1 => 0, - 2 => 31, - 3 => 59, - 4 => 90, - 5 => 120, - 6 => 151, - 7 => 181, - 8 => 212, - 9 => 243, - 10 => 273, - 11 => 304, - 12 => 334, - _ => unreachable!(), - } + v.day as u64 - - 1; - if is_leap_year(v.year) && v.mon > 2 { - ydays += 1; - } - let days = (v.year as u64 - 1970) * 365 + leap_years as u64 + ydays; - UNIX_EPOCH - + Duration::from_secs( - v.sec as u64 + v.min as u64 * 60 + v.hour as u64 * 3600 + days * 86400, - ) - } -} - -impl FromStr for LogDate { - type Err = Error; - - /// from RFC3339Nano = "2006-01-02T15:04:05.999999999" - fn from_str(s: &str) -> Result { - //"0000-00-00 00:00:00.000000"; - let mut date = LogDate { - micro: 0, - sec: 0, - min: 0, - hour: 0, - day: 0, - mon: 0, - year: 0, - }; - let bytes = s.as_bytes(); - if bytes.len() > 4 { - if let Ok(year) = std::str::from_utf8(&bytes[0..4]) - .unwrap_or_default() - .parse::() - { - date.year = year; - } - if let Ok(mon) = std::str::from_utf8(&bytes[5..7]) - .unwrap_or_default() - .parse::() - { - date.mon = mon; - } - if let Ok(day) = std::str::from_utf8(&bytes[8..10]) - .unwrap_or_default() - .parse::() - { - date.day = day; - } - if let Ok(hour) = std::str::from_utf8(&bytes[11..13]) - .unwrap_or_default() - .parse::() - { - date.hour = hour; - } - if let Ok(min) = std::str::from_utf8(&bytes[14..16]) - .unwrap_or_default() - .parse::() - { - date.min = min; - } - if let Ok(sec) = std::str::from_utf8(&bytes[17..19]) - .unwrap_or_default() - .parse::() - { - date.sec = sec; - } - if let Ok(ns) = std::str::from_utf8(&bytes[20..26]) - .unwrap_or_default() - .parse::() - { - date.micro = ns; - } - } - Ok(date) - } -} - -impl Display for LogDate { - /// fmt RFC3339Nano = "2006-01-02T15:04:05.999999999" - fn fmt(&self, f: &mut Formatter) -> fmt::Result { - let mut buf: [u8; 26] = *b"0000-00-00 00:00:00.000000"; - - buf[0] = b'0' + (self.year / 1000) as u8; - buf[1] = b'0' + (self.year / 100 % 10) as u8; - buf[2] = b'0' + (self.year / 10 % 10) as u8; - buf[3] = b'0' + (self.year % 10) as u8; - - buf[5] = b'0' + (self.mon / 10) as u8; - buf[6] = b'0' + (self.mon % 10) as u8; - - buf[8] = b'0' + (self.day / 10) as u8; - buf[9] = b'0' + (self.day % 10) as u8; - - buf[11] = b'0' + (self.hour / 10) as u8; - buf[12] = b'0' + (self.hour % 10) as u8; - buf[14] = b'0' + (self.min / 10) as u8; - buf[15] = b'0' + (self.min % 10) as u8; - buf[17] = b'0' + (self.sec / 10) as u8; - buf[18] = b'0' + (self.sec % 10) as u8; - - buf[20] = b'0' + (self.micro / 100000 % 10) as u8; - buf[21] = b'0' + (self.micro / 10000 % 10) as u8; - buf[22] = b'0' + (self.micro / 1000 % 10) as u8; - buf[23] = b'0' + (self.micro / 100 % 10) as u8; - buf[24] = b'0' + (self.micro / 10 % 10) as u8; - buf[25] = b'0' + (self.micro % 10) as u8; - - f.write_str(std::str::from_utf8(&buf[..]).unwrap()) - } -} - -impl Ord for LogDate { - fn cmp(&self, other: &LogDate) -> cmp::Ordering { - SystemTime::from(*self).cmp(&SystemTime::from(*other)) - } -} - -impl PartialOrd for LogDate { - fn partial_cmp(&self, other: &LogDate) -> Option { - Some(self.cmp(other)) - } -} - -fn is_leap_year(y: u16) -> bool { - y % 4 == 0 && (y % 100 != 0 || y % 400 == 0) -} - -#[cfg(test)] -mod test { - use crate::date::LogDate; - use std::str::FromStr; - - #[test] - fn test_date() { - let d = LogDate::from_str("1234-12-13 11:12:13.123456").unwrap(); - println!("{}", d); - assert_eq!("1234-12-13 11:12:13.123456".to_string(), d.to_string()); - } -} diff --git a/src/lib.rs b/src/lib.rs index 92bd1bb..92b7f08 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,7 +9,6 @@ pub mod appender; pub mod bencher; pub mod config; pub mod consts; -pub mod date; pub mod error; pub mod fast_log; pub mod filter; From 4db9529a5a2c2208ea7c953299303e80fff23de3 Mon Sep 17 00:00:00 2001 From: zhuxiujia Date: Tue, 19 Jul 2022 21:39:32 +0800 Subject: [PATCH 2/2] clear warning --- src/appender.rs | 3 +-- src/fast_log.rs | 4 ++-- src/plugin/file_split.rs | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/appender.rs b/src/appender.rs index e5b5b59..5c594ae 100644 --- a/src/appender.rs +++ b/src/appender.rs @@ -1,8 +1,7 @@ use crate::appender::Command::CommandRecord; use crossbeam_utils::sync::WaitGroup; use log::LevelFilter; -use std::ops::{Add, Sub}; -use std::time::{Duration, SystemTime}; +use std::time::{SystemTime}; /// LogAppender append logs /// Appender will be running on single main thread,please do_log for new thread or new an Future diff --git a/src/fast_log.rs b/src/fast_log.rs index d159d6b..3e05f17 100644 --- a/src/fast_log.rs +++ b/src/fast_log.rs @@ -1,8 +1,8 @@ use log::{LevelFilter, Log, Metadata, Record}; -use std::ops::{Deref, DerefMut}; +use std::ops::{Deref}; use std::sync::atomic::{AtomicI32, AtomicI64, Ordering}; -use crate::appender::{Command, FastLogRecord, RecordFormat}; +use crate::appender::{Command, FastLogRecord}; use crate::config::Config; use crate::error::LogError; use crate::filter::Filter; diff --git a/src/plugin/file_split.rs b/src/plugin/file_split.rs index 0531d4f..2515835 100644 --- a/src/plugin/file_split.rs +++ b/src/plugin/file_split.rs @@ -6,7 +6,6 @@ use crate::appender::{Command, FastLogRecord, LogAppender}; use crate::consts::LogSize; use crate::error::LogError; use crate::{chan, Receiver, Sender}; -use std::ops::Sub; use std::str::FromStr; use std::time::Duration;