Skip to content
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.

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

Support decimal 256 in building insert table statement #48

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ repository = "https://github.com/datafusion-contrib/datafusion-table-providers"
arrow = "52.0.0"
async-stream = { version = "0.3.5", optional = true }
async-trait = "0.1.80"
num-bigint = "0.4.4"
bigdecimal = "0.4.5"
bigdecimal_0_3_0 = { package = "bigdecimal", version = "0.3.0" }
byteorder = "1.5.0"
Expand Down
17 changes: 11 additions & 6 deletions src/sql/arrow_sql_gen/arrow.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use arrow::{
array::{
ArrayBuilder, BinaryBuilder, BooleanBuilder, Date32Builder, Date64Builder,
Decimal128Builder, FixedSizeBinaryBuilder, Float32Builder, Float64Builder, Int16Builder,
Int32Builder, Int64Builder, Int8Builder, IntervalMonthDayNanoBuilder, LargeBinaryBuilder,
LargeStringBuilder, ListBuilder, NullBuilder, StringBuilder, StructBuilder,
Time64NanosecondBuilder, TimestampMicrosecondBuilder, TimestampMillisecondBuilder,
TimestampNanosecondBuilder, TimestampSecondBuilder, UInt16Builder, UInt32Builder,
UInt64Builder, UInt8Builder,
Decimal128Builder, Decimal256Builder, FixedSizeBinaryBuilder, Float32Builder,
Float64Builder, Int16Builder, Int32Builder, Int64Builder, Int8Builder,
IntervalMonthDayNanoBuilder, LargeBinaryBuilder, LargeStringBuilder, ListBuilder,
NullBuilder, StringBuilder, StructBuilder, Time64NanosecondBuilder,
TimestampMicrosecondBuilder, TimestampMillisecondBuilder, TimestampNanosecondBuilder,
TimestampSecondBuilder, UInt16Builder, UInt32Builder, UInt64Builder, UInt8Builder,
},
datatypes::{DataType, TimeUnit},
};
Expand Down Expand Up @@ -43,6 +43,11 @@ pub fn map_data_type_to_array_builder(data_type: &DataType) -> Box<dyn ArrayBuil
.with_precision_and_scale(*precision, *scale)
.unwrap_or_default(),
),
DataType::Decimal256(precision, scale) => Box::new(
Decimal256Builder::new()
.with_precision_and_scale(*precision, *scale)
.unwrap_or_default(),
),
DataType::Timestamp(time_unit, time_zone) => match time_unit {
TimeUnit::Microsecond => {
Box::new(TimestampMicrosecondBuilder::new().with_timezone_opt(time_zone.clone()))
Expand Down
20 changes: 19 additions & 1 deletion src/sql/arrow_sql_gen/statement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use arrow::{
util::display::array_value_to_string,
};
use bigdecimal_0_3_0::BigDecimal;
use num_bigint::BigInt;
use sea_query::{
Alias, ColumnDef, ColumnType, Expr, GenericBuilder, Index, InsertStatement, IntoIden,
IntoIndexColumn, Keyword, MysqlQueryBuilder, OnConflict, PostgresQueryBuilder, Query,
Expand Down Expand Up @@ -217,6 +218,21 @@ impl InsertBuilder {
);
}
}
DataType::Decimal256(_, scale) => {
let array = column.as_any().downcast_ref::<array::Decimal256Array>();
if let Some(valid_array) = array {
if valid_array.is_null(row) {
row_values.push(Keyword::Null.into());
continue;
}

let bigint =
BigInt::from_signed_bytes_le(&valid_array.value(row).to_le_bytes());

println!("{:?}", BigDecimal::new(bigint.clone(), i64::from(*scale)));
phillipleblanc marked this conversation as resolved.
Show resolved Hide resolved
row_values.push(BigDecimal::new(bigint, i64::from(*scale)).into());
}
}
DataType::Date32 => {
let array = column.as_any().downcast_ref::<array::Date32Array>();
if let Some(valid_array) = array {
Expand Down Expand Up @@ -991,7 +1007,9 @@ pub(crate) fn map_data_type_to_column_type(data_type: &DataType) -> ColumnType {
DataType::Utf8 | DataType::LargeUtf8 => ColumnType::Text,
DataType::Boolean => ColumnType::Boolean,
#[allow(clippy::cast_sign_loss)] // This is safe because scale will never be negative
DataType::Decimal128(p, s) => ColumnType::Decimal(Some((u32::from(*p), *s as u32))),
DataType::Decimal128(p, s) | DataType::Decimal256(p, s) => {
ColumnType::Decimal(Some((u32::from(*p), *s as u32)))
}
DataType::Timestamp(_unit, _time_zone) => ColumnType::Timestamp,
DataType::Date32 | DataType::Date64 => ColumnType::Date,
DataType::Time64(_unit) | DataType::Time32(_unit) => ColumnType::Time,
Expand Down
2 changes: 1 addition & 1 deletion tests/arrow_record_batch_gen/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ pub(crate) fn get_arrow_decimal_record_batch() -> RecordBatch {
let decimal128_array =
Decimal128Array::from(vec![i128::from(123), i128::from(222), i128::from(321)]);
let decimal256_array =
Decimal256Array::from(vec![i256::from(123), i256::from(222), i256::from(321)]);
Decimal256Array::from(vec![i256::from(-123), i256::from(222), i256::from(0)]);

let schema = Schema::new(vec![
Field::new("decimal128", DataType::Decimal128(38, 10), false),
Expand Down
2 changes: 0 additions & 2 deletions tests/postgres/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,8 @@ mod test {
#[ignore] // TODO: time types are broken in Postgres
#[case::time(get_arrow_time_record_batch(), "time")]
#[case::timestamp(get_arrow_timestamp_record_batch(), "timestamp")]
#[ignore] // TODO: date types are broken in Postgres
#[case::date(get_arrow_date_record_batch(), "date")]
#[case::struct_type(get_arrow_struct_record_batch(), "struct")]
#[ignore] // TODO: decimal types are broken in Postgres
#[case::decimal(get_arrow_decimal_record_batch(), "decimal")]
#[case::interval(get_arrow_interval_record_batch(), "interval")]
#[ignore] // TODO: duration types are broken in Postgres
Expand Down