Skip to content

Commit

Permalink
Do not use deprecated API
Browse files Browse the repository at this point in the history
  • Loading branch information
@msk
msk committed Dec 10, 2024
1 parent 2bc67c9 commit c4a074a
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 4 deletions.
7 changes: 5 additions & 2 deletions src/csv/reader.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ where
fn parse_timestamp(v: &[u8]) -> Result<i64, ParseError> {
Ok(
chrono::NaiveDateTime::parse_from_str(str::from_utf8(v)?, "%Y-%m-%dT%H:%M:%S%.f%:z")?
.and_utc()
.timestamp_nanos_opt()
.unwrap_or_default(),
)
Expand Down Expand Up @@ -577,7 +578,7 @@ mod tests {
let c3 = Column::try_from_slice::<Float64Type>(&c3_v).unwrap();
let c4 = Column::try_from_slice::<Int64Type>(
c4_v.iter()
.map(|v| v.timestamp())
.map(|v| v.and_utc().timestamp())
.collect::<Vec<_>>()
.as_slice(),
)
Expand Down Expand Up @@ -631,7 +632,9 @@ mod tests {
FieldParser::float64(),
FieldParser::timestamp_with_parser(move |v| {
let val: String = v.iter().map(|&c| c as char).collect();
Ok(NaiveDateTime::parse_from_str(&val, "%Y-%m-%d %H:%M:%S")?.timestamp())
Ok(NaiveDateTime::parse_from_str(&val, "%Y-%m-%d %H:%M:%S")?
.and_utc()
.timestamp())
}),
FieldParser::Utf8,
FieldParser::Binary,
Expand Down
17 changes: 15 additions & 2 deletions src/stats.rs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use arrow::datatypes::{Float64Type, Int64Type, UInt32Type, UInt64Type};
use chrono::NaiveDateTime;
use chrono::{DateTime, NaiveDateTime};
use num_traits::ToPrimitive;
use serde::{Deserialize, Serialize};
use statistical::{mean, population_standard_deviation};
Expand Down Expand Up @@ -546,7 +546,9 @@ pub(crate) fn convert_time_intervals(
// The first interval of each day should start with 00:00:00.
let mut interval_idx = v / A_BILLION;
interval_idx = (interval_idx / time_interval) * time_interval;
NaiveDateTime::from_timestamp_opt(interval_idx, 0).unwrap_or_default()
DateTime::from_timestamp(interval_idx, 0)
.unwrap_or_default()
.naive_utc()
})
.collect::<Vec<_>>()
}
Expand Down Expand Up @@ -638,42 +640,49 @@ mod tests {
.unwrap()
.and_hms_opt(6, 10, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 22)
.unwrap()
.and_hms_opt(6, 15, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 21)
.unwrap()
.and_hms_opt(20, 10, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 21)
.unwrap()
.and_hms_opt(20, 10, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 22)
.unwrap()
.and_hms_opt(6, 45, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 21)
.unwrap()
.and_hms_opt(8, 10, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 22)
.unwrap()
.and_hms_opt(9, 10, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
];
Expand Down Expand Up @@ -709,24 +718,28 @@ mod tests {
.unwrap()
.and_hms_opt(0, 3, 20)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 22)
.unwrap()
.and_hms_opt(0, 9, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 22)
.unwrap()
.and_hms_opt(0, 10, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 22)
.unwrap()
.and_hms_opt(1, 15, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
];
Expand Down
15 changes: 15 additions & 0 deletions src/table.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -732,48 +732,56 @@ mod tests {
.unwrap()
.and_hms_opt(0, 0, 10)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2020, 1, 1)
.unwrap()
.and_hms_opt(0, 0, 13)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2020, 1, 1)
.unwrap()
.and_hms_opt(0, 0, 15)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2020, 1, 1)
.unwrap()
.and_hms_opt(0, 0, 22)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2020, 1, 1)
.unwrap()
.and_hms_opt(0, 0, 22)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2020, 1, 1)
.unwrap()
.and_hms_opt(0, 0, 31)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2020, 1, 1)
.unwrap()
.and_hms_opt(0, 0, 33)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2020, 1, 1)
.unwrap()
.and_hms_opt(0, 1, 1)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
];
Expand Down Expand Up @@ -831,42 +839,49 @@ mod tests {
.unwrap()
.and_hms_opt(6, 10, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 22)
.unwrap()
.and_hms_opt(6, 15, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 21)
.unwrap()
.and_hms_opt(20, 10, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 21)
.unwrap()
.and_hms_opt(20, 10, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 22)
.unwrap()
.and_hms_opt(6, 45, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 21)
.unwrap()
.and_hms_opt(8, 10, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
NaiveDate::from_ymd_opt(2019, 9, 22)
.unwrap()
.and_hms_opt(9, 10, 11)
.unwrap()
.and_utc()
.timestamp_nanos_opt()
.unwrap(),
];
Expand Down

0 comments on commit c4a074a

Please sign in to comment.