remove useless change

Signed-off-by: xinyual <xinyual@amazon.com>

Author: xinyual

core/src/main/java/org/opensearch/sql/calcite/utils/UserDefinedFunctionUtils.java

@@ -21,27 +21,20 @@
 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.linq4j.tree.Types;
 import org.apache.calcite.rel.type.RelDataType;
 import org.apache.calcite.rel.type.RelDataTypeFactory;
 import org.apache.calcite.rex.RexCall;
 import org.apache.calcite.rex.RexNode;
-import org.apache.calcite.schema.ScalarFunction;
 import org.apache.calcite.schema.impl.AggregateFunctionImpl;
-import org.apache.calcite.schema.impl.ScalarFunctionImpl;
 import org.apache.calcite.sql.SqlIdentifier;
 import org.apache.calcite.sql.SqlKind;
-import org.apache.calcite.sql.SqlOperator;
 import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.calcite.sql.type.InferTypes;
 import org.apache.calcite.sql.type.SqlReturnTypeInference;
 import org.apache.calcite.sql.type.SqlTypeName;
 import org.apache.calcite.sql.validate.SqlUserDefinedAggFunction;
-import org.apache.calcite.sql.validate.SqlUserDefinedFunction;
 import org.apache.calcite.tools.RelBuilder;
 import org.apache.calcite.util.Optionality;
 import org.opensearch.sql.calcite.udf.UserDefinedAggFunction;
-import org.opensearch.sql.calcite.udf.UserDefinedFunction;
 import org.opensearch.sql.data.model.ExprValueUtils;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.executor.QueryType;
@@ -80,23 +73,6 @@ public static RelBuilder.AggCall TransferUserDefinedAggFunction(
     return relBuilder.aggregateCall(sqlUDAF, addArgList);
   }
 
-  public static SqlOperator TransferUserDefinedFunction(
-      Class<? extends UserDefinedFunction> UDF,
-      String functionName,
-      SqlReturnTypeInference returnType) {
-    final ScalarFunction udfFunction =
-        ScalarFunctionImpl.create(Types.lookupMethod(UDF, "eval", Object[].class));
-    SqlIdentifier udfLtrimIdentifier =
-        new SqlIdentifier(Collections.singletonList(functionName), null, SqlParserPos.ZERO, null);
-    return new SqlUserDefinedFunction(
-        udfLtrimIdentifier,
-        SqlKind.OTHER_FUNCTION,
-        returnType,
-        InferTypes.ANY_NULLABLE,
-        null,
-        udfFunction);
-  }
-
   static SqlReturnTypeInference getReturnTypeInferenceForArray() {
     return opBinding -> {
       RelDataTypeFactory typeFactory = opBinding.getTypeFactory();

core/src/main/java/org/opensearch/sql/expression/function/PPLFuncImpTable.java

@@ -84,23 +84,6 @@ default List<RelDataType> getParams() {
     }
   }
 
-  public interface FunctionImpAny extends FunctionImp {
-    RexNode resolve(RexBuilder builder, List<RexNode> additonalArgs, RexNode... args);
-
-    @Override
-    default RexNode resolve(RexBuilder builder, RexNode... args) {
-      if (args.length != 2) {
-        throw new IllegalArgumentException("This function requires exactly 2 arguments");
-      }
-      return resolve(builder, args[0], args[1]);
-    }
-
-    @Override
-    default List<RelDataType> getParams() {
-      return null;
-    }
-  }
-
   /** The singleton instance. */
   public static final PPLFuncImpTable INSTANCE;
 

integ-test/build.gradle

@@ -453,7 +453,7 @@ integTest {
     }
 
     // enable calcite codegen in IT
-    systemProperty 'calcite.debug', 'true'
+    systemProperty 'calcite.debug', 'false'
     systemProperty 'org.codehaus.janino.source_debugging.enable', 'false'
     systemProperty 'org.codehaus.janino.source_debugging.dir', calciteCodegen
 

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

@@ -211,19 +211,6 @@ public void testJsonValid() {
     verifyDataRows(actual, rows(true, false));
   }
 
-  @Test
-  public void testArray() {
-    JSONObject actual =
-        executeQuery(
-            String.format(
-                "source=%s | eval a =array(1, 2, 0, -1, 1.1, -0.11) | fields a | head 1",
-                TEST_INDEX_PEOPLE2));
-
-    verifySchema(actual, schema("a", "string"));
-
-    verifyDataRows(actual, rows("[1,2,0,-1,1.1,-0.11]"));
-  }
-
   @Test
   public void testJsonSet() {
     JSONObject actual =
@@ -333,7 +320,7 @@ public void testJsonExtend() {
                     + " json_extend('{\"teacher\":[\"Alice\"],\"student\":[{\"name\":\"Bob\",\"rank\":1},{\"name\":\"Charlie\",\"rank\":2}]}',"
                     + " 'teacher', 'Tom', 'teacher', 'Walt'),c ="
                     + " json_extend('{\"school\":{\"teacher\":[\"Alice\"],\"student\":[{\"name\":\"Bob\",\"rank\":1},{\"name\":\"Charlie\",\"rank\":2}]}}',"
-                    + " 'school.teacher', array(\"Tom\", \"Walt\"))| fields a, b, c | head 1",
+                    + " 'school.teacher', json_array(\"Tom\", \"Walt\"))| fields a, b, c | head 1",
                 TEST_INDEX_PEOPLE2));
 
     verifySchema(actual, schema("a", "string"), schema("b", "string"), schema("c", "string"));

ppl/src/main/antlr/OpenSearchPPLLexer.g4

@@ -367,9 +367,6 @@ ISNOTNULL:                          'ISNOTNULL';
 CIDRMATCH:                          'CIDRMATCH';
 BETWEEN:                            'BETWEEN';
 
-// COLLECTION FUNCTIONS
-ARRAY:                              'ARRAY';
-
 // JSON FUNCTIONS
 JSON_VALID:                         'JSON_VALID';
 JSON:                               'JSON';

ppl/src/main/antlr/OpenSearchPPLParser.g4

@@ -580,7 +580,6 @@ evalFunctionName
    | cryptographicFunctionName
    | jsonFunctionName
    | geoipFunctionName
-   | collectionFunctionName
    ;
 
 functionArgs
@@ -699,10 +698,6 @@ trigonometricFunctionName
    | TAN
    ;
 
-collectionFunctionName
-    : ARRAY
-    ;
-
 jsonFunctionName
    : JSON
    | JSON_OBJECT