This is an automated email from the ASF dual-hosted git repository.

bamaer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/main by this push:
     new 2da7a618e6 Row denormaliser fails on a BigNumber average that has no 
exact decim… (#9298)
2da7a618e6 is described below

commit 2da7a618e6841a59ce3ac48943db06d4cf443bb1
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Fri Nov 6 20:12:50 2026 +0100

    Row denormaliser fails on a BigNumber average that has no exact decim… 
(#9298)
    
    * Row denormaliser fails on a BigNumber average that has no exact decimal 
result, fixes #9296
    
    * fix remarks
---
 .../transforms/denormaliser/Denormaliser.java      | 16 +++++++-
 .../transforms/denormaliser/DenormaliserTest.java  | 43 ++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git 
a/plugins/transforms/denormaliser/src/main/java/org/apache/hop/pipeline/transforms/denormaliser/Denormaliser.java
 
b/plugins/transforms/denormaliser/src/main/java/org/apache/hop/pipeline/transforms/denormaliser/Denormaliser.java
index a782dd38d6..847b6bcd05 100644
--- 
a/plugins/transforms/denormaliser/src/main/java/org/apache/hop/pipeline/transforms/denormaliser/Denormaliser.java
+++ 
b/plugins/transforms/denormaliser/src/main/java/org/apache/hop/pipeline/transforms/denormaliser/Denormaliser.java
@@ -247,7 +247,7 @@ public class Denormaliser extends 
BaseTransform<DenormaliserMeta, DenormaliserDa
                 switch (sum) {
                   case Long l -> l / count;
                   case Double d -> d / count;
-                  case BigDecimal bd -> bd.divide(BigDecimal.valueOf(count));
+                  case BigDecimal bd -> bigNumberAverage(bd, count);
                   default -> null;
                 };
           }
@@ -475,4 +475,18 @@ public class Denormaliser extends 
BaseTransform<DenormaliserMeta, DenormaliserDa
   void setMinNullIsValued(boolean minNullIsValued) {
     this.minNullIsValued = minNullIsValued;
   }
+
+  /**
+   * The exact average when it has a finite decimal expansion, as before. Only 
a quotient such as
+   * 1/3, where an exact divide throws an ArithmeticException, is rounded like 
the Group by and
+   * Memory group by averages.
+   */
+  private static BigDecimal bigNumberAverage(BigDecimal sum, long count) {
+    BigDecimal divisor = BigDecimal.valueOf(count);
+    try {
+      return sum.divide(divisor);
+    } catch (ArithmeticException e) {
+      return ValueDataUtil.divideBigDecimals(sum, divisor, null);
+    }
+  }
 }
diff --git 
a/plugins/transforms/denormaliser/src/test/java/org/apache/hop/pipeline/transforms/denormaliser/DenormaliserTest.java
 
b/plugins/transforms/denormaliser/src/test/java/org/apache/hop/pipeline/transforms/denormaliser/DenormaliserTest.java
index df0d4ff027..4ff6568f0f 100644
--- 
a/plugins/transforms/denormaliser/src/test/java/org/apache/hop/pipeline/transforms/denormaliser/DenormaliserTest.java
+++ 
b/plugins/transforms/denormaliser/src/test/java/org/apache/hop/pipeline/transforms/denormaliser/DenormaliserTest.java
@@ -17,17 +17,20 @@
 
 package org.apache.hop.pipeline.transforms.denormaliser;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Method;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import org.apache.hop.core.logging.ILoggingObject;
 import org.apache.hop.core.row.IRowMeta;
 import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaBigNumber;
 import org.apache.hop.core.row.value.ValueMetaDate;
 import org.apache.hop.core.row.value.ValueMetaInteger;
 import org.apache.hop.core.row.value.ValueMetaString;
@@ -108,4 +111,44 @@ class DenormaliserTest {
       assertNotNull(res, "Date is null");
     }
   }
+
+  @Test
+  void averageOfBigNumbersDoesNotFailOnANonTerminatingQuotient() throws 
Exception {
+    // No exact decimal result: rounded like the Group by average, to the 
larger precision of the
+    // sum and the count
+    assertEquals(new BigDecimal("0.3"), bigNumberAverage(BigDecimal.ONE, 3));
+    assertEquals(new BigDecimal("33.333"), bigNumberAverage(new 
BigDecimal("100.00"), 3));
+  }
+
+  @Test
+  void averageOfBigNumbersStaysExactWhenThereIsAnExactResult() throws 
Exception {
+    // These averages were exact before the fix and must not change
+    assertEquals(new BigDecimal("1.5"), bigNumberAverage(new BigDecimal("3"), 
2));
+    assertEquals(new BigDecimal("3.75"), bigNumberAverage(new 
BigDecimal("15"), 4));
+    assertEquals(new BigDecimal("12.375"), bigNumberAverage(new 
BigDecimal("99"), 8));
+  }
+
+  private Object bigNumberAverage(BigDecimal sum, long count) throws Exception 
{
+    DenormaliserData data = new DenormaliserData();
+    data.outputRowMeta = new RowMeta();
+    data.outputRowMeta.addValueMeta(new ValueMetaBigNumber("avg"));
+    data.removeNrs = new int[] {};
+    data.targetResult = new Object[] {null};
+    data.counters = new long[] {count};
+    data.sum = new Object[] {sum};
+
+    DenormaliserMeta meta = new DenormaliserMeta();
+    DenormaliserTargetField average = new DenormaliserTargetField();
+    average.setTargetAggregationType(
+        DenormaliserTargetField.DenormaliseAggregation.TYPE_AGGR_AVERAGE);
+    ArrayList<DenormaliserTargetField> fields = new ArrayList<>();
+    fields.add(average);
+    meta.setDenormaliserTargetFields(fields);
+
+    Denormaliser denormaliser =
+        new Denormaliser(
+            mockHelper.transformMeta, meta, data, 0, mockHelper.pipelineMeta, 
mockHelper.pipeline);
+
+    return denormaliser.buildResult(new RowMeta(), new Object[] {})[0];
+  }
 }

Reply via email to