Mondrian: fix divide by zero behavior when

NullDenominatorProducesNull is set. [git-p4: depot-paths = "//open/mondrian/": change = 9960]
pentaho · Oct 5, 2007 · 06d86f7 · 06d86f7
1 parent 5df7e00
commit 06d86f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/main/mondrian/olap/fun/BuiltinFunTable.java b/src/main/mondrian/olap/fun/BuiltinFunTable.java
@@ -1562,6 +1562,7 @@ public double evaluateDouble(Evaluator evaluator) {
                             if (v0 == DoubleNull) {
                                 return DoubleNull;
                             } else if (v1 == DoubleNull) {
+                                // Null only in denominator returns Infinity.
                                 return Double.POSITIVE_INFINITY;
                             } else {
                                 return v0 / v1;
@@ -1573,9 +1574,9 @@ public double evaluateDouble(Evaluator evaluator) {
                         public double evaluateDouble(Evaluator evaluator) {
                             final double v0 = calc0.evaluateDouble(evaluator);
                             final double v1 = calc1.evaluateDouble(evaluator);
-                            // Null in numerator always returns DoubleNull.
+                            // Null in numerator or denominator returns DoubleNull.
                             //
-                            if (v0 == DoubleNull || v1 == DoubleNull || v1 == 0.0) {
+                            if (v0 == DoubleNull || v1 == DoubleNull) {
                                 return DoubleNull;
                             } else {
                                 return v0 / v1;

diff --git a/testsrc/main/mondrian/olap/fun/FunctionTest.java b/testsrc/main/mondrian/olap/fun/FunctionTest.java
@@ -258,13 +258,6 @@ public void testNullValue() {
                 "Row #22: \n"));
     }
 
-
-    public void testNullInDivision() {
-        assertExprReturns("NULL/1", "");
-        assertExprReturns("NULL/NULL", "");
-        assertExprReturns("1/NULL", "Infinity");
-    }
-
     public void testNullInMultiplication() {
         assertExprReturns("NULL*1", "");
         assertExprReturns("1*NULL", "");
@@ -4465,13 +4458,21 @@ public void testDivide() {
             assertExprReturns("0 / 0", "NaN");
             assertExprReturns("-3 / (2 - 2)", "-Infinity");
 
+            assertExprReturns("NULL/1", "");
+            assertExprReturns("NULL/NULL", "");
+            assertExprReturns("1/NULL", "Infinity");
+
             // when NullOrZeroDenominatorProducesNull is set to true
             MondrianProperties.instance().NullDenominatorProducesNull.set(true);
 
             assertExprReturns("-2 / " + NullNumericExpr, "");
-            assertExprReturns("0 / 0", "");
-            assertExprReturns("-3 / (2 - 2)", "");
+            assertExprReturns("0 / 0", "NaN");
+            assertExprReturns("-3 / (2 - 2)", "-Infinity");
 
+            assertExprReturns("NULL/1", "");
+            assertExprReturns("NULL/NULL", "");
+            assertExprReturns("1/NULL", "");
+
         } finally {
             MondrianProperties.instance().NullDenominatorProducesNull.
             set(origNullDenominatorProducesNull);