fix

Author: b41sh

src/core/databend/util.rs

@@ -18,7 +18,7 @@ use std::io::Write;
 
 use byteorder::BigEndian;
 use byteorder::WriteBytesExt;
-use ethnum::i256;
+use i256::i256;
 
 use super::constants::*;
 use super::jentry::JEntry;
@@ -437,7 +437,7 @@ impl ExtensionValue<'_> {
                 ExtensionValue::Timestamp(Timestamp { offset, value })
             }
             EXTENSION_INTERVAL => {
-                if len != 8 {
+                if len != 16 {
                     return Err(Error::InvalidJsonbNumber);
                 }
                 let months = i32::from_be_bytes(bytes[1..5].try_into().unwrap());

src/extension.rs

@@ -91,7 +91,6 @@ impl Display for Interval {
         let mut date_parts = vec![];
         let years = self.months / MONTHS_PER_YEAR;
         let months = self.months % MONTHS_PER_YEAR;
-
         match years.cmp(&1) {
             Ordering::Equal => {
                 date_parts.push((years, "year"));
@@ -119,7 +118,7 @@ impl Display for Interval {
             }
             _ => {}
         }
-        if date_parts.is_empty() {
+        if !date_parts.is_empty() {
             for (i, (val, name)) in date_parts.into_iter().enumerate() {
                 if i > 0 {
                     write!(f, " ")?;

src/lib.rs

@@ -82,9 +82,9 @@ pub use error::Error;
 pub use extension::*;
 #[allow(unused_imports)]
 pub use from::*;
-pub use number::Number;
 pub use number::Decimal128;
 pub use number::Decimal256;
+pub use number::Number;
 pub use owned::to_owned_jsonb;
 pub use owned::OwnedJsonb;
 pub use parser::from_slice;

src/number.rs

@@ -28,7 +28,7 @@ use serde::de::Visitor;
 use serde::ser::Serialize;
 use serde::ser::Serializer;
 
-use ethnum::i256;
+use i256::i256;
 
 #[derive(Debug, Clone)]
 pub struct Decimal128 {
@@ -53,8 +53,9 @@ pub struct Decimal256 {
 
 impl Decimal256 {
     pub fn to_float64(&self) -> f64 {
-        let div = 10_f64.powi(self.scale as i32);
-        self.value.as_f64() / div
+        //let div = 10_f64.powi(self.scale as i32);
+        //self.value.as_f64() / div
+        todo!()
     }
 }
 
@@ -196,9 +197,13 @@ impl Number {
                 Ok(Number::Decimal128(neg_dec))
             }
             Number::Decimal256(v) => {
+                let (neg_value, is_overflow) = v.value.overflowing_neg();
+                if is_overflow {
+                    return Err(Error::Message("Decimal256 overflow".to_string()));
+                }
                 let neg_dec = Decimal256 {
                     scale: v.scale,
-                    value: v.value * -1,
+                    value: neg_value,
                 };
                 Ok(Number::Decimal256(neg_dec))
             }
@@ -521,7 +526,7 @@ impl Display for Number {
                 } else {
                     let pow_scale = i256::from(10).pow(v.scale as u32);
                     // -1/10 = 0
-                    if v.value >= 0 {
+                    if v.value >= i256::from(0) {
                         write!(
                             f,
                             "{}.{:0>width$}",