Fix merging

Signed-off-by: Heng Qian <[email protected]>

Author: qianheng-aws

Diff for: integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteObjectFieldOperatorIT.java

@@ -5,10 +5,8 @@
 
 package org.opensearch.sql.calcite.remote.fallback;
 
-import org.junit.Ignore;
 import org.opensearch.sql.ppl.ObjectFieldOperateIT;
 
-@Ignore("https://github.com/opensearch-project/sql/issues/3452")
 public class CalciteObjectFieldOperateIT extends ObjectFieldOperateIT {
   @Override
   public void init() throws Exception {

Diff for: integ-test/src/test/java/org/opensearch/sql/calcite/remote/fallback/CalciteObjectFieldOperateIT.java

@@ -5,10 +5,8 @@
 
 package org.opensearch.sql.calcite.remote.nonfallback;
 
-import org.junit.Ignore;
 import org.opensearch.sql.calcite.remote.fallback.CalciteObjectFieldOperateIT;
 
-@Ignore("https://github.com/opensearch-project/sql/issues/3452")
 public class NonFallbackCalciteObjectFieldOperateIT extends CalciteObjectFieldOperateIT {
   @Override
   public void init() throws Exception {

Diff for: integ-test/src/test/java/org/opensearch/sql/calcite/remote/nonfallback/NonFallbackCalciteObjectFieldOperateIT.java

@@ -52,7 +52,10 @@ public void group_object_field_in_stats() throws IOException {
     JSONObject result =
         executeQuery(
             String.format("source=%s | stats count() by city.name", TEST_INDEX_DEEP_NESTED));
-    verifySchema(result, schema("count()", "integer"), schema("city.name", "string"));
+    verifySchema(
+        result,
+        schema("count()", isCalciteEnabled() ? "long" : "integer"),
+        schema("city.name", "string"));
     verifyDataRows(result, rows(1, "Seattle"));
   }