Skip to content

Commit c9edb48

Browse files
authored
Add a flag in QueryShardContext to differentiate between a normal query and an inner hit query (opensearch-project#16600)
Signed-off-by: Heemin Kim <heemin@amazon.com>
1 parent 46ded36 commit c9edb48

File tree

4 files changed

+16
-0
lines changed

4 files changed

+16
-0
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1414
- Increase segrep pressure checkpoint default limit to 30 ([#16577](https://github.com/opensearch-project/OpenSearch/pull/16577/files))
1515
- Add dynamic setting allowing size > 0 requests to be cached in the request cache ([#16483](https://github.com/opensearch-project/OpenSearch/pull/16483))
1616
- Make IndexStoreListener a pluggable interface ([#16583](https://github.com/opensearch-project/OpenSearch/pull/16583))
17+
- Add a flag in QueryShardContext to differentiate inner hit query ([#16600](https://github.com/opensearch-project/OpenSearch/pull/16600))
1718

1819
### Dependencies
1920
- Bump `com.azure:azure-storage-common` from 12.25.1 to 12.27.1 ([#16521](https://github.com/opensearch-project/OpenSearch/pull/16521))

server/src/main/java/org/opensearch/index/query/NestedQueryBuilder.java

+2
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ protected void doBuild(SearchContext parentSearchContext, InnerHitsContext inner
413413
try {
414414
queryShardContext.setParentFilter(parentFilter);
415415
queryShardContext.nestedScope().nextLevel(nestedObjectMapper);
416+
queryShardContext.setInnerHitQuery(true);
416417
try {
417418
NestedInnerHitSubContext nestedInnerHits = new NestedInnerHitSubContext(
418419
name,
@@ -427,6 +428,7 @@ protected void doBuild(SearchContext parentSearchContext, InnerHitsContext inner
427428
}
428429
} finally {
429430
queryShardContext.setParentFilter(previousParentFilter);
431+
queryShardContext.setInnerHitQuery(false);
430432
}
431433
}
432434
}

server/src/main/java/org/opensearch/index/query/QueryShardContext.java

+9
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ public class QueryShardContext extends QueryRewriteContext {
126126
private BitSetProducer parentFilter;
127127
private DerivedFieldResolver derivedFieldResolver;
128128
private boolean keywordIndexOrDocValuesEnabled;
129+
private boolean isInnerHitQuery;
129130

130131
public QueryShardContext(
131132
int shardId,
@@ -727,4 +728,12 @@ public BitSetProducer getParentFilter() {
727728
public void setParentFilter(BitSetProducer parentFilter) {
728729
this.parentFilter = parentFilter;
729730
}
731+
732+
public boolean isInnerHitQuery() {
733+
return isInnerHitQuery;
734+
}
735+
736+
public void setInnerHitQuery(boolean isInnerHitQuery) {
737+
this.isInnerHitQuery = isInnerHitQuery;
738+
}
730739
}

server/src/test/java/org/opensearch/index/query/NestedQueryBuilderTests.java

+4
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,9 @@ public void testParentFilterFromInlineLeafInnerHitsNestedQuery() throws Exceptio
335335
if (context.getParentFilter() == null) {
336336
throw new Exception("Expect parent filter to be non-null");
337337
}
338+
if (context.isInnerHitQuery() == false) {
339+
throw new Exception("Expect it to be inner hit query");
340+
}
338341
return invoke.callRealMethod();
339342
});
340343
NestedQueryBuilder query = new NestedQueryBuilder("nested1", innerQueryBuilder, ScoreMode.None);
@@ -345,6 +348,7 @@ public void testParentFilterFromInlineLeafInnerHitsNestedQuery() throws Exceptio
345348
assertThat(innerHitBuilders.size(), Matchers.equalTo(1));
346349
assertTrue(innerHitBuilders.containsKey(leafInnerHits.getName()));
347350
assertNull(queryShardContext.getParentFilter());
351+
assertFalse(queryShardContext.isInnerHitQuery());
348352
innerHitBuilders.get(leafInnerHits.getName()).build(searchContext, innerHitsContext);
349353
assertNull(queryShardContext.getParentFilter());
350354
verify(innerQueryBuilder).toQuery(queryShardContext);

0 commit comments

Comments
 (0)