made recommended changes to simply parse to number, null when malformed

Signed-off-by: Asif Bashar <[email protected]>

Author: asifabashar

core/src/main/java/org/opensearch/sql/expression/function/udf/ToNumberFunction.java

@@ -5,6 +5,7 @@
 
 package org.opensearch.sql.expression.function.udf;
 
+import java.math.BigInteger;
 import java.util.List;
 import org.apache.calcite.adapter.enumerable.NotNullImplementor;
 import org.apache.calcite.adapter.enumerable.NullPolicy;
@@ -69,50 +70,23 @@ public static Number toNumber(String numStr) {
   @Strict
   public static Number toNumber(String numStr, int base) {
     if (base < 2 || base > 36) {
-      throw new IllegalArgumentException("Base must be between 2 and 36");
+      throw new IllegalArgumentException("Base has to be between 2 and 36.");
     }
-
-    if (numStr.contains(".")) {
-
-      boolean isNegative = numStr.startsWith("-");
-      if (isNegative) {
-        numStr = numStr.substring(1);
-      }
-
-      // Split integer and fractional parts
-      String[] parts = numStr.split("\\.");
-      String intPart = parts[0];
-      String fracPart = parts.length > 1 ? parts[1] : "";
-
-      // Convert integer part
-      double intValue = 0;
-      for (char c : intPart.toCharArray()) {
-        int digit = Character.digit(c, base);
-        if (digit < 0) throw new IllegalArgumentException("Invalid digit: " + c);
-        intValue = intValue * base + digit;
-      }
-
-      // Convert fractional part
-      double fracValue = 0;
+    Number result = null;
+    try {
       if (base == 10) {
-        double divisor = base;
-        for (char c : fracPart.toCharArray()) {
-          int digit = Character.digit(c, base);
-          if (digit < 0) throw new IllegalArgumentException("Invalid digit: " + c);
-          fracValue += (double) digit / divisor;
-          divisor *= base;
+        if (numStr.contains(".")) {
+          result = Double.parseDouble(numStr);
+        } else {
+          result = Long.parseLong(numStr);
         }
-      }
-
-      double result = intValue + fracValue;
-      result = isNegative ? -result : result;
-      if (base == 10) {
-        return result;
       } else {
-        return (long) result;
+        BigInteger bigInteger = new BigInteger(numStr, base);
+        result = bigInteger.longValue();
       }
-    } else {
-      return Long.parseLong(numStr, base);
+    } catch (Exception e) {
+
     }
+    return result;
   }
 }

core/src/test/java/org/opensearch/sql/expression/function/udf/ToNumberFunctionTest.java

@@ -141,29 +141,12 @@ void testToNumberInvalidBase() {
 
   @Test
   void testToNumberInvalidDigits() {
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> {
-          ToNumberFunction.toNumber("12A", 10);
-        });
-
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> {
-          ToNumberFunction.toNumber("102", 2);
-        });
-
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> {
-          ToNumberFunction.toNumber("189", 8);
-        });
-
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> {
-          ToNumberFunction.toNumber("GHI", 16);
-        });
+    assertEquals(null, ToNumberFunction.toNumber("12A", 10));
+    assertEquals(null, ToNumberFunction.toNumber("102", 2));
+    assertEquals(null, ToNumberFunction.toNumber("101.101", 2));
+    assertEquals(null, ToNumberFunction.toNumber("189", 8));
+    assertEquals(null, ToNumberFunction.toNumber("GHI", 16));
+    assertEquals(null, ToNumberFunction.toNumber("FF.8", 16));
   }
 
   @Test