move SortedSetDocValuesField addition for field type

Signed-off-by: Shinsuke Sugaya <shinsuke@apache.org>
opensearch-project · Jul 5, 2023 · 4c01c21 · 4c01c21
1 parent 438cbbf
commit 4c01c21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/index/mapper/FlatObjectFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/FlatObjectFieldMapper.java
@@ -616,9 +616,6 @@ private void parseValueAddFields(ParseContext context, String value, String fiel
             }
             if (fieldName.equals(fieldType().name())) {
                 context.doc().add(field);
-                if (fieldType().hasDocValues()) {
-                    context.doc().add(new SortedSetDocValuesField(fieldType().name(), binaryValue));
-                }
             }
             if (valueType.equals(VALUE_SUFFIX)) {
                 if (valueFieldMapper != null) {
@@ -633,6 +630,9 @@ private void parseValueAddFields(ParseContext context, String value, String fiel
 
             if (fieldType().hasDocValues()) {
                 if (!Objects.equals(context.doc().getField(fieldType().name()), field)) {
+                    if (fieldName.equals(fieldType().name())) {
+                        context.doc().add(new SortedSetDocValuesField(fieldType().name(), binaryValue));
+                    }
                     if (valueType.equals(VALUE_SUFFIX)) {
                         if (valueFieldMapper != null) {
                             context.doc().add(new SortedSetDocValuesField(fieldType().name() + VALUE_SUFFIX, binaryValue));

diff --git a/server/src/test/java/org/opensearch/index/mapper/FlatObjectFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/FlatObjectFieldMapperTests.java
@@ -107,7 +107,7 @@ public void testDefaults() throws Exception {
 
         ParsedDocument doc = mapper.parse(source(json));
         IndexableField[] fields = doc.rootDoc().getFields("field");
-        assertEquals(2, fields.length);
+        assertEquals(1, fields.length);
         assertEquals(new BytesRef("field.foo"), fields[0].binaryValue());
 
         IndexableFieldType fieldType = fields[0].fieldType();