Revert "Do NOT allow termvectors on nested fields (#32728)"

This reverts commit fdff8f3.
elastic · Aug 24, 2018 · 9824bf9 · 9824bf9
1 parent 675760e
commit 9824bf9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 67 deletions.
diff --git a/docs/reference/docs/termvectors.asciidoc b/docs/reference/docs/termvectors.asciidoc
@@ -30,10 +30,6 @@ in similar way to the <<query-dsl-multi-match-query,multi match query>>
 [WARNING]
 Note that the usage of `/_termvector` is deprecated in 2.0, and replaced by `/_termvectors`.
 
-[WARNING]
-Term Vectors API doesn't work on nested fields. `/_termvectors` on a nested
-field and any sub-fields of a nested field returns empty results.
-
 [float]
 === Return values
 

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/50_nested.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/50_nested.yml
diff --git a/server/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java b/server/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java
@@ -45,7 +45,6 @@
 import org.elasticsearch.index.mapper.KeywordFieldMapper;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.mapper.ObjectMapper;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.ParsedDocument;
 import org.elasticsearch.index.mapper.SourceFieldMapper;
@@ -161,7 +160,7 @@ private static void handleFieldWildcards(IndexShard indexShard, TermVectorsReque
         request.selectedFields(fieldNames.toArray(Strings.EMPTY_ARRAY));
     }
 
-    private static boolean isValidField(MappedFieldType fieldType, IndexShard indexShard) {
+    private static boolean isValidField(MappedFieldType fieldType) {
         // must be a string
         if (fieldType instanceof StringFieldType == false) {
             return false;
@@ -170,16 +169,6 @@ private static boolean isValidField(MappedFieldType fieldType, IndexShard indexS
         if (fieldType.indexOptions() == IndexOptions.NONE) {
             return false;
         }
-        // and must not be under nested field
-        int dotIndex = fieldType.name().indexOf('.');
-        while (dotIndex > -1) {
-            String parentField = fieldType.name().substring(0, dotIndex);
-            ObjectMapper mapper = indexShard.mapperService().getObjectMapper(parentField);
-            if (mapper != null && mapper.nested().isNested()) {
-                return false;
-            }
-            dotIndex = fieldType.name().indexOf('.', dotIndex + 1);
-        }
         return true;
     }
 
@@ -188,7 +177,7 @@ private static Fields addGeneratedTermVectors(IndexShard indexShard, Engine.GetR
         Set<String> validFields = new HashSet<>();
         for (String field : selectedFields) {
             MappedFieldType fieldType = indexShard.mapperService().fullName(field);
-            if (isValidField(fieldType, indexShard) == false) {
+            if (!isValidField(fieldType)) {
                 continue;
             }
             // already retrieved, only if the analyzer hasn't been overridden at the field
@@ -295,7 +284,7 @@ private static Fields generateTermVectorsFromDoc(IndexShard indexShard, TermVect
         Collection<DocumentField> documentFields = new HashSet<>();
         for (IndexableField field : doc.getFields()) {
             MappedFieldType fieldType = indexShard.mapperService().fullName(field.name());
-            if (isValidField(fieldType, indexShard) == false) {
+            if (!isValidField(fieldType)) {
                 continue;
             }
             if (request.selectedFields() != null && !request.selectedFields().contains(field.name())) {