From f5e351aaf1aacf29eb7f37b284000fe948a6075d Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Tue, 14 Jul 2015 20:05:20 +0200
Subject: [PATCH] parent/child: Removed AwaitsFix annotation

Closes #9461
---
 .../plain/ParentChildIndexFieldData.java          |  4 ++++
 .../search/child/ChildQuerySearchTests.java       | 15 ---------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
index 89bb022fd42..2087872d454 100644
--- a/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
+++ b/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
@@ -397,6 +397,10 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
         @Override
         public SortedDocValues getOrdinalsValues(String type) {
             final OrdinalMapAndAtomicFieldData atomicFD = this.atomicFD.get(type);
+            if (atomicFD == null) {
+                return DocValues.emptySorted();
+            }
+
             final OrdinalMap ordMap = atomicFD.ordMap;
             final SortedDocValues[] allSegmentValues = new SortedDocValues[atomicFD.fieldData.length];
             for (int i = 0; i < allSegmentValues.length; ++i) {
diff --git a/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java b/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java
index f89946a58cf..c37565f845f 100644
--- a/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java
@@ -18,7 +18,6 @@
  */
 package org.elasticsearch.search.child;
 
-import org.apache.lucene.util.LuceneTestCase;
 import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
 import org.elasticsearch.action.count.CountResponse;
@@ -2013,7 +2012,6 @@ public class ChildQuerySearchTests extends ElasticsearchIntegrationTest {
     }
 
     @Test
-    @LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elasticsearch/elasticsearch/issues/9461")
     public void testParentFieldToNonExistingType() {
         assertAcked(prepareCreate("test").addMapping("parent").addMapping("child", "_parent", "type=parent2"));
         client().prepareIndex("test", "parent", "1").setSource("{}").get();
@@ -2032,19 +2030,6 @@ public class ChildQuerySearchTests extends ElasticsearchIntegrationTest {
                 .setQuery(QueryBuilders.hasParentQuery("parent", matchAllQuery()))
                 .get();
         assertHitCount(response, 0);
-
-        try {
-            client().prepareSearch("test")
-                    .setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.hasChildQuery("child", matchAllQuery())))
-                    .get();
-            fail();
-        } catch (SearchPhaseExecutionException e) {
-        }
-
-        response = client().prepareSearch("test")
-                .setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.hasParentQuery("parent", matchAllQuery())))
-                .get();
-        assertHitCount(response, 0);
     }
 
     static HasChildQueryBuilder hasChildQuery(String type, QueryBuilder queryBuilder) {