impl Add/AddAssign for months_days_micros

Author: TCeason

src/common/column/src/types/native.rs

@@ -17,6 +17,8 @@ use std::cmp::Ordering;
 use std::convert::TryFrom;
 use std::hash::Hash;
 use std::hash::Hasher;
+use std::ops::Add;
+use std::ops::AddAssign;
 use std::ops::Neg;
 use std::panic::RefUnwindSafe;
 
@@ -268,6 +270,26 @@ impl NativeType for days_ms {
 #[repr(C)]
 pub struct months_days_micros(pub i128);
 
+impl Add for months_days_micros {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        let add_months = self.months() + rhs.months();
+        let add_days = self.days() + rhs.days();
+        let add_micros = self.microseconds() + rhs.microseconds();
+        Self::new(add_months, add_days, add_micros)
+    }
+}
+
+impl AddAssign for months_days_micros {
+    fn add_assign(&mut self, rhs: Self) {
+        let add_months = self.months() + rhs.months();
+        let add_days = self.days() + rhs.days();
+        let add_micros = self.microseconds() + rhs.microseconds();
+        self.0 = months_days_micros::new(add_months, add_days, add_micros).0
+    }
+}
+
 impl Hash for months_days_micros {
     fn hash<H: Hasher>(&self, state: &mut H) {
         self.total_micros().hash(state)

src/query/functions/src/aggregates/aggregate_sum.rs

@@ -283,8 +283,7 @@ impl UnaryState<IntervalType, IntervalType> for IntervalSumState {
         other: months_days_micros,
         _function_data: Option<&dyn FunctionData>,
     ) -> Result<()> {
-        let sum = self.value.total_micros() + other.total_micros();
-        self.value = months_days_micros(sum as i128);
+        self.value += other;
         Ok(())
     }
 
@@ -294,24 +293,23 @@ impl UnaryState<IntervalType, IntervalType> for IntervalSumState {
         validity: Option<&Bitmap>,
         _function_data: Option<&dyn FunctionData>,
     ) -> Result<()> {
-        let mut sum = self.value.total_micros();
         let col = IntervalType::upcast_column(other);
         let buffer = IntervalType::try_downcast_column(&col).unwrap();
         match validity {
             Some(validity) if validity.null_count() > 0 => {
                 buffer.iter().zip(validity.iter()).for_each(|(t, b)| {
                     if b {
-                        sum += t.total_micros();
+                        self.value += *t;
                     }
                 });
             }
             _ => {
                 buffer.iter().for_each(|t| {
-                    sum += t.total_micros();
+                    self.value += *t;
                 });
             }
         }
-        self.value = months_days_micros(sum as i128);
+
         Ok(())
     }
 

tests/sqllogictests/suites/base/11_data_type/11_0007_data_type_interval.test

@@ -15,6 +15,7 @@ create or replace table t (c interval);
 statement ok
 insert into t values('1 year'),('1 months'),('1 day'),('1 hour'),('1 minute'),('1 second'),('1 microsecond');
 
+onlyif http
 query T
 select * from t order by c;
 ----
@@ -26,11 +27,13 @@ select * from t order by c;
 1 month
 1 year
 
+onlyif http
 query T
 select sum(c) from t;
 ----
 9385:01:01.000001
 
+onlyif http
 query T
 select sum(c) from t where c <= interval '1 day';
 ----