supported field types

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

Author: ajleong623

server/src/main/java/org/opensearch/index/mapper/BinaryDocValuesFetcher.java

@@ -15,6 +15,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * FieldValueFetcher for binary doc values
+ *
+ * @opensearch.internal
+ */
 public class BinaryDocValuesFetcher extends FieldValueFetcher {
 
     public BinaryDocValuesFetcher(MappedFieldType mappedFieldType, String simpleName) {

server/src/test/java/org/opensearch/index/mapper/WildcardFieldMapperTests.java

@@ -14,6 +14,7 @@
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import org.apache.lucene.document.BinaryDocValuesField;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.SortedSetDocValuesField;
@@ -126,7 +127,7 @@ public void testEnableDocValues() throws IOException {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         assertEquals(DocValuesType.NONE, fields[0].fieldType().docValuesType());
-        assertEquals(DocValuesType.SORTED_SET, fields[1].fieldType().docValuesType());
+        assertEquals(DocValuesType.BINARY, fields[1].fieldType().docValuesType());
 
         mapper = createDocumentMapper(fieldMapping(b -> b.field("type", "wildcard")));
         doc = mapper.parse(source(b -> b.field("field", "1234")));
@@ -214,7 +215,7 @@ public void testNormalizer() throws IOException {
         assertEquals(new BytesRef("abc"), fields[1].binaryValue());
         fieldType = fields[1].fieldType();
         assertEquals(IndexOptions.NONE, fieldType.indexOptions());
-        assertEquals(DocValuesType.SORTED_SET, fieldType.docValuesType());
+        assertEquals(DocValuesType.BINARY, fieldType.docValuesType());
     }
 
     public void testNullValue() throws IOException {
@@ -251,7 +252,7 @@ public void testNullValue() throws IOException {
         );
         assertEquals(new BytesRef("uri"), fields[1].binaryValue());
         assertEquals(IndexOptions.NONE, fields[1].fieldType().indexOptions());
-        assertEquals(DocValuesType.SORTED_SET, fields[1].fieldType().docValuesType());
+        assertEquals(DocValuesType.BINARY, fields[1].fieldType().docValuesType());
     }
 
     public void testDefaults() throws Exception {
@@ -386,7 +387,7 @@ private Document createDocument(WildcardFieldMapper mapper, String value) throws
         NamedAnalyzer normalizer = mapper.fieldType().normalizer();
         value = normalizeValue(normalizer, FIELD_NAME, value);
         final BytesRef binaryValue = new BytesRef(value);
-        doc.add(new SortedSetDocValuesField(FIELD_NAME, binaryValue));
+        doc.add(new BinaryDocValuesField(FIELD_NAME, binaryValue));
         return doc;
     }
 }

test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java

@@ -123,6 +123,7 @@
 import org.opensearch.index.mapper.SemanticVersionFieldMapper;
 import org.opensearch.index.mapper.StarTreeMapper;
 import org.opensearch.index.mapper.TextFieldMapper;
+import org.opensearch.index.mapper.WildcardFieldMapper;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.index.shard.IndexShard;
@@ -1128,7 +1129,7 @@ private void writeTestDoc(MappedFieldType fieldType, String fieldName, RandomInd
             doc.add(new SortedNumericDocValuesField(fieldName, v));
 
         } else if (vst.equals(CoreValuesSourceType.BYTES)) {
-            if (typeName.equals(BinaryFieldMapper.CONTENT_TYPE)) {
+            if (typeName.equals(BinaryFieldMapper.CONTENT_TYPE) || typeName.equals(WildcardFieldMapper.CONTENT_TYPE)) {
                 doc.add(new BinaryFieldMapper.CustomBinaryDocValuesField(fieldName, new BytesRef("a").bytes));
                 json = "{ \"" + fieldName + "\" : \"a\" }";
             } else {