Skip to content

Commit

Permalink
Add a flag in QueryShardContext to differentiate between a normal que…
Browse files Browse the repository at this point in the history
…ry and an inner hit query (#16600)

Signed-off-by: Heemin Kim <[email protected]>
  • Loading branch information
heemin32 authored Nov 11, 2024
1 parent 46ded36 commit c9edb48
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Increase segrep pressure checkpoint default limit to 30 ([#16577](https://github.com/opensearch-project/OpenSearch/pull/16577/files))
- Add dynamic setting allowing size > 0 requests to be cached in the request cache ([#16483](https://github.com/opensearch-project/OpenSearch/pull/16483))
- Make IndexStoreListener a pluggable interface ([#16583](https://github.com/opensearch-project/OpenSearch/pull/16583))
- Add a flag in QueryShardContext to differentiate inner hit query ([#16600](https://github.com/opensearch-project/OpenSearch/pull/16600))

### Dependencies
- Bump `com.azure:azure-storage-common` from 12.25.1 to 12.27.1 ([#16521](https://github.com/opensearch-project/OpenSearch/pull/16521))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ protected void doBuild(SearchContext parentSearchContext, InnerHitsContext inner
try {
queryShardContext.setParentFilter(parentFilter);
queryShardContext.nestedScope().nextLevel(nestedObjectMapper);
queryShardContext.setInnerHitQuery(true);
try {
NestedInnerHitSubContext nestedInnerHits = new NestedInnerHitSubContext(
name,
Expand All @@ -427,6 +428,7 @@ protected void doBuild(SearchContext parentSearchContext, InnerHitsContext inner
}
} finally {
queryShardContext.setParentFilter(previousParentFilter);
queryShardContext.setInnerHitQuery(false);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ public class QueryShardContext extends QueryRewriteContext {
private BitSetProducer parentFilter;
private DerivedFieldResolver derivedFieldResolver;
private boolean keywordIndexOrDocValuesEnabled;
private boolean isInnerHitQuery;

public QueryShardContext(
int shardId,
Expand Down Expand Up @@ -727,4 +728,12 @@ public BitSetProducer getParentFilter() {
public void setParentFilter(BitSetProducer parentFilter) {
this.parentFilter = parentFilter;
}

public boolean isInnerHitQuery() {
return isInnerHitQuery;
}

public void setInnerHitQuery(boolean isInnerHitQuery) {
this.isInnerHitQuery = isInnerHitQuery;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@ public void testParentFilterFromInlineLeafInnerHitsNestedQuery() throws Exceptio
if (context.getParentFilter() == null) {
throw new Exception("Expect parent filter to be non-null");
}
if (context.isInnerHitQuery() == false) {
throw new Exception("Expect it to be inner hit query");
}
return invoke.callRealMethod();
});
NestedQueryBuilder query = new NestedQueryBuilder("nested1", innerQueryBuilder, ScoreMode.None);
Expand All @@ -345,6 +348,7 @@ public void testParentFilterFromInlineLeafInnerHitsNestedQuery() throws Exceptio
assertThat(innerHitBuilders.size(), Matchers.equalTo(1));
assertTrue(innerHitBuilders.containsKey(leafInnerHits.getName()));
assertNull(queryShardContext.getParentFilter());
assertFalse(queryShardContext.isInnerHitQuery());
innerHitBuilders.get(leafInnerHits.getName()).build(searchContext, innerHitsContext);
assertNull(queryShardContext.getParentFilter());
verify(innerQueryBuilder).toQuery(queryShardContext);
Expand Down

0 comments on commit c9edb48

Please sign in to comment.