fix IT and apply spotless

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

Author: xinyual

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

@@ -64,7 +64,7 @@ public void testMultipleSourceQuery_SameTable() {
 
   @Test
   public void testMultipleSourceQuery_DifferentTables() {
-    JSONObject actual = executeQuery("source=test, test1");
+    JSONObject actual = executeQuery("source=test, test1 | fields name, alias, age");
     verifySchema(
         actual, schema("name", "string"), schema("age", "long"), schema("alias", "string"));
     verifyDataRows(
@@ -73,7 +73,7 @@ public void testMultipleSourceQuery_DifferentTables() {
 
   @Test
   public void testIndexPatterns() {
-    JSONObject actual = executeQuery("source=test*");
+    JSONObject actual = executeQuery("source=test* | fields name, alias, age");
     verifySchema(
         actual, schema("name", "string"), schema("age", "long"), schema("alias", "string"));
     verifyDataRows(

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

@@ -67,6 +67,7 @@ public void testCaseWhenWithCast() {
                             cast(response as int) >= 500 AND cast(response as int) < 600, "Server Error"
                             else concat("Incorrect HTTP status code for", url))
                     | where status != "Success"
+                    | fields host, method, bytes, response, url, status
                     """,
                 TEST_INDEX_WEBLOGS));
     verifySchema(
@@ -111,6 +112,7 @@ public void testCaseWhenNoElse() {
                             cast(response as int) >= 400 AND cast(response as int) < 500, "Client Error",
                             cast(response as int) >= 500 AND cast(response as int) < 600, "Server Error")
                     | where isnull(status) OR status != "Success"
+                    | fields host, method, bytes, response, url, status
                     """,
                 TEST_INDEX_WEBLOGS));
     verifySchema(
@@ -150,6 +152,7 @@ response in ('400', '403'), "Client Error",
                             response in ('500', '505'), "Server Error"
                             else concat("Incorrect HTTP status code for", url))
                     | where status != "Success"
+                    | fields host, method, bytes, response, url, status
                     """,
                 TEST_INDEX_WEBLOGS));
     verifySchema(
@@ -194,6 +197,7 @@ response in ('300', '301'), false,
                             response in ('400', '403'), false,
                             response in ('500', '505'), false
                             else false)
+                    | fields host, method, bytes, response, url
                     """,
                 TEST_INDEX_WEBLOGS));
     verifySchema(
@@ -228,6 +232,7 @@ response in ('500', '505'), "500"
                             else concat("Incorrect HTTP status code for", url))
                         | fields new_response
                       ]
+                    | fields host, method, bytes, response, url
                     """,
                 TEST_INDEX_WEBLOGS, TEST_INDEX_WEBLOGS));
     verifySchema(

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

@@ -242,7 +242,7 @@ public void testReorderDedupFieldsShouldNotAffectResult() {
         executeQuery(
             String.format(
                 """
-                source=%s | dedup 2 name, category
+                source=%s | dedup 2 name, category | fields name, category, id
                 """,
                 TEST_INDEX_DUPLICATION_NULLABLE));
     verifySchemaInOrder(
@@ -254,7 +254,7 @@ public void testReorderDedupFieldsShouldNotAffectResult() {
         executeQuery(
             String.format(
                 """
-                source=%s | dedup 2 category, name
+                source=%s | dedup 2 category, name | fields name, category, id
                 """,
                 TEST_INDEX_DUPLICATION_NULLABLE));
     verifySchemaInOrder(
@@ -266,7 +266,7 @@ public void testReorderDedupFieldsShouldNotAffectResult() {
         executeQuery(
             String.format(
                 """
-                source=%s | dedup 2 name, category KEEPEMPTY=true
+                source=%s | dedup 2 name, category KEEPEMPTY=true | fields name, category, id
                 """,
                 TEST_INDEX_DUPLICATION_NULLABLE));
     verifySchemaInOrder(
@@ -278,7 +278,7 @@ public void testReorderDedupFieldsShouldNotAffectResult() {
         executeQuery(
             String.format(
                 """
-                source=%s | dedup 2 category, name KEEPEMPTY=true
+                source=%s | dedup 2 category, name KEEPEMPTY=true | fields name, category, id
                 """,
                 TEST_INDEX_DUPLICATION_NULLABLE));
     verifySchemaInOrder(

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

@@ -36,7 +36,7 @@ public void testEventstat() {
         executeQuery(
             String.format(
                 "source=%s | eventstats count() as cnt, avg(age) as avg, min(age) as min, max(age)"
-                    + " as max",
+                    + " as max | fields name, country, state, month, year, age, cnt, avg, min, max",
                 TEST_INDEX_STATE_COUNTRY));
 
     verifySchemaInOrder(
@@ -66,7 +66,7 @@ public void testEventstatWithNull() {
         executeQuery(
             String.format(
                 "source=%s | eventstats count() as cnt, avg(age) as avg, min(age) as min, max(age)"
-                    + " as max",
+                    + " as max | fields name, country, state, month, year, age, cnt, avg, min, max",
                 TEST_INDEX_STATE_COUNTRY_WITH_NULL));
 
     verifySchemaInOrder(
@@ -98,7 +98,8 @@ public void testEventstatBy() {
         executeQuery(
             String.format(
                 "source=%s | eventstats count() as cnt, avg(age) as avg, min(age) as min, max(age)"
-                    + " as max by country",
+                    + " as max by country | fields name, country, state, month, year, age, cnt,"
+                    + " avg, min, max",
                 TEST_INDEX_STATE_COUNTRY));
 
     verifySchemaInOrder(
@@ -128,7 +129,8 @@ public void testEventstatByWithNull() {
         executeQuery(
             String.format(
                 "source=%s | eventstats count() as cnt, avg(age) as avg, min(age) as min, max(age)"
-                    + " as max by country",
+                    + " as max by country | fields name, country, state, month, year, age, cnt,"
+                    + " avg, min, max",
                 TEST_INDEX_STATE_COUNTRY_WITH_NULL));
 
     verifySchemaInOrder(
@@ -157,7 +159,8 @@ public void testEventstatByWithNull() {
         executeQuery(
             String.format(
                 "source=%s | eventstats count() as cnt, avg(age) as avg, min(age) as min, max(age)"
-                    + " as max by state",
+                    + " as max by state | fields name, country, state, month, year, age, cnt, avg,"
+                    + " min, max",
                 TEST_INDEX_STATE_COUNTRY_WITH_NULL));
     verifyDataRows(
         actual,
@@ -175,7 +178,8 @@ public void testEventstatBySpan() {
         executeQuery(
             String.format(
                 "source=%s | eventstats count() as cnt, avg(age) as avg, min(age) as min, max(age)"
-                    + " as max by span(age, 10) as age_span",
+                    + " as max by span(age, 10) as age_span | fields name, country, state, month,"
+                    + " year, age, cnt, avg, min, max",
                 TEST_INDEX_STATE_COUNTRY));
 
     verifyDataRows(
@@ -192,7 +196,8 @@ public void testEventstatBySpanWithNull() {
         executeQuery(
             String.format(
                 "source=%s | eventstats count() as cnt, avg(age) as avg, min(age) as min, max(age)"
-                    + " as max by span(age, 10) as age_span",
+                    + " as max by span(age, 10) as age_span | fields name, country, state, month,"
+                    + " year, age, cnt, avg, min, max",
                 TEST_INDEX_STATE_COUNTRY_WITH_NULL));
 
     verifyDataRows(
@@ -211,7 +216,8 @@ public void testEventstatByMultiplePartitions1() {
         executeQuery(
             String.format(
                 "source=%s | eventstats count() as cnt, avg(age) as avg, min(age) as min, max(age)"
-                    + " as max by span(age, 10) as age_span, country",
+                    + " as max by span(age, 10) as age_span, country | fields name, country, state,"
+                    + " month, year, age, cnt, avg, min, max",
                 TEST_INDEX_STATE_COUNTRY));
 
     verifyDataRows(
@@ -228,7 +234,8 @@ public void testEventstatByMultiplePartitions2() {
         executeQuery(
             String.format(
                 "source=%s | eventstats count() as cnt, avg(age) as avg, min(age) as min, max(age)"
-                    + " as max by span(age, 10) as age_span, state",
+                    + " as max by span(age, 10) as age_span, state | fields name, country, state,"
+                    + " month, year, age, cnt, avg, min, max",
                 TEST_INDEX_STATE_COUNTRY));
 
     verifyDataRows(
@@ -245,7 +252,8 @@ public void testEventstatByMultiplePartitionsWithNull1() {
         executeQuery(
             String.format(
                 "source=%s | eventstats count() as cnt, avg(age) as avg, min(age) as min, max(age)"
-                    + " as max by span(age, 10) as age_span, country",
+                    + " as max by span(age, 10) as age_span, country | fields name, country, state,"
+                    + " month, year, age, cnt, avg, min, max",
                 TEST_INDEX_STATE_COUNTRY_WITH_NULL));
 
     verifyDataRows(
@@ -264,7 +272,8 @@ public void testEventstatByMultiplePartitionsWithNull2() {
         executeQuery(
             String.format(
                 "source=%s | eventstats count() as cnt, avg(age) as avg, min(age) as min, max(age)"
-                    + " as max by span(age, 10) as age_span, state",
+                    + " as max by span(age, 10) as age_span, state | fields name, country, state,"
+                    + " month, year, age, cnt, avg, min, max",
                 TEST_INDEX_STATE_COUNTRY_WITH_NULL));
 
     verifyDataRows(
@@ -320,7 +329,8 @@ public void testMultipleEventstat() {
         executeQuery(
             String.format(
                 "source=%s | eventstats avg(age) as avg_age by state, country | eventstats"
-                    + " avg(avg_age) as avg_state_age by country",
+                    + " avg(avg_age) as avg_state_age by country | fields name, country, state,"
+                    + " month, year, age, avg_age, avg_state_age",
                 TEST_INDEX_STATE_COUNTRY));
 
     verifyDataRows(
@@ -337,7 +347,8 @@ public void testMultipleEventstatWithNull() {
         executeQuery(
             String.format(
                 "source=%s | eventstats avg(age) as avg_age by state, country | eventstats"
-                    + " avg(avg_age) as avg_state_age by country",
+                    + " avg(avg_age) as avg_state_age by country | fields name, country, state,"
+                    + " month, year, age, avg_age, avg_state_age",
                 TEST_INDEX_STATE_COUNTRY_WITH_NULL));
 
     verifyDataRows(
@@ -358,7 +369,9 @@ public void testMultipleEventstatWithEval() {
                 "source=%s | eventstats avg(age) as avg_age by country, state, name | eval"
                     + " avg_age_divide_20 = avg_age - 20 | eventstats avg(avg_age_divide_20) as"
                     + " avg_state_age by country, state | where avg_state_age > 0 | eventstats"
-                    + " count(avg_state_age) as count_country_age_greater_20 by country",
+                    + " count(avg_state_age) as count_country_age_greater_20 by country | fields"
+                    + " name, country, state, month, year, age, avg_age, avg_age_divide_20,"
+                    + " avg_state_age, count_country_age_greater_20",
                 TEST_INDEX_STATE_COUNTRY));
 
     verifyDataRows(
@@ -394,7 +407,8 @@ public void testEventstatVariance() {
         executeQuery(
             String.format(
                 "source=%s | eventstats stddev_pop(age), stddev_samp(age), var_pop(age),"
-                    + " var_samp(age)",
+                    + " var_samp(age) | fields name, country, state, month, year, age,"
+                    + " `stddev_pop(age)`, `stddev_samp(age)`, `var_pop(age)`, `var_samp(age)`",
                 TEST_INDEX_STATE_COUNTRY));
 
     verifySchemaInOrder(
@@ -464,7 +478,8 @@ public void testEventstatVarianceWithNull() {
         executeQuery(
             String.format(
                 "source=%s | eventstats stddev_pop(age), stddev_samp(age), var_pop(age),"
-                    + " var_samp(age)",
+                    + " var_samp(age) | fields name, country, state, month, year, age,"
+                    + " `stddev_pop(age)`, `stddev_samp(age)`, `var_pop(age)`, `var_samp(age)`",
                 TEST_INDEX_STATE_COUNTRY_WITH_NULL));
 
     verifySchemaInOrder(
@@ -527,7 +542,8 @@ public void testEventstatVarianceBy() {
         executeQuery(
             String.format(
                 "source=%s | eventstats stddev_pop(age), stddev_samp(age), var_pop(age),"
-                    + " var_samp(age) by country",
+                    + " var_samp(age) by country | fields name, country, state, month, year, age,"
+                    + " `stddev_pop(age)`, `stddev_samp(age)`, `var_pop(age)`, `var_samp(age)`",
                 TEST_INDEX_STATE_COUNTRY));
 
     verifyDataRows(
@@ -543,7 +559,8 @@ public void testEventstatVarianceBySpan() {
     JSONObject actual =
         executeQuery(
             String.format(
-                "source=%s | where country != 'USA' | eventstats stddev_samp(age) by span(age, 10)",
+                "source=%s | where country != 'USA' | eventstats stddev_samp(age) by span(age, 10)"
+                    + " | fields name, country, state, month, year, age, `stddev_samp(age)`",
                 TEST_INDEX_STATE_COUNTRY));
 
     verifyDataRows(
@@ -558,7 +575,8 @@ public void testEventstatVarianceWithNullBy() {
         executeQuery(
             String.format(
                 "source=%s | eventstats stddev_pop(age), stddev_samp(age), var_pop(age),"
-                    + " var_samp(age) by country",
+                    + " var_samp(age) by country | fields name, country, state, month, year, age,"
+                    + " `stddev_pop(age)`, `stddev_samp(age)`, `var_pop(age)`, `var_samp(age)`",
                 TEST_INDEX_STATE_COUNTRY_WITH_NULL));
 
     verifyDataRows(

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

@@ -52,6 +52,7 @@ public void testSelfInSubquery() {
                        | where country = 'USA'
                        | fields id
                      ]
+                   | fields name, country, occupation, id, salary
                    """,
                 TEST_INDEX_WORKER, TEST_INDEX_WORKER));
     verifySchema(
@@ -314,6 +315,7 @@ public void testNestedInSubquery2() {
                        | fields uid
                      ]
                    | sort  - salary
+                   | fields name, country, occupation, id, salary
                    """,
                 TEST_INDEX_WORKER, TEST_INDEX_WORK_INFORMATION, TEST_INDEX_OCCUPATION));
     verifySchema(

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

@@ -250,7 +250,8 @@ public void testComplexSemiJoin() {
         executeQuery(
             String.format(
                 "source = %s | where country = 'Canada' OR country = 'England' | left semi join"
-                    + " left=a, right=b ON a.name = b.name %s | sort a.age",
+                    + " left=a, right=b ON a.name = b.name %s | sort a.age | fields name, country,"
+                    + " state, month, year, age",
                 TEST_INDEX_STATE_COUNTRY, TEST_INDEX_OCCUPATION));
     verifySchema(
         actual,
@@ -272,7 +273,8 @@ public void testComplexAntiJoin() {
         executeQuery(
             String.format(
                 "source = %s | where country = 'Canada' OR country = 'England' | left anti join"
-                    + " left=a, right=b ON a.name = b.name %s | sort a.age",
+                    + " left=a, right=b ON a.name = b.name %s | sort a.age | fields name, country,"
+                    + " state, month, year, age",
                 TEST_INDEX_STATE_COUNTRY, TEST_INDEX_OCCUPATION));
     verifySchema(
         actual,

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

@@ -13,6 +13,9 @@
 import static org.opensearch.sql.util.MatcherUtils.verifySchemaInOrder;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
 import org.json.JSONObject;
 import org.junit.Test;
 
@@ -55,7 +58,7 @@ public void testRefRenamedField() {
                    source = %s | rename age as renamed_age | fields age
                    """,
                         TEST_INDEX_STATE_COUNTRY)));
-    assertEquals(
+    verifyErrorMessage(
         "field [age] not found; input fields are: [name, country, state, month, year, renamed_age,"
             + " _id, _index, _score, _maxscore, _sort, _routing]",
         e.getMessage());
@@ -73,7 +76,7 @@ public void testRenameNotExistedField() {
                    source = %s | rename renamed_age as age
                    """,
                         TEST_INDEX_STATE_COUNTRY)));
-    assertEquals(
+    verifyErrorMessage(
         "field [renamed_age] not found; input fields are: [name, country, state, month, year, age,"
             + " _id, _index, _score, _maxscore, _sort, _routing]",
         e.getMessage());
@@ -182,4 +185,19 @@ public void testRenameWithBackticksInAgg() {
     verifySchemaInOrder(result, schema("avg(`user_age`)", "double"), schema("country", "string"));
     verifyDataRows(result, rows(22.5, "Canada"), rows(50.0, "USA"));
   }
+
+  private void verifyErrorMessage(String actual, String expected) {
+    String[] actualList = actual.split("input fields are:");
+    String[] expectedList = expected.split("input fields are:");
+    assert actualList.length == expectedList.length;
+    assert actualList.length == 2;
+    assert actualList[0].equals(expectedList[0]);
+    assert transferStringToList(actualList[1]).equals(transferStringToList(expectedList[1]));
+  }
+
+  private HashSet<String> transferStringToList(String listString) {
+    List<String> list =
+        Arrays.stream(listString.strip().substring(1, listString.length() - 1).split(",")).toList();
+    return new HashSet<>(list.stream().map(s -> s.strip()).toList());
+  }
 }

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

@@ -50,7 +50,13 @@ public void test_numeric_data_types() throws IOException {
 
   @Test
   public void test_nonnumeric_data_types() throws IOException {
-    JSONObject result = executeQuery(String.format("source=%s", TEST_INDEX_DATATYPE_NONNUMERIC));
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | fields text_value, date_nanos_value, date_value, boolean_value,"
+                    + " ip_value, nested_value, object_value, keyword_value, geo_point_value,"
+                    + " binary_value",
+                TEST_INDEX_DATATYPE_NONNUMERIC));
     verifySchemaInOrder(
         result,
         schema("text_value", "string"),