Actually fix multiplication/division with null columns

cswinter · Jul 31, 2024 · fc541af · fc541af
1 parent 1e00038
commit fc541af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/engine/execution/batch_merging.rs b/src/engine/execution/batch_merging.rs
@@ -173,11 +173,13 @@ pub fn combine<'a>(
         for (&(ileft, aggregator), &(iright, _)) in
             batch1.aggregations.iter().zip(batch2.aggregations.iter())
         {
-            let left = left[ileft];
-            let right = right[iright];
-            let (left, right) = unify_types(&mut qp, left, right);
-            let left = null_to_val(&mut qp, left);
-            let right = null_to_val(&mut qp, right);
+            let mut left = left[ileft];
+            let mut right = right[iright];
+            if (left.tag, right.tag) == (EncodingType::I64, EncodingType::F64) {
+                left = qp.cast(left, EncodingType::F64);
+            } else if (left.tag, right.tag) == (EncodingType::F64, EncodingType::I64) {
+                right = qp.cast(right, EncodingType::F64);
+            }
             let aggregated = qp.merge_aggregate(ops, left, right, aggregator);
             aggregates.push((aggregated.any(), aggregator));
         }

diff --git a/src/engine/operators/type_conversion.rs b/src/engine/operators/type_conversion.rs
@@ -99,7 +99,7 @@ impl Cast<of64> for u16 { fn cast(self) -> OrderedFloat<f64> { OrderedFloat::fro
 
 impl Cast<of64> for u32 { fn cast(self) -> OrderedFloat<f64> { OrderedFloat::from(self as f64) } }
 
-impl Cast<of64> for i64 { fn cast(self) -> OrderedFloat<f64> { OrderedFloat::from(self as f64) } }
+impl Cast<of64> for i64 { fn cast(self) -> OrderedFloat<f64> { if self == I64_NULL { F64_NULL } else { OrderedFloat::from(self as f64) } } }
 
 
 impl<'a> Cast<Val<'a>> for u8 { fn cast(self) -> Val<'a> { Val::Integer(self as i64) } }