Skip to content

Commit

Permalink
Remove from ArrowNativeType from conversions
Browse files Browse the repository at this point in the history
  • Loading branch information
tustvold committed Sep 27, 2022
1 parent a7cf274 commit b7016ed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 41 deletions.
36 changes: 0 additions & 36 deletions arrow-buffer/src/native.rs
Expand Up @@ -63,24 +63,6 @@ pub trait ArrowNativeType:
fn to_isize(&self) -> Option<isize> {
None
}

/// Convert native type from i32.
#[inline]
fn from_i32(_: i32) -> Option<Self> {
None
}

/// Convert native type from i64.
#[inline]
fn from_i64(_: i64) -> Option<Self> {
None
}

/// Convert native type from i128.
#[inline]
fn from_i128(_: i128) -> Option<Self> {
None
}
}

impl private::Sealed for i8 {}
Expand Down Expand Up @@ -135,12 +117,6 @@ impl ArrowNativeType for i32 {
fn to_isize(&self) -> Option<isize> {
num::ToPrimitive::to_isize(self)
}

/// Convert native type from i32.
#[inline]
fn from_i32(val: i32) -> Option<Self> {
Some(val)
}
}

impl private::Sealed for i64 {}
Expand All @@ -159,12 +135,6 @@ impl ArrowNativeType for i64 {
fn to_isize(&self) -> Option<isize> {
num::ToPrimitive::to_isize(self)
}

/// Convert native type from i64.
#[inline]
fn from_i64(val: i64) -> Option<Self> {
Some(val)
}
}

impl private::Sealed for i128 {}
Expand All @@ -183,12 +153,6 @@ impl ArrowNativeType for i128 {
fn to_isize(&self) -> Option<isize> {
num::ToPrimitive::to_isize(self)
}

/// Convert native type from i128.
#[inline]
fn from_i128(val: i128) -> Option<Self> {
Some(val)
}
}

impl private::Sealed for u8 {}
Expand Down
10 changes: 5 additions & 5 deletions arrow/src/util/reader_parser.rs
Expand Up @@ -97,20 +97,20 @@ impl Parser for Date32Type {
fn parse(string: &str) -> Option<i32> {
use chrono::Datelike;
let date = string.parse::<chrono::NaiveDate>().ok()?;
Self::Native::from_i32(date.num_days_from_ce() - EPOCH_DAYS_FROM_CE)
Some(date.num_days_from_ce() - EPOCH_DAYS_FROM_CE)
}

fn parse_formatted(string: &str, format: &str) -> Option<i32> {
use chrono::Datelike;
let date = chrono::NaiveDate::parse_from_str(string, format).ok()?;
Self::Native::from_i32(date.num_days_from_ce() - EPOCH_DAYS_FROM_CE)
Some(date.num_days_from_ce() - EPOCH_DAYS_FROM_CE)
}
}

impl Parser for Date64Type {
fn parse(string: &str) -> Option<i64> {
let date_time = string.parse::<chrono::NaiveDateTime>().ok()?;
Self::Native::from_i64(date_time.timestamp_millis())
Some(date_time.timestamp_millis())
}

fn parse_formatted(string: &str, format: &str) -> Option<i64> {
Expand All @@ -132,10 +132,10 @@ impl Parser for Date64Type {
});
if has_zone {
let date_time = chrono::DateTime::parse_from_str(string, format).ok()?;
Self::Native::from_i64(date_time.timestamp_millis())
Some(date_time.timestamp_millis())
} else {
let date_time = chrono::NaiveDateTime::parse_from_str(string, format).ok()?;
Self::Native::from_i64(date_time.timestamp_millis())
Some(date_time.timestamp_millis())
}
}
}

0 comments on commit b7016ed

Please sign in to comment.