remove getField

Signed-off-by: Mingshi Liu <mingshl@amazon.com>
opensearch-project · Jul 8, 2023 · b2a05b1 · b2a05b1
1 parent 5b16cbc
commit b2a05b1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 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
@@ -629,21 +629,18 @@ 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));
-                        }
+                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));
                     }
-                    if (valueType.equals(VALUE_AND_PATH_SUFFIX)) {
-                        if (valueAndPathFieldMapper != null) {
-                            context.doc().add(new SortedSetDocValuesField(fieldType().name() + VALUE_AND_PATH_SUFFIX, binaryValue));
-                        }
+                }
+                if (valueType.equals(VALUE_AND_PATH_SUFFIX)) {
+                    if (valueAndPathFieldMapper != null) {
+                        context.doc().add(new SortedSetDocValuesField(fieldType().name() + VALUE_AND_PATH_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(1, fields.length);
+        assertEquals(2, fields.length);
         assertEquals(new BytesRef("field.foo"), fields[0].binaryValue());
 
         IndexableFieldType fieldType = fields[0].fieldType();