addressing review comments

Signed-off-by: bharath-techie <[email protected]>
bharath-techie · Dec 19, 2024 · b1f8fba · b1f8fba
1 parent a0feaa7
commit b1f8fba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/server/src/main/java/org/opensearch/index/mapper/DocumentParser.java b/server/src/main/java/org/opensearch/index/mapper/DocumentParser.java
@@ -664,7 +664,7 @@ private static void parseNonDynamicArray(ParseContext context, ObjectMapper mapp
         // block array values for composite index fields
         if (context.indexSettings().isCompositeIndex()
             && (context.mapperService().isFieldPartOfCompositeIndex(arrayFieldName)
-                || context.mapperService().isCompositeIndexFieldNestedField(context.path().pathAsText(arrayFieldName)))) {
+                || context.mapperService().isFieldPartOfCompositeIndex(context.path().pathAsText(arrayFieldName)))) {
             throw new MapperParsingException(
                 String.format(
                     Locale.ROOT,

diff --git a/server/src/main/java/org/opensearch/index/mapper/MapperService.java b/server/src/main/java/org/opensearch/index/mapper/MapperService.java
@@ -707,11 +707,7 @@ private Set<CompositeMappedFieldType> getCompositeFieldTypesFromMapper() {
     }
 
     public boolean isFieldPartOfCompositeIndex(String field) {
-        return fieldsPartOfCompositeMappings.contains(field);
-    }
-
-    public boolean isCompositeIndexFieldNestedField(String field) {
-        return nestedFieldsPartOfCompositeMappings.contains(field);
+        return fieldsPartOfCompositeMappings.contains(field) || nestedFieldsPartOfCompositeMappings.contains(field);
     }
 
     public ObjectMapper getObjectMapper(String name) {