change IT logic

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

Author: xinyual

core/src/main/java/org/opensearch/sql/ast/expression/SearchComparison.java

@@ -70,7 +70,7 @@ public String toQueryString() {
   @Override
   public Function toDSLFunction() {
     String fieldName = QueryStringUtils.escapeFieldName(field.getField().toString());
-    String valueStr = value.toQueryString();
+    String valueStr = value.getLiteral().toString();
     if (operator == EQUALS
         && !(valueStr.contains("*")
             || valueStr.contains("?"))) { // for regex case, we cannot use match

integ-test/src/test/java/org/opensearch/sql/ppl/SearchCommandIT.java

@@ -519,11 +519,16 @@ public void testWildcardEscaping() throws IOException {
     // lucene escaping -> \\\\
     // rest request escaping -> \\\\\\\\
     // java string escaping ->\\\\\\\\
+    String targetString = "\\\"C:\\\\\\\\\\\\\\\\Users\\\\\\\\\\\\\\\\admin\\\"";
+    if (isCalciteEnabled() && !isPushdownDisabled()) {
+      targetString = "\\\"C:\\\\\\\\Users\\\\\\\\admin\\\"";
+    }
     JSONObject backslashSearch =
         executeQuery(
             String.format(
                 "search source=%s"
-                    + " `attributes.error.type`=\\\"C:\\\\\\\\\\\\\\\\Users\\\\\\\\\\\\\\\\admin\\\""
+                    + " `attributes.error.type`="
+                    + targetString
                     + " | sort time | fields attributes.error.type",
                 TEST_INDEX_OTEL_LOGS));
     verifyDataRows(backslashSearch, rows("C:\\Users\\admin"));
@@ -712,20 +717,44 @@ public void testSearchWithUpperCaseValue() throws IOException {
 
   @Test
   public void testSearchWithInvalidFieldName() throws IOException {
-    JSONObject result =
-        executeQuery(
-            String.format(
-                "search source=%s nonexistent_field=\\\"value\\\"", TEST_INDEX_OTEL_LOGS));
-    verifyDataRows(result);
+    if (!isPushdownDisabled() && isCalciteEnabled()) {
+      Throwable error =
+          assertThrows(
+              Exception.class,
+              () ->
+                  executeQuery(
+                      String.format(
+                          "search source=%s nonexistent_field=\\\"value\\\"",
+                          TEST_INDEX_OTEL_LOGS)));
+      assertTrue(error.getMessage().contains("Field [nonexistent_field] not found."));
+    } else {
+      JSONObject result =
+          executeQuery(
+              String.format(
+                  "search source=%s nonexistent_field=\\\"value\\\"", TEST_INDEX_OTEL_LOGS));
+      verifyDataRows(result);
+    }
   }
 
   @Test
   public void testSearchWithTypeMismatch() throws IOException {
-    JSONObject result =
-        executeQuery(
-            String.format(
-                "search source=%s severityNumber=\\\"not-a-number\\\"", TEST_INDEX_OTEL_LOGS));
-    verifyDataRows(result);
+    if (!isPushdownDisabled() && isCalciteEnabled()) {
+      Throwable error =
+          assertThrows(
+              Exception.class,
+              () ->
+                  executeQuery(
+                      String.format(
+                          "search source=%s severityNumber=\\\"not-a-number\\\"",
+                          TEST_INDEX_OTEL_LOGS)));
+      assertTrue(error.getMessage().contains("NumberFormatException"));
+    } else {
+      JSONObject result =
+          executeQuery(
+              String.format(
+                  "search source=%s severityNumber=\\\"not-a-number\\\"", TEST_INDEX_OTEL_LOGS));
+      verifyDataRows(result);
+    }
   }
 
   @Test