This is an automated email from the ASF dual-hosted git repository.
viirya pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new 423375235 Fix decimal scalar dyn kernels (#5179)
423375235 is described below
commit 423375235499f4dc9b645c0c0489ce4530e5000b
Author: Liang-Chi Hsieh <[email protected]>
AuthorDate: Mon Feb 6 00:02:29 2023 -0800
Fix decimal scalar dyn kernels (#5179)
* Fix decimal scalar dyn kernels
* Try fix CI
* Add test
* Revert "Try fix CI"
This reverts commit 72367ed5fac07f8cf7dd4d1ebc70c718f9fb540d.
---
datafusion/physical-expr/src/expressions/binary.rs | 166 +++++++++++++++++++++
.../src/expressions/binary/kernels_arrow.rs | 16 +-
2 files changed, 170 insertions(+), 12 deletions(-)
diff --git a/datafusion/physical-expr/src/expressions/binary.rs
b/datafusion/physical-expr/src/expressions/binary.rs
index 1c2bb065b..b20235748 100644
--- a/datafusion/physical-expr/src/expressions/binary.rs
+++ b/datafusion/physical-expr/src/expressions/binary.rs
@@ -1694,6 +1694,49 @@ mod tests {
Ok(())
}
+ #[test]
+ fn plus_op_dict_scalar_decimal() -> Result<()> {
+ let schema = Schema::new(vec![Field::new(
+ "a",
+ DataType::Dictionary(
+ Box::new(DataType::Int8),
+ Box::new(DataType::Decimal128(10, 0)),
+ ),
+ true,
+ )]);
+
+ let value = 123;
+ let decimal_array = Arc::new(create_decimal_array(
+ &[Some(value), None, Some(value - 1), Some(value + 1)],
+ 10,
+ 0,
+ )) as ArrayRef;
+
+ let keys = Int8Array::from(vec![0, 2, 1, 3, 0]);
+ let a = DictionaryArray::try_new(&keys, &decimal_array)?;
+
+ let keys = Int8Array::from(vec![0, 2, 1, 3, 0]);
+ let decimal_array = create_decimal_array(
+ &[Some(value + 1), None, Some(value), Some(value + 2)],
+ 10,
+ 0,
+ );
+ let expected = DictionaryArray::try_new(&keys, &decimal_array)?;
+
+ apply_arithmetic_scalar(
+ Arc::new(schema),
+ vec![Arc::new(a)],
+ Operator::Plus,
+ ScalarValue::Dictionary(
+ Box::new(DataType::Int8),
+ Box::new(ScalarValue::Decimal128(Some(1), 10, 0)),
+ ),
+ Arc::new(expected),
+ )?;
+
+ Ok(())
+ }
+
#[test]
fn minus_op() -> Result<()> {
let schema = Arc::new(Schema::new(vec![
@@ -1776,6 +1819,49 @@ mod tests {
Ok(())
}
+ #[test]
+ fn minus_op_dict_scalar_decimal() -> Result<()> {
+ let schema = Schema::new(vec![Field::new(
+ "a",
+ DataType::Dictionary(
+ Box::new(DataType::Int8),
+ Box::new(DataType::Decimal128(10, 0)),
+ ),
+ true,
+ )]);
+
+ let value = 123;
+ let decimal_array = Arc::new(create_decimal_array(
+ &[Some(value), None, Some(value - 1), Some(value + 1)],
+ 10,
+ 0,
+ )) as ArrayRef;
+
+ let keys = Int8Array::from(vec![0, 2, 1, 3, 0]);
+ let a = DictionaryArray::try_new(&keys, &decimal_array)?;
+
+ let keys = Int8Array::from(vec![0, 2, 1, 3, 0]);
+ let decimal_array = create_decimal_array(
+ &[Some(value - 1), None, Some(value - 2), Some(value)],
+ 10,
+ 0,
+ );
+ let expected = DictionaryArray::try_new(&keys, &decimal_array)?;
+
+ apply_arithmetic_scalar(
+ Arc::new(schema),
+ vec![Arc::new(a)],
+ Operator::Minus,
+ ScalarValue::Dictionary(
+ Box::new(DataType::Int8),
+ Box::new(ScalarValue::Decimal128(Some(1), 10, 0)),
+ ),
+ Arc::new(expected),
+ )?;
+
+ Ok(())
+ }
+
#[test]
fn multiply_op() -> Result<()> {
let schema = Arc::new(Schema::new(vec![
@@ -1850,6 +1936,46 @@ mod tests {
Ok(())
}
+ #[test]
+ fn multiply_op_dict_scalar_decimal() -> Result<()> {
+ let schema = Schema::new(vec![Field::new(
+ "a",
+ DataType::Dictionary(
+ Box::new(DataType::Int8),
+ Box::new(DataType::Decimal128(10, 0)),
+ ),
+ true,
+ )]);
+
+ let value = 123;
+ let decimal_array = Arc::new(create_decimal_array(
+ &[Some(value), None, Some(value - 1), Some(value + 1)],
+ 10,
+ 0,
+ )) as ArrayRef;
+
+ let keys = Int8Array::from(vec![0, 2, 1, 3, 0]);
+ let a = DictionaryArray::try_new(&keys, &decimal_array)?;
+
+ let keys = Int8Array::from(vec![0, 2, 1, 3, 0]);
+ let decimal_array =
+ create_decimal_array(&[Some(246), None, Some(244), Some(248)], 10,
0);
+ let expected = DictionaryArray::try_new(&keys, &decimal_array)?;
+
+ apply_arithmetic_scalar(
+ Arc::new(schema),
+ vec![Arc::new(a)],
+ Operator::Multiply,
+ ScalarValue::Dictionary(
+ Box::new(DataType::Int8),
+ Box::new(ScalarValue::Decimal128(Some(2), 10, 0)),
+ ),
+ Arc::new(expected),
+ )?;
+
+ Ok(())
+ }
+
#[test]
fn divide_op() -> Result<()> {
let schema = Arc::new(Schema::new(vec![
@@ -1924,6 +2050,46 @@ mod tests {
Ok(())
}
+ #[test]
+ fn divide_op_dict_scalar_decimal() -> Result<()> {
+ let schema = Schema::new(vec![Field::new(
+ "a",
+ DataType::Dictionary(
+ Box::new(DataType::Int8),
+ Box::new(DataType::Decimal128(10, 0)),
+ ),
+ true,
+ )]);
+
+ let value = 123;
+ let decimal_array = Arc::new(create_decimal_array(
+ &[Some(value), None, Some(value - 1), Some(value + 1)],
+ 10,
+ 0,
+ )) as ArrayRef;
+
+ let keys = Int8Array::from(vec![0, 2, 1, 3, 0]);
+ let a = DictionaryArray::try_new(&keys, &decimal_array)?;
+
+ let keys = Int8Array::from(vec![0, 2, 1, 3, 0]);
+ let decimal_array =
+ create_decimal_array(&[Some(61), None, Some(61), Some(62)], 10, 0);
+ let expected = DictionaryArray::try_new(&keys, &decimal_array)?;
+
+ apply_arithmetic_scalar(
+ Arc::new(schema),
+ vec![Arc::new(a)],
+ Operator::Divide,
+ ScalarValue::Dictionary(
+ Box::new(DataType::Int8),
+ Box::new(ScalarValue::Decimal128(Some(2), 10, 0)),
+ ),
+ Arc::new(expected),
+ )?;
+
+ Ok(())
+ }
+
#[test]
fn modulus_op() -> Result<()> {
let schema = Arc::new(Schema::new(vec