fixes

original-brownbear · Jan 2, 2024 · d1affc4 · d1affc4
1 parent bab9bce
commit d1affc4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java
@@ -99,7 +99,6 @@ public void run() {
                         }
                         hit.getInnerHits().put(innerHitBuilder.getName(), innerHits);
                         innerHits.mustIncRef();
-                        context.addReleasable(innerHits::decRef);
                     }
                 }
                 onPhaseDone();

diff --git a/server/src/main/java/org/elasticsearch/search/SearchHit.java b/server/src/main/java/org/elasticsearch/search/SearchHit.java
@@ -688,7 +688,7 @@ public Map<String, SearchHits> getInnerHits() {
     }
 
     public void setInnerHits(Map<String, SearchHits> innerHits) {
-        assert innerHits.values().stream().noneMatch(h -> h.hasReferences() == false);
+        assert innerHits == null || innerHits.values().stream().noneMatch(h -> h.hasReferences() == false);
         assert this.innerHits == null;
         this.innerHits = innerHits;
     }

diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsPhase.java
@@ -106,7 +106,6 @@ private void hitExecute(Map<String, InnerHitsContext.InnerHitSubContext> innerHi
             var h = fetchResult.hits();
             results.put(entry.getKey(), h);
             h.mustIncRef();
-            innerHitsContext.addReleasable(h::decRef);
         }
     }
 }
diff --git a/server/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java b/server/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java
@@ -42,8 +42,8 @@ public void testCollapseSingleHit() throws IOException {
             final int numInnerHits = randomIntBetween(1, 5);
             List<SearchHits> collapsedHits = new ArrayList<>(numInnerHits);
             for (int innerHitNum = 0; innerHitNum < numInnerHits; innerHitNum++) {
-                SearchHits hits = new SearchHits(
-                    new SearchHit[] { new SearchHit(innerHitNum, "ID"), new SearchHit(innerHitNum + 1, "ID") },
+                SearchHits hits = SearchHits.unpooled(
+                    new SearchHit[] { SearchHit.unpooled(innerHitNum, "ID"), SearchHit.unpooled(innerHitNum + 1, "ID") },
                     new TotalHits(2, TotalHits.Relation.EQUAL_TO),
                     1.0F
                 );