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

feat: Add GroupColumn Decimal128Array #13564

Merged
merged 10 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 4 additions & 1 deletion datafusion/physical-plan/src/aggregates/group_values/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
use arrow::record_batch::RecordBatch;
use arrow_array::types::{
Date32Type, Date64Type, Time32MillisecondType, Time32SecondType,
Date32Type, Date64Type, Decimal128Type, Time32MillisecondType, Time32SecondType,
Time64MicrosecondType, Time64NanosecondType, TimestampMicrosecondType,
TimestampMillisecondType, TimestampNanosecondType, TimestampSecondType,
};
Expand Down Expand Up @@ -170,6 +170,9 @@ pub(crate) fn new_group_values(
TimeUnit::Microsecond => downcast_helper!(TimestampMicrosecondType, d),
TimeUnit::Nanosecond => downcast_helper!(TimestampNanosecondType, d),
},
DataType::Decimal128(_, _) => {
downcast_helper!(Decimal128Type, d);
}
DataType::Utf8 => {
return Ok(Box::new(GroupValuesByes::<i32>::new(OutputType::Utf8)));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ use crate::aggregates::group_values::GroupValues;
use ahash::RandomState;
use arrow::compute::cast;
use arrow::datatypes::{
BinaryViewType, Date32Type, Date64Type, Float32Type, Float64Type, Int16Type,
Int32Type, Int64Type, Int8Type, StringViewType, Time32MillisecondType,
BinaryViewType, Date32Type, Date64Type, Decimal128Type, Float32Type, Float64Type,
Int16Type, Int32Type, Int64Type, Int8Type, StringViewType, Time32MillisecondType,
Time32SecondType, Time64MicrosecondType, Time64NanosecondType,
TimestampMicrosecondType, TimestampMillisecondType, TimestampNanosecondType,
TimestampSecondType, UInt16Type, UInt32Type, UInt64Type, UInt8Type,
Expand Down Expand Up @@ -1008,6 +1008,14 @@ impl<const STREAMING: bool> GroupValues for GroupValuesColumn<STREAMING> {
)
}
},
&DataType::Decimal128(_, _) => {
instantiate_primitive! {
v,
nullable,
Decimal128Type,
data_type
}
}
&DataType::Utf8 => {
let b = ByteGroupValueBuilder::<i32>::new(OutputType::Utf8);
v.push(Box::new(b) as _)
Expand Down Expand Up @@ -1214,6 +1222,7 @@ fn supported_type(data_type: &DataType) -> bool {
| DataType::UInt64
| DataType::Float32
| DataType::Float64
| DataType::Decimal128(_, _)
| DataType::Utf8
| DataType::LargeUtf8
| DataType::Binary
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,10 @@ impl<T: ArrowPrimitiveType, const NULLABLE: bool> GroupColumn

let first_n_nulls = if NULLABLE { self.nulls.take_n(n) } else { None };

Arc::new(PrimitiveArray::<T>::new(
ScalarBuffer::from(first_n),
first_n_nulls,
))
Arc::new(
PrimitiveArray::<T>::new(ScalarBuffer::from(first_n), first_n_nulls)
.with_data_type(self.data_type.clone()),
)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ where
build_primitive(split, null_group)
}
};

Ok(vec![Arc::new(array.with_data_type(self.data_type.clone()))])
}

Expand Down
39 changes: 39 additions & 0 deletions datafusion/sqllogictest/test_files/group_by.slt
Original file line number Diff line number Diff line change
Expand Up @@ -5499,3 +5499,42 @@ SELECT
GROUP BY ts, text
----
foo 2024-01-01T08:00:00+08:00

# Test multi group by int + Decimal128
statement ok
create table source as values
(1, '123.45'),
(1, '123.45'),
(2, '678.90'),
(2, '1011.12'),
(3, '1314.15'),
(3, '1314.15'),
(2, '1011.12'),
(null, null),
(null, '123.45'),
(null, null),
(null, '123.45'),
(2, '678.90'),
(2, '678.90'),
(1, null)
;

statement ok
create view t as select column1 as a, arrow_cast(column2, 'Decimal128(10, 2)') as b from source;

query IRI
select a, b, count(*) from t group by a, b order by a, b;
----
1 123.45 2
1 NULL 1
2 678.9 3
2 1011.12 2
3 1314.15 2
NULL 123.45 2
NULL NULL 2

statement ok
drop view t

statement ok
drop table source;
Loading