RumbleDB · ghislainfourny · Jun 7, 2021 · Jun 7, 2021 · Jun 7, 2021 · Jun 7, 2021
@@ -1322,7 +1322,7 @@ private static BuiltinFunction createBuiltinFunction(
      */
     static final BuiltinFunction concat =
         new BuiltinFunction(
-                new FunctionIdentifier(Name.createVariableInDefaultFunctionNamespace("concat"), 100),
+                new FunctionIdentifier(new Name(Name.FN_NS, "fn", "concat"), 100),
                 new FunctionSignature(
                         Collections.nCopies(
                             100,
@@ -2641,7 +2641,7 @@ private static BuiltinFunction createBuiltinFunction(
         builtinFunctions.put(substring_after2.getIdentifier(), substring_after2);
         for (int i = 0; i < 100; i++) {
             builtinFunctions.put(
-                new FunctionIdentifier(Name.createVariableInDefaultFunctionNamespace("concat"), i),
+                new FunctionIdentifier(concat.getIdentifier().getName(), i),
                 concat
             );
         }

@@ -31,6 +31,11 @@ public Period getDurationValue() {
         return this.value;
     }
 
+    @Override
+    public String getStringValue() {
+        return this.value.toString();
+    }
+
     @Override
     public boolean isAtomic() {
         return true;

@@ -38,7 +38,7 @@
 public class DoubleItem implements Item {
 
     private static final long serialVersionUID = 1L;
-    private double value;
+    private Double value;
 
     public DoubleItem() {
         super();
@@ -79,12 +79,12 @@ public String getStringValue() {
         if (Double.isInfinite(this.value) && this.value < 0) {
             return "-INF";
         }
-        if (Double.compare(this.value, 0d) == 0) {
-            return "0";
-        }
         if (Double.compare(this.value, -0d) == 0) {
             return "-0";
         }
+        if (Double.compare(this.value, 0d) == 0) {
+            return "0";
+        }
         double abs = Math.abs(this.value);
         if (abs >= 0.000001 && abs <= 1000000) {
             return this.castToDecimalValue().stripTrailingZeros().toPlainString();
@@ -104,7 +104,7 @@ public double castToDoubleValue() {
 
     @Override
     public float castToFloatValue() {
-        return (float) this.value;
+        return this.value.floatValue();
     }
 
     public BigDecimal castToDecimalValue() {

@@ -34,7 +34,6 @@
 import org.rumbledb.types.ItemType;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.text.DecimalFormat;
 
 public class FloatItem implements Item {
 
@@ -83,25 +82,24 @@ public String getStringValue() {
         if (Float.isInfinite(this.value) && this.value < 0) {
             return "-INF";
         }
-        if (Float.compare(this.value, 0f) == 0) {
-            return "0";
-        }
         if (Float.compare(this.value, -0f) == 0) {
             return "-0";
         }
+        if (Float.compare(this.value, 0f) == 0) {
+            return "0";
+        }
         double abs = Math.abs(this.value);
-        // Mantissa from less or equal than 1.0E-7
+        // Convert to decimal between 10E-7 to 10E6
         if (abs >= 0.000001 && abs < 1000000) {
             return new BigDecimal(this.value).toString();
         }
-        // Mantissa already from 1.0E6, then let Float.toString take care of mantissa from 1.0E7
-        if (abs >= 1000000 && abs < 10000000) {
-            return new DecimalFormat("0.0#######E0").format(this.value);
-            // return String.format("%.4E", this.castToDecimalValue().stripTrailingZeros().toPlainString());
+        // Force mantissa between 10E6 and 10E7
+        if (abs < 100000000) {
+            String str = Float.toString(this.value * 10);
+            char reducedChar = (char) ((int) str.charAt(str.length() - 1) - 1);
+            StringBuilder sb = new StringBuilder(str.substring(0, str.length() - 1)).append(reducedChar);
+            return sb.toString();
         }
-        // If less than 0.000001 must use mantissa, so from 0.0000001 = 1.0E-7
-        // If more or = than 1.0E6
-        // When use float.toString or not
         return Float.toString(this.value);
     }
 

@@ -38,6 +38,11 @@ public Period getDurationValue() {
         return this.value;
     }
 
+    @Override
+    public String getStringValue() {
+        return this.value.toString();
+    }
+
     @Override
     public boolean isYearMonthDuration() {
         return true;

@@ -30,12 +30,7 @@
 import org.joda.time.PeriodType;
 import org.rumbledb.api.Item;
 import org.rumbledb.context.DynamicContext;
-import org.rumbledb.exceptions.DivisionByZeroException;
-import org.rumbledb.exceptions.ExceptionMetadata;
-import org.rumbledb.exceptions.MoreThanOneItemException;
-import org.rumbledb.exceptions.NonAtomicKeyException;
-import org.rumbledb.exceptions.OurBadException;
-import org.rumbledb.exceptions.UnexpectedTypeException;
+import org.rumbledb.exceptions.*;
 import org.rumbledb.expressions.ExecutionMode;
 import org.rumbledb.expressions.arithmetic.MultiplicativeExpression;
 import org.rumbledb.expressions.arithmetic.MultiplicativeExpression.MultiplicativeOperator;
@@ -452,6 +447,9 @@ private static Item processYearMonthDurationDouble(
             MultiplicativeExpression.MultiplicativeOperator multiplicativeOperator,
             ExceptionMetadata metadata
     ) {
+        if (Double.isNaN(r)) {
+            throw new InvalidNaNOperationException("Invalid operation with NaN value.", metadata);
+        }
         switch (multiplicativeOperator) {
             case MUL: {
                 int months = l.getYears() * 12 + l.getMonths();
@@ -463,6 +461,9 @@ private static Item processYearMonthDurationDouble(
             }
             case DIV: {
                 int months = l.getYears() * 12 + l.getMonths();
+                if (r == 0 || r == -0) {
+                    throw new ArithmeticOverflowOrUnderflow("Division of a duration by 0.", metadata);
+                }
                 int totalMonths = (int) Math.round(months / r);
                 return ItemFactory.getInstance()
                     .createYearMonthDurationItem(
@@ -512,6 +513,9 @@ private static Item processDayTimeDurationDouble(
             MultiplicativeExpression.MultiplicativeOperator multiplicativeOperator,
             ExceptionMetadata metadata
     ) {
+        if (Double.isNaN(r)) {
+            throw new InvalidNaNOperationException("Invalid operation with NaN value.", metadata);
+        }
         switch (multiplicativeOperator) {
             case MUL: {
                 long durationInMillis = l.toStandardDuration().getMillis();
@@ -521,6 +525,10 @@ private static Item processDayTimeDurationDouble(
             }
             case DIV: {
                 long durationInMillis = l.toStandardDuration().getMillis();
+                // Check r is 0 and throw exception
+                if (r == 0 || r == -0) {
+                    throw new ArithmeticOverflowOrUnderflow("Division of a duration by 0.", metadata);
+                }
                 long durationResult = Math.round(durationInMillis / r);
                 return ItemFactory.getInstance()
                     .createDayTimeDurationItem(new Period(durationResult, PeriodType.dayTime()));