chore(cubestore): Fix couple decimal tests

Author: paveltiunov

rust/cubestore/cubestore/src/metastore/mod.rs

@@ -571,10 +571,10 @@ impl<'a> Into<Field> for &'a Column {
                 ColumnType::Timestamp => DataType::Timestamp(Microsecond, None),
                 ColumnType::Boolean => DataType::Boolean,
                 ColumnType::Decimal { scale, precision } => {
-                    DataType::Decimal128(scale as u8, precision as i8)
+                    DataType::Decimal128(precision as u8, scale as i8)
                 }
                 ColumnType::Decimal96 { scale, precision } => {
-                    DataType::Decimal128(scale as u8, precision as i8)
+                    DataType::Decimal128(precision as u8, scale as i8)
                 }
                 ColumnType::Bytes => DataType::Binary,
                 ColumnType::HyperLogLog(_) => DataType::Binary,

rust/cubestore/cubestore/src/queryplanner/query_executor.rs

@@ -22,11 +22,7 @@ use crate::util::memory::MemoryHandler;
 use crate::{app_metrics, CubeError};
 use async_trait::async_trait;
 use core::fmt;
-use datafusion::arrow::array::{
-    make_array, Array, ArrayRef, BinaryArray, BooleanArray, Float64Array, Int16Array, Int32Array,
-    Int64Array, MutableArrayData, StringArray, TimestampMicrosecondArray, TimestampNanosecondArray,
-    UInt16Array, UInt32Array, UInt64Array,
-};
+use datafusion::arrow::array::{make_array, Array, ArrayRef, BinaryArray, BooleanArray, Decimal128Array, Float64Array, Int16Array, Int32Array, Int64Array, MutableArrayData, StringArray, TimestampMicrosecondArray, TimestampNanosecondArray, UInt16Array, UInt32Array, UInt64Array};
 use datafusion::arrow::compute::SortOptions;
 use datafusion::arrow::datatypes::{DataType, Field, Schema, SchemaRef, TimeUnit};
 use datafusion::arrow::ipc::reader::StreamReader;
@@ -1694,14 +1690,14 @@ pub fn batches_to_dataframe(batches: Vec<RecordBatch>) -> Result<DataFrame, Cube
                     }
                 }
                 // TODO upgrade DF
-                // DataType::Int64Decimal(0) => convert_array!(
-                //     array,
-                //     num_rows,
-                //     rows,
-                //     Int64Decimal0Array,
-                //     Decimal,
-                //     (Decimal)
-                // ),
+                DataType::Decimal128(_, _) => convert_array!(
+                    array,
+                    num_rows,
+                    rows,
+                    Decimal128Array,
+                    Decimal,
+                    (Decimal)
+                ),
                 // DataType::Int64Decimal(1) => convert_array!(
                 //     array,
                 //     num_rows,
@@ -1880,6 +1876,10 @@ pub fn arrow_to_column_type(arrow_type: DataType) -> Result<ColumnType, CubeErro
         //     scale: scale as i32,
         //     precision: 27,
         // }),
+        DataType::Decimal128(precision, scale) => Ok(ColumnType::Decimal {
+            scale: scale as i32,
+            precision: precision as i32,
+        }),
         DataType::Boolean => Ok(ColumnType::Boolean),
         DataType::Int8
         | DataType::Int16

rust/cubestore/cubestore/src/table/data.rs

@@ -150,15 +150,18 @@ macro_rules! match_column_type {
             ColumnType::Timestamp => $matcher!(Timestamp, TimestampMicrosecondBuilder, Timestamp),
             ColumnType::Boolean => $matcher!(Boolean, BooleanBuilder, Boolean),
             // TODO upgrade DF
-            ColumnType::Decimal { .. } => $matcher!(Decimal, Decimal128Builder, Decimal),
-            ColumnType::Decimal96 { .. } => $matcher!(Decimal, Decimal128Builder, Decimal),
+            ColumnType::Decimal { scale, precision } => $matcher!(Decimal, Decimal128Builder, Decimal, scale, precision),
+            ColumnType::Decimal96 { scale, precision } => $matcher!(Decimal, Decimal128Builder, Decimal, scale, precision),
             ColumnType::Float => $matcher!(Float, Float64Builder, Float),
         }
     }};
 }
 
 pub fn create_array_builder(t: &ColumnType) -> Box<dyn ArrayBuilder> {
     macro_rules! create_builder {
+        ($type: tt, Decimal128Builder, Decimal, $scale: expr, $precision: expr) => {
+            Box::new(Decimal128Builder::new().with_data_type(datafusion::arrow::datatypes::DataType::Decimal128(*$precision as u8, *$scale as i8)))
+        };
         ($type: tt, $builder: tt $(,$arg: tt)*) => {
             Box::new($builder::new())
         };