Added data for ignore_above and test with fielddata true but no field.

Signed-off-by: MitchellGale-BitQuill <[email protected]>

Author: MitchellGale

integ-test/src/test/java/org/opensearch/sql/sql/TextTypeIT.java

@@ -57,4 +57,11 @@ public void aggregateOnKeywordFieldData() throws IOException {
       verifySchema(result,
           schema("sum(int0)", null, "integer"));
     }
+
+    @Test
+    public void aggregateOnTextAndFieldDataNoFields() throws IOException {
+      var result = executeJdbcRequest(String.format("select sum(int0) from %s GROUP BY textDataFieldNoFields", TEST_INDEX_TEXTKEYWORD));
+      verifySchema(result,
+          schema("sum(int0)", null, "integer"));
+    }
   }

integ-test/src/test/resources/indexDefinitions/text_keyword_index_mapping.json

@@ -12,7 +12,7 @@
         "fields": {
           "keyword": {
             "type": "keyword",
-            "ignore_above": 256
+            "ignore_above": 10
           }
         }      },
       "typeTextFieldData" : {
@@ -21,10 +21,14 @@
         "fields": {
           "keyword": {
             "type": "keyword",
-            "ignore_above": 256
+            "ignore_above": 10
           }
         }
       },
+      "textDataFieldNoFields" : {
+        "type": "text",
+        "fielddata": true
+      },
       "int0" : {
         "type": "integer"
       }

integ-test/src/test/resources/text_keyword_index.json

@@ -1,16 +1,16 @@
 {"index": {}}
-{"typeKeyword": "key00", "typeText": "text00", "typeKeywordFieldData": "keyFD00", "typeTextFieldData":  "textFD00", "int0": 0}
+{"typeKeyword": "key00", "typeText": "text00", "typeKeywordFieldNoFieldData": "keyword00","typeTextFieldData": "keyFD00", "typeKeywordFieldData":  "textFD00", "textDataFieldNoFields": "textFDNF00","int0": 0}
 {"index": {}}
-{"typeKeyword": "key01", "typeText": "text01", "typeKeywordFieldData": "keyFD01", "typeTextFieldData":  "textFD01", "int0": 1}
+{"typeKeyword": "key01", "typeText": "text01", "typeKeywordFieldNoFieldData": "keyword01", "typeTextFieldData": "keyFD01", "typeTextFieldData":  "textFD01OverTen", "textDataFieldNoFields": "textFDNF01", "int0": 1}
+{"index": {},typeKeywordFieldData
+{"typeKeyword": "key02", "typeText": "text02", "typeKeywordFieldNoFieldData": "keyword02", "typeTextFieldData": "keyFD02", "typeKeywordFieldData":  "textFD02", "textDataFieldNoFields": "textFDNF02", "int0": 2}
 {"index": {}}
-{"typeKeyword": "key02", "typeText": "text02", "typeKeywordFieldData": "keyFD02", "typeTextFieldData":  "textFD02", "int0": 2}
+{"typeKeyword": "key03", "typeText": "text03", "typeKeywordFieldNoFieldData": "keyword03", "typeTextFieldData": "keyFD03OverTen", "typeKeywordFieldData":  "textFD03", "textDataFieldNoFields": "textFDNF03", "int0": 3}
 {"index": {}}
-{"typeKeyword": "key03", "typeText": "text03", "typeKeywordFieldData": "keyFD03", "typeTextFieldData":  "textFD03", "int0": 3}
+{"typeKeyword": "key04", "typeText": "text04", "typeKeywordFieldNoFieldData": "keyword04", "typeTextFieldData": "keyFD04", "typeKeywordFieldData":  "textFD04", "textDataFieldNoFields": "textFDNF04", "int0": 4}
 {"index": {}}
-{"typeKeyword": "key04", "typeText": "text04", "typeKeywordFieldData": "keyFD04", "typeTextFieldData":  "textFD04", "int0": 4}
+{"typeKeyword": "key05", "typeText": "text05", "typeKeywordFieldNoFieldData": "keyword05", "typeTextFieldData": "keyFD05", "typeKeywordFieldData":  "textFD0OverTen5", "textDataFieldNoFields": "textFDNF05", "int0": 5}
 {"index": {}}
-{"typeKeyword": "key05", "typeText": "text05", "typeKeywordFieldData": "keyFD05", "typeTextFieldData":  "textFD05", "int0": 5}
+{"typeKeyword": "key06", "typeText": "text06", "typeKeywordFieldNoFieldData": "keyword06", "typeTextFieldData": "keyFD06OverTen", "typeKeywordFieldData":  "textFD06", "textDataFieldNoFields": "textFDNF06", "int0": 6}
 {"index": {}}
-{"typeKeyword": "key06", "typeText": "text06", "typeKeywordFieldData": "keyFD06", "typeTextFieldData":  "textFD06", "int0": 6}
-{"index": {}}
-{"typeKeyword": "key07", "typeText": "text07", "typeKeywordFieldData": "keyFD07", "typeTextFieldData":  "textFD07", "int0": 7}
+{"typeKeyword": "key07", "typeText": "text07", "typeKeywordFieldNoFieldData": "keyword07", "typeTextFieldData": "keyFD07", "typeKeywordFieldData":  "textFD07", "textDataFieldNoFields": "textFDNF07", "int0": 7}