Merge remote-tracking branch 'upstream/master' into row-filter

apache · Aug 11, 2022 · 16c0c0e · 16c0c0e
2 parents 623587d + 4481993
commit 16c0c0e
Show file tree

Hide file tree

Showing 36 changed files with 1,288 additions and 436 deletions.
diff --git a/arrow-flight/src/lib.rs b/arrow-flight/src/lib.rs
@@ -28,6 +28,7 @@ use std::{
     ops::Deref,
 };
 
+#[allow(clippy::derive_partial_eq_without_eq)]
 mod gen {
     include!("arrow.flight.protocol.rs");
 }

diff --git a/arrow-flight/src/sql/server.rs b/arrow-flight/src/sql/server.rs
@@ -504,7 +504,7 @@ where
             let record_count = self.do_put_statement_update(token, request).await?;
             let result = DoPutUpdateResult { record_count };
             let output = futures::stream::iter(vec![Ok(super::super::gen::PutResult {
-                app_metadata: result.as_any().encode_to_vec(),
+                app_metadata: result.encode_to_vec(),
             })]);
             return Ok(Response::new(Box::pin(output)));
         }
@@ -525,7 +525,7 @@ where
                 .await?;
             let result = DoPutUpdateResult { record_count };
             let output = futures::stream::iter(vec![Ok(super::super::gen::PutResult {
-                app_metadata: result.as_any().encode_to_vec(),
+                app_metadata: result.encode_to_vec(),
             })]);
             return Ok(Response::new(Box::pin(output)));
         }

diff --git a/arrow/src/array/array_decimal.rs b/arrow/src/array/array_decimal.rs
@@ -75,12 +75,6 @@ pub type Decimal128Array = BasicDecimalArray<16>;
 
 pub type Decimal256Array = BasicDecimalArray<32>;
 
-mod private_decimal {
-    pub trait DecimalArrayPrivate {
-        fn raw_value_data_ptr(&self) -> *const u8;
-    }
-}
-
 pub struct BasicDecimalArray<const BYTE_WIDTH: usize> {
     data: ArrayData,
     value_data: RawPtrBox<u8>,
@@ -90,10 +84,10 @@ pub struct BasicDecimalArray<const BYTE_WIDTH: usize> {
 
 impl<const BYTE_WIDTH: usize> BasicDecimalArray<BYTE_WIDTH> {
     pub const VALUE_LENGTH: i32 = BYTE_WIDTH as i32;
-    pub const DEFAULT_TYPE: DataType = BasicDecimal::<BYTE_WIDTH>::DEFAULT_TYPE;
+    const DEFAULT_TYPE: DataType = BasicDecimal::<BYTE_WIDTH>::DEFAULT_TYPE;
     pub const MAX_PRECISION: usize = BasicDecimal::<BYTE_WIDTH>::MAX_PRECISION;
     pub const MAX_SCALE: usize = BasicDecimal::<BYTE_WIDTH>::MAX_SCALE;
-    pub const TYPE_CONSTRUCTOR: fn(usize, usize) -> DataType =
+    const TYPE_CONSTRUCTOR: fn(usize, usize) -> DataType =
         BasicDecimal::<BYTE_WIDTH>::TYPE_CONSTRUCTOR;
 
     pub fn data(&self) -> &ArrayData {
@@ -341,7 +335,7 @@ impl Decimal256Array {
     pub fn validate_decimal_precision(&self, precision: usize) -> Result<()> {
         if precision < self.precision {
             for v in self.iter().flatten() {
-                validate_decimal256_precision(&v.to_string(), precision)?;
+                validate_decimal256_precision(&v.to_big_int(), precision)?;
             }
         }
         Ok(())

diff --git a/arrow/src/array/builder/decimal_builder.rs b/arrow/src/array/builder/decimal_builder.rs
@@ -202,8 +202,7 @@ impl Decimal256Builder {
         let value = if self.value_validation {
             let raw_bytes = value.raw_value();
             let integer = BigInt::from_signed_bytes_le(raw_bytes);
-            let value_str = integer.to_string();
-            validate_decimal256_precision(&value_str, self.precision)?;
+            validate_decimal256_precision(&integer, self.precision)?;
             value
         } else {
             value

diff --git a/arrow/src/array/data.rs b/arrow/src/array/data.rs
@@ -396,18 +396,24 @@ impl ArrayData {
     /// panic's if the new DataType is not compatible with the
     /// existing type.
     ///
-    /// Note: currently only changing a [DataType::Decimal128]s precision
-    /// and scale are supported
+    /// Note: currently only changing a [DataType::Decimal128]s or
+    /// [DataType::Decimal256]s precision and scale are supported
     #[inline]
     pub(crate) fn with_data_type(mut self, new_data_type: DataType) -> Self {
-        assert!(
-            matches!(self.data_type, DataType::Decimal128(_, _)),
-            "only DecimalType is supported for existing type"
-        );
-        assert!(
-            matches!(new_data_type, DataType::Decimal128(_, _)),
-            "only DecimalType is supported for new datatype"
-        );
+        if matches!(self.data_type, DataType::Decimal128(_, _)) {
+            assert!(
+                matches!(new_data_type, DataType::Decimal128(_, _)),
+                "only 128-bit DecimalType is supported for new datatype"
+            );
+        } else if matches!(self.data_type, DataType::Decimal256(_, _)) {
+            assert!(
+                matches!(new_data_type, DataType::Decimal256(_, _)),
+                "only 256-bit DecimalType is supported for new datatype"
+            );
+        } else {
+            panic!("only DecimalType is supported.")
+        }
+
         self.data_type = new_data_type;
         self
     }
@@ -1044,8 +1050,7 @@ impl ArrayData {
                     let offset = pos * 32;
                     let raw_bytes = &values[offset..offset + 32];
                     let integer = BigInt::from_signed_bytes_le(raw_bytes);
-                    let value_str = integer.to_string();
-                    validate_decimal256_precision(&value_str, *p)?;
+                    validate_decimal256_precision(&integer, *p)?;
                 }
                 Ok(())
             }