fix IT by adding fields

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

Author: xinyual

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

@@ -66,7 +66,7 @@ public void testCaseWhenWithCast() {
                             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"
                             else concat("Incorrect HTTP status code for", url))
-                    | where status != "Success"
+                    | where status != "Success" | fields host, method, bytes, response, url, status
                     """,
                 TEST_INDEX_WEBLOGS));
     verifySchema(
@@ -110,7 +110,7 @@ public void testCaseWhenNoElse() {
                             cast(response as int) >= 300 AND cast(response as int) < 400, "Redirection",
                             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"
+                    | where isnull(status) OR status != "Success" | fields host, method, bytes, response, url, status
                     """,
                 TEST_INDEX_WEBLOGS));
     verifySchema(
@@ -149,7 +149,7 @@ response in ('300', '301'), "Redirection",
                             response in ('400', '403'), "Client Error",
                             response in ('500', '505'), "Server Error"
                             else concat("Incorrect HTTP status code for", url))
-                    | where status != "Success"
+                    | where status != "Success" | fields host, method, bytes, response, url, status
                     """,
                 TEST_INDEX_WEBLOGS));
     verifySchema(
@@ -194,6 +194,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 +229,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/ppl/GeoIpFunctionsIT.java

@@ -83,7 +83,8 @@ public void testGeoIpEnrichment() {
     JSONObject resultGeoIp =
         executeQuery(
             String.format(
-                "search source=%s | eval enrichmentResult = geoip(\\\"%s\\\",%s)",
+                "search source=%s | eval enrichmentResult = geoip(\\\"%s\\\",%s) | fields name, ip,"
+                    + " enrichmentResult",
                 TEST_INDEX_GEOIP, "dummycityindex", "ip"));
 
     verifyColumn(resultGeoIp, columnName("name"), columnName("ip"), columnName("enrichmentResult"));
@@ -100,7 +101,8 @@ public void testGeoIpEnrichmentWithSingleOption() {
     JSONObject resultGeoIp =
         executeQuery(
             String.format(
-                "search source=%s | eval enrichmentResult = geoip(\\\"%s\\\",%s,\\\"%s\\\")",
+                "search source=%s | eval enrichmentResult = geoip(\\\"%s\\\",%s,\\\"%s\\\") |"
+                    + " fields name, ip, enrichmentResult",
                 TEST_INDEX_GEOIP, "dummycityindex", "ip", "city"));
 
     verifyColumn(resultGeoIp, columnName("name"), columnName("ip"), columnName("enrichmentResult"));
@@ -117,7 +119,8 @@ public void testGeoIpEnrichmentWithSpaceSeparatedMultipleOptions() {
     JSONObject resultGeoIp =
         executeQuery(
             String.format(
-                "search source=%s | eval enrichmentResult = geoip(\\\"%s\\\",%s,\\\"%s\\\")",
+                "search source=%s | eval enrichmentResult = geoip(\\\"%s\\\",%s,\\\"%s\\\") |"
+                    + " fields name, ip, enrichmentResult",
                 TEST_INDEX_GEOIP, "dummycityindex", "ip", "city , country"));
 
     verifyColumn(resultGeoIp, columnName("name"), columnName("ip"), columnName("enrichmentResult"));

opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchDescribeIndexRequest.java

@@ -10,7 +10,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
@@ -99,10 +98,9 @@ public List<ExprValue> search() {
    */
   // TODO possible collision if two indices have fields with the same name and different mappings
   public Map<String, OpenSearchDataType> getFieldTypes() {
-    Map<String, OpenSearchDataType> fieldTypes = new HashMap<>();
+    Map<String, OpenSearchDataType> fieldTypes = new LinkedHashMap<>();
     Map<String, IndexMapping> indexMappings =
         client.getIndexMappings(getLocalIndexNames(indexName.getIndexNames()));
-    log.error(indexMappings.keySet());
     for (IndexMapping indexMapping : indexMappings.values()) {
       mergeObjectAndArrayInsideMap(fieldTypes, indexMapping.getFieldMappings());
     }