Merge branch '4636-fix-ut' into issues/4636

Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>

Author: yuancu

api/src/test/java/org/opensearch/sql/api/transpiler/UnifiedQueryTranspilerTest.java

@@ -43,11 +43,9 @@ public void testToSqlWithCustomDialect() {
     UnifiedQueryTranspiler customTranspiler =
         UnifiedQueryTranspiler.builder().dialect(OpenSearchSparkSqlDialect.DEFAULT).build();
     String actualSql = customTranspiler.toSql(plan);
-    String expectedSql =
-        normalize(
-            "SELECT *\nFROM `catalog`.`employees`\nWHERE TRY_CAST(`name` AS DOUBLE) = 1.230E2");
+    String expectedSql = normalize("SELECT *\nFROM `catalog`.`employees`\nWHERE `name` = 123");
     assertEquals(
-        "Transpiled query using OpenSearchSparkSqlDialect should translate SAFE_CAST to TRY_CAST",
+        "Numeric types can be implicitly coerced to string with OpenSearchSparkSqlDialect",
         expectedSql,
         actualSql);
   }

opensearch/src/test/java/org/opensearch/sql/opensearch/request/PredicateAnalyzerTest.java

@@ -831,15 +831,42 @@ void isNullOr_ScriptPushDown() throws ExpressionNotAnalyzableException {
             .add("a", builder.getTypeFactory().createSqlType(SqlTypeName.BIGINT))
             .add("b", builder.getTypeFactory().createSqlType(SqlTypeName.VARCHAR))
             .build();
-    // PPL IS_EMPTY is translated to OR(IS_NULL(arg), IS_EMPTY(arg))
+    // PPL IS_EMPTY is translated to OR(IS_NULL(arg), EQUALS("")) (not IS_EMPTY because IS_EMPTY is
+    // only for collections)
     RexNode call = PPLFuncImpTable.INSTANCE.resolve(builder, BuiltinFunctionName.IS_EMPTY, field2);
     Hook.CURRENT_TIME.addThread((Consumer<Holder<Long>>) h -> h.set(0L));
     QueryExpression expression =
         PredicateAnalyzer.analyzeExpression(call, schema, fieldTypes, rowType, cluster);
     assert (expression
         .builder()
         .toString()
-        .contains("\"lang\" : \"opensearch_compounded_script\""));
+        .contains(
+            """
+                "should" : [
+                  {
+                    "bool" : {
+                      "must_not" : [
+                        {
+                          "exists" : {
+                            "field" : "b",
+                            "boost" : 1.0
+                          }
+                        }
+                      ],
+                      "adjust_pure_negative" : true,
+                      "boost" : 1.0
+                    }
+                  },
+                  {
+                    "term" : {
+                      "b.keyword" : {
+                        "value" : "",
+                        "boost" : 1.0
+                      }
+                    }
+                  }
+                ]\
+            """));
   }
 
   @Test

ppl/src/test/java/org/opensearch/sql/ppl/calcite/CalcitePPLAbstractTest.java

@@ -46,6 +46,7 @@
 import org.opensearch.sql.calcite.CalciteRelNodeVisitor;
 import org.opensearch.sql.calcite.SysLimit;
 import org.opensearch.sql.calcite.validate.OpenSearchSparkSqlDialect;
+import org.opensearch.sql.calcite.validate.converters.PplRelToSqlNodeConverter;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
@@ -65,7 +66,7 @@ public CalcitePPLAbstractTest(CalciteAssert.SchemaSpec... schemaSpecs) {
     this.config = config(schemaSpecs);
     this.dataSourceService = mock(DataSourceService.class);
     this.planTransformer = new CalciteRelNodeVisitor(dataSourceService);
-    this.converter = new RelToSqlConverter(OpenSearchSparkSqlDialect.DEFAULT);
+    this.converter = new PplRelToSqlNodeConverter(OpenSearchSparkSqlDialect.DEFAULT);
     this.settings = mock(Settings.class);
   }