added comments and added null checks in the case the filter return null

elastic · Apr 21, 2015 · 3687d9b · 3687d9b
1 parent 4f3fa20
commit 3687d9b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
@@ -544,7 +544,9 @@ public ObjectMapper findNestedObjectMapper(int nestedDocId, SearchContext sc, Le
             if (filter == null) {
                 continue;
             }
-            DocIdSet nestedTypeSet = filter.getDocIdSet(context, context.reader().getLiveDocs());
+            // We can pass down 'null' as acceptedDocs, because nestedDocId is a doc to be fetched and
+            // therefor is guaranteed to be a live doc.
+            DocIdSet nestedTypeSet = filter.getDocIdSet(context, null);
             DocIdSetIterator iterator = nestedTypeSet.iterator();
             if (iterator.advance(nestedDocId) == nestedDocId) {
                 if (nestedObjectMapper == null) {

diff --git a/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java b/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java
@@ -391,8 +391,18 @@ private InternalSearchHit.InternalNestedIdentity getInternalNestedIdentity(Searc
             BitSet parentBits = parentBitSet.bits();
             int offset = 0;
             Filter childFilter = context.filterCache().cache(nestedObjectMapper.nestedTypeFilter(), null, context.queryParserService().autoFilterCachePolicy());
-            DocIdSet childDocSet = childFilter.getDocIdSet(subReaderContext, subReaderContext.reader().getLiveDocs());
+            if (childFilter == null) {
+                continue;
+            }
+            // We can pass down 'null' as acceptedDocs, because we're fetching matched docId that matched in the query phase.
+            DocIdSet childDocSet = childFilter.getDocIdSet(subReaderContext, null);
+            if (childDocSet == null) {
+                continue;
+            }
             DocIdSetIterator childIter = childDocSet.iterator();
+            if (childIter == null) {
+                continue;
+            }
             int nextParent = parentBits.nextSetBit(currentParent);
             for (int docId = childIter.advance(currentParent + 1); docId < nextParent && docId != DocIdSetIterator.NO_MORE_DOCS; docId = childIter.nextDoc()) {
                 offset++;