Skip to content

Support Oracle Date/Timestamp arrowstream parity with arrow. #870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dbascoules wants to merge 3 commits into
base: main
Choose a base branch
from
+44 −34
Open

Support Oracle Date/Timestamp arrowstream parity with arrow. #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffba3d2
Support Oracle Date/Timestamp arrowstream parity with arrow.
dbascoules Dec 2, 2025
b3a47b8
Better timestamp support with timestamp[us] instead of timestamp[ns] …
dbascoules Dec 5, 2025
3a50001
`cargo fmt` 🫡
dbascoules Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions connectorx/src/destinations/arrow/arrow_assoc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,7 @@ fn naive_date_to_arrow(nd: NaiveDate) -> i32 {
}

fn naive_datetime_to_arrow(nd: NaiveDateTime) -> i64 {
nd.and_utc()
.timestamp_nanos_opt()
.unwrap_or_else(|| panic!("out of range DateTime"))
nd.and_utc().timestamp_micros()
}

impl ArrowAssoc for Option<NaiveDate> {
Expand Down Expand Up @@ -328,10 +326,10 @@ impl ArrowAssoc for NaiveDate {
}

impl ArrowAssoc for Option<NaiveDateTime> {
type Builder = TimestampNanosecondBuilder;
type Builder = TimestampMicrosecondBuilder;

fn builder(nrows: usize) -> Self::Builder {
TimestampNanosecondBuilder::with_capacity(nrows)
TimestampMicrosecondBuilder::with_capacity(nrows)
}

fn append(builder: &mut Self::Builder, value: Option<NaiveDateTime>) -> Result<()> {
Expand All @@ -342,17 +340,17 @@ impl ArrowAssoc for Option<NaiveDateTime> {
fn field(header: &str) -> Field {
Field::new(
header,
ArrowDataType::Timestamp(TimeUnit::Nanosecond, None),
ArrowDataType::Timestamp(TimeUnit::Microsecond, None),
true,
)
}
}

impl ArrowAssoc for NaiveDateTime {
type Builder = TimestampNanosecondBuilder;
type Builder = TimestampMicrosecondBuilder;

fn builder(nrows: usize) -> Self::Builder {
TimestampNanosecondBuilder::with_capacity(nrows)
TimestampMicrosecondBuilder::with_capacity(nrows)
}

fn append(builder: &mut Self::Builder, value: NaiveDateTime) -> Result<()> {
Expand All @@ -363,7 +361,7 @@ impl ArrowAssoc for NaiveDateTime {
fn field(header: &str) -> Field {
Field::new(
header,
ArrowDataType::Timestamp(TimeUnit::Nanosecond, None),
ArrowDataType::Timestamp(TimeUnit::Microsecond, None),
false,
)
}
Expand Down
16 changes: 7 additions & 9 deletions connectorx/src/destinations/arrowstream/arrow_assoc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,7 @@ fn naive_date_to_arrow(nd: NaiveDate) -> i32 {
}

fn naive_datetime_to_arrow(nd: NaiveDateTime) -> i64 {
nd.and_utc()
.timestamp_nanos_opt()
.unwrap_or_else(|| panic!("out of range DateTime"))
nd.and_utc().timestamp_micros()
}

impl ArrowAssoc for Option<NaiveDate> {
Expand Down Expand Up @@ -325,10 +323,10 @@ impl ArrowAssoc for NaiveDate {
}

impl ArrowAssoc for Option<NaiveDateTime> {
type Builder = TimestampNanosecondBuilder;
type Builder = TimestampMicrosecondBuilder;

fn builder(nrows: usize) -> Self::Builder {
TimestampNanosecondBuilder::with_capacity(nrows)
TimestampMicrosecondBuilder::with_capacity(nrows)
}

fn append(builder: &mut Self::Builder, value: Option<NaiveDateTime>) -> Result<()> {
Expand All @@ -339,17 +337,17 @@ impl ArrowAssoc for Option<NaiveDateTime> {
fn field(header: &str) -> Field {
Field::new(
header,
ArrowDataType::Timestamp(TimeUnit::Nanosecond, None),
ArrowDataType::Timestamp(TimeUnit::Microsecond, None),
true,
)
}
}

impl ArrowAssoc for NaiveDateTime {
type Builder = TimestampNanosecondBuilder;
type Builder = TimestampMicrosecondBuilder;

fn builder(nrows: usize) -> Self::Builder {
TimestampNanosecondBuilder::with_capacity(nrows)
TimestampMicrosecondBuilder::with_capacity(nrows)
}

fn append(builder: &mut Self::Builder, value: NaiveDateTime) -> Result<()> {
Expand All @@ -360,7 +358,7 @@ impl ArrowAssoc for NaiveDateTime {
fn field(header: &str) -> Field {
Field::new(
header,
ArrowDataType::Timestamp(TimeUnit::Nanosecond, None),
ArrowDataType::Timestamp(TimeUnit::Microsecond, None),
false,
)
}
Expand Down
46 changes: 30 additions & 16 deletions connectorx/src/transports/oracle_arrowstream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use crate::{
destinations::arrowstream::{
typesystem::ArrowTypeSystem, ArrowDestination, ArrowDestinationError,
typesystem::{ArrowTypeSystem, DateTimeWrapperMicro, NaiveDateTimeWrapperMicro},
ArrowDestination, ArrowDestinationError,
},
impl_transport,
sources::oracle::{OracleSource, OracleSourceError, OracleTypeSystem},
Expand Down Expand Up @@ -30,20 +31,33 @@ impl_transport!(
systems = OracleTypeSystem => ArrowTypeSystem,
route = OracleSource => ArrowDestination,
mappings = {
{ NumFloat[f64] => Float64[f64] | conversion auto }
{ NumDecimal[Decimal] => Decimal[Decimal] | conversion auto }
{ Float[f64] => Float64[f64] | conversion none }
{ BinaryFloat[f64] => Float64[f64] | conversion none }
{ BinaryDouble[f64] => Float64[f64] | conversion none }
{ NumInt[i64] => Int64[i64] | conversion auto }
{ Blob[Vec<u8>] => LargeBinary[Vec<u8>] | conversion auto }
{ Clob[String] => LargeUtf8[String] | conversion none }
{ VarChar[String] => LargeUtf8[String] | conversion auto }
{ Char[String] => LargeUtf8[String] | conversion none }
{ NVarChar[String] => LargeUtf8[String] | conversion none }
{ NChar[String] => LargeUtf8[String] | conversion none }
{ Date[NaiveDateTime] => Date64[NaiveDateTime] | conversion auto }
{ Timestamp[NaiveDateTime] => Date64[NaiveDateTime] | conversion none }
{ TimestampTz[DateTime<Utc>] => DateTimeTz[DateTime<Utc>] | conversion auto }
{ NumFloat[f64] => Float64[f64] | conversion auto }
{ NumDecimal[Decimal] => Decimal[Decimal] | conversion auto }
{ Float[f64] => Float64[f64] | conversion none }
{ BinaryFloat[f64] => Float64[f64] | conversion none }
{ BinaryDouble[f64] => Float64[f64] | conversion none }
{ NumInt[i64] => Int64[i64] | conversion auto }
{ Blob[Vec<u8>] => LargeBinary[Vec<u8>] | conversion auto }
{ Clob[String] => LargeUtf8[String] | conversion none }
{ VarChar[String] => LargeUtf8[String] | conversion auto }
{ Char[String] => LargeUtf8[String] | conversion none }
{ NVarChar[String] => LargeUtf8[String] | conversion none }
{ NChar[String] => LargeUtf8[String] | conversion none }
{ Date[NaiveDateTime] => Date64Micro[NaiveDateTimeWrapperMicro] | conversion option }
{ Timestamp[NaiveDateTime] => Date64Micro[NaiveDateTimeWrapperMicro] | conversion none }
{ TimestampNano[NaiveDateTime] => Date64[NaiveDateTime] | conversion auto }
{ TimestampTz[DateTime<Utc>] => DateTimeTzMicro[DateTimeWrapperMicro] | conversion option }
{ TimestampTzNano[DateTime<Utc>] => DateTimeTz[DateTime<Utc>] | conversion auto }
}
);
impl TypeConversion<NaiveDateTime, NaiveDateTimeWrapperMicro> for OracleArrowTransport {
fn convert(val: NaiveDateTime) -> NaiveDateTimeWrapperMicro {
NaiveDateTimeWrapperMicro(val)
}
}

impl TypeConversion<DateTime<Utc>, DateTimeWrapperMicro> for OracleArrowTransport {
fn convert(val: DateTime<Utc>) -> DateTimeWrapperMicro {
DateTimeWrapperMicro(val)
}
}