fix IT

Signed-off-by: Lantao Jin <ltjin@amazon.com>

Author: LantaoJin

core/src/main/java/org/opensearch/sql/executor/OpenSearchTypeSystem.java

@@ -18,11 +18,33 @@ private OpenSearchTypeSystem() {}
 
   @Override
   public RelDataType deriveAvgAggType(RelDataTypeFactory typeFactory, RelDataType argumentType) {
-    if (SqlTypeName.INT_TYPES.contains(argumentType.getSqlTypeName())) {
+    if (SqlTypeName.DECIMAL == argumentType.getSqlTypeName()) {
+      return typeFactory.createTypeWithNullability(highPrecision(typeFactory, argumentType), false);
+    } else if (SqlTypeName.INT_TYPES.contains(argumentType.getSqlTypeName())) {
       return typeFactory.createTypeWithNullability(
           typeFactory.createSqlType(SqlTypeName.DOUBLE), false);
     } else {
       return argumentType;
     }
   }
+
+  /**
+   * Compute a higher precision version of a type.
+   *
+   * @return If type is a DECIMAL type, return a type with the precision and scale +4, to align the
+   *     behaviour with Apache Spark.
+   */
+  public static RelDataType highPrecision(
+      final RelDataTypeFactory typeFactory, final RelDataType type) {
+    if (type.getSqlTypeName() == SqlTypeName.DECIMAL) {
+      return typeFactory.createSqlType(
+          type.getSqlTypeName(),
+          Math.min(
+              type.getPrecision() + 4,
+              typeFactory.getTypeSystem().getMaxPrecision(SqlTypeName.DECIMAL)),
+          Math.min(
+              type.getScale() + 4, typeFactory.getTypeSystem().getMaxScale(SqlTypeName.DECIMAL)));
+    }
+    return type;
+  }
 }

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

@@ -13,9 +13,11 @@
 import org.apache.calcite.adapter.enumerable.RexToLixTranslator;
 import org.apache.calcite.linq4j.tree.Expression;
 import org.apache.calcite.linq4j.tree.Expressions;
+import org.apache.calcite.rel.type.RelDataTypeSystem;
 import org.apache.calcite.rex.RexCall;
 import org.apache.calcite.sql.type.ReturnTypes;
 import org.apache.calcite.sql.type.SqlReturnTypeInference;
+import org.apache.calcite.sql.type.SqlTypeName;
 import org.opensearch.sql.calcite.utils.MathUtils;
 import org.opensearch.sql.expression.function.ImplementorUDF;
 
@@ -26,7 +28,12 @@
  * PPL. Therefore, we implement our versions
  */
 public class DivideFunction extends ImplementorUDF {
-  public static final int MAX_SCALE = 38;
+  /**
+   * The maximum scale of numeric which is aligned with {@link
+   * RelDataTypeSystem#getMaxScale(SqlTypeName)}. TODO The max scale in Spark is 38, but the default
+   * max scale in Calcite is 19.
+   */
+  public static final int MAX_NUMERIC_SCALE = 19;
 
   public DivideFunction() {
     super(new DivideImplementor(), NullPolicy.ANY);
@@ -59,10 +66,13 @@ public static Number divide(Number dividend, Number divisor) {
         return MathUtils.coerceToWidestIntegralType(dividend, divisor, result);
       } else if (MathUtils.isDecimal(dividend) && MathUtils.isIntegral(divisor)) {
         return ((BigDecimal) dividend)
-            .divide(BigDecimal.valueOf(divisor.longValue()), MAX_SCALE + 1, RoundingMode.HALF_UP);
+            .divide(
+                BigDecimal.valueOf(divisor.longValue()),
+                MAX_NUMERIC_SCALE + 1,
+                RoundingMode.HALF_UP);
       } else if (MathUtils.isIntegral(dividend) && MathUtils.isDecimal(divisor)) {
         return (BigDecimal.valueOf(dividend.longValue()))
-            .divide((BigDecimal) divisor, MAX_SCALE + 1, RoundingMode.HALF_UP);
+            .divide((BigDecimal) divisor, MAX_NUMERIC_SCALE + 1, RoundingMode.HALF_UP);
       }
       double result = dividend.doubleValue() / divisor.doubleValue();
       return MathUtils.coerceToWidestFloatingType(dividend, divisor, result);

integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteStatsCommandIT.java

@@ -5,13 +5,6 @@
 
 package org.opensearch.sql.calcite.remote;
 
-import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
-import static org.opensearch.sql.util.MatcherUtils.rows;
-import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
-
-import java.io.IOException;
-import org.json.JSONObject;
-import org.junit.jupiter.api.Test;
 import org.opensearch.sql.ppl.StatsCommandIT;
 
 public class CalciteStatsCommandIT extends StatsCommandIT {
@@ -20,13 +13,6 @@ public void init() throws Exception {
     super.init();
     enableCalcite();
     disallowCalciteFallback();
-  }
-
-  @Test
-  public void testStatsNestedDoubleValue2() throws IOException {
-    JSONObject response =
-        executeQuery(
-            String.format("source=%s | eval t = typeof(avg(abs(age) * 2.0))", TEST_INDEX_ACCOUNT));
-    verifyDataRows(response, rows("60.342"));
+    setQuerySizeLimit(2000);
   }
 }

integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLIntegTestCase.java

@@ -109,7 +109,7 @@ private Settings defaultSettings() {
     return new Settings() {
       private final Map<Key, Object> defaultSettings =
           new ImmutableMap.Builder<Key, Object>()
-              .put(Key.QUERY_SIZE_LIMIT, 200)
+              .put(Key.QUERY_SIZE_LIMIT, 2000)
               .put(Key.FIELD_TYPE_TOLERANCE, true)
               .put(Key.CALCITE_ENGINE_ENABLED, true)
               .put(Key.CALCITE_FALLBACK_ALLOWED, false)
@@ -135,7 +135,7 @@ protected Settings enablePushdown() {
     return new Settings() {
       private final Map<Key, Object> defaultSettings =
           new ImmutableMap.Builder<Key, Object>()
-              .put(Key.QUERY_SIZE_LIMIT, 200)
+              .put(Key.QUERY_SIZE_LIMIT, 2000)
               .put(Key.FIELD_TYPE_TOLERANCE, true)
               .put(Key.CALCITE_ENGINE_ENABLED, true)
               .put(Key.CALCITE_FALLBACK_ALLOWED, false)