From 0b7309ec9caf1b639436a071a350661ee67dd3eb Mon Sep 17 00:00:00 2001
From: Mayya Sharipova <mayya.sharipova@elastic.co>
Date: Tue, 7 Jan 2020 12:20:09 -0500
Subject: [PATCH] Fix NPE bug inner_hits (#50709)

When there several subqueries on different relations of the join field,
and only one of subqueries is using inner_hits, NPE occurs.
This PR prevents NPE error.

Closes #50539
---
 .../ParentChildInnerHitContextBuilder.java    |  4 ++
 .../rest-api-spec/test/30_inner_hits.yml      | 68 +++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 modules/parent-join/src/test/resources/rest-api-spec/test/30_inner_hits.yml

diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/query/ParentChildInnerHitContextBuilder.java b/modules/parent-join/src/main/java/org/elasticsearch/join/query/ParentChildInnerHitContextBuilder.java
index 090798eb51c..551e57abb62 100644
--- a/modules/parent-join/src/main/java/org/elasticsearch/join/query/ParentChildInnerHitContextBuilder.java
+++ b/modules/parent-join/src/main/java/org/elasticsearch/join/query/ParentChildInnerHitContextBuilder.java
@@ -127,6 +127,10 @@ class ParentChildInnerHitContextBuilder extends InnerHitContextBuilder {
                         .build();
                 } else {
                     String parentId = getSortedDocValue(parentIdFieldMapper.name(), context, hit.docId());
+                    if (parentId == null) {
+                        result[i] = new TopDocsAndMaxScore(Lucene.EMPTY_TOP_DOCS, Float.NaN);
+                        continue;
+                    }
                     q = context.mapperService().fullName(IdFieldMapper.NAME).termQuery(parentId, qsc);
                 }
 
diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/30_inner_hits.yml b/modules/parent-join/src/test/resources/rest-api-spec/test/30_inner_hits.yml
new file mode 100644
index 00000000000..b0bed8e1d11
--- /dev/null
+++ b/modules/parent-join/src/test/resources/rest-api-spec/test/30_inner_hits.yml
@@ -0,0 +1,68 @@
+---
+"Test two sub-queries with only one having inner_hits":
+    - skip:
+        version: " - 7.59.99"
+        reason: "The bug was corrected from 7.6"
+
+    - do:
+        indices.create:
+          index: test
+          body:
+            mappings:
+              properties:
+                entity_type: { "type": "keyword" }
+                join_field: { "type": "join", "relations": { "question": "answer", "person" : "address" } }
+            settings:
+              number_of_shards: 1
+
+    - do:
+        index:
+          index: test
+          id: 1
+          body: { "join_field": { "name": "question" }, "entity_type": "question" }
+
+    - do:
+        index:
+          index: test
+          id: 2
+          routing: 1
+          body: { "join_field": { "name": "answer", "parent": 1} , "entity_type": "answer" }
+
+    - do:
+        index:
+          index: test
+          id: 3
+          body: { "join_field": { "name": "person" }, "entity_type": "person" }
+
+    - do:
+        index:
+          index: test
+          routing: 3
+          id: 4
+          body: { "join_field": { "name": "address", "parent": 3 }, "entity_type": "address" }
+
+    - do:
+        indices.refresh: {}
+
+    - do:
+        search:
+          index: test
+          body:
+            query:
+              bool:
+                should:
+                  - term:
+                      entity_type: person
+                  - has_parent:
+                      parent_type: question
+                      query:
+                        match_all: {}
+                      inner_hits: {}
+
+
+    - match: { hits.total.value: 2 }
+    - match: { hits.hits.0._id: "3" }
+    - match: { hits.hits.0.inner_hits.question.hits.total.value: 0}
+    - match: { hits.hits.1._id: "2" }
+    - match: { hits.hits.1.inner_hits.question.hits.total.value: 1}
+    - match: { hits.hits.1.inner_hits.question.hits.hits.0._id: "1"}