Skip to content

Commit 379f7f9

Browse files
committed
nested fields should return docs at the nested level
1 parent 55c5cc7 commit 379f7f9

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2554,9 +2554,6 @@ private Query createKnnBitQuery(
25542554
: new BooleanQuery.Builder().add(createExactKnnBitQuery(queryVector), BooleanClause.Occur.SHOULD)
25552555
.add(parentFilter != null ? new ToChildBlockJoinQuery(filter, parentFilter) : filter, BooleanClause.Occur.FILTER)
25562556
.build();
2557-
if (parentFilter != null) {
2558-
knnQuery = new ToParentBlockJoinQuery(knnQuery, parentFilter, ScoreMode.Max);
2559-
}
25602557
} else {
25612558
knnQuery = parentFilter != null
25622559
? new ESDiversifyingChildrenByteKnnVectorQuery(name(), queryVector, filter, k, numCands, parentFilter, searchStrategy)
@@ -2595,9 +2592,6 @@ private Query createKnnByteQuery(
25952592
: new BooleanQuery.Builder().add(createExactKnnByteQuery(queryVector), BooleanClause.Occur.SHOULD)
25962593
.add(parentFilter != null ? new ToChildBlockJoinQuery(filter, parentFilter) : filter, BooleanClause.Occur.FILTER)
25972594
.build();
2598-
if (parentFilter != null) {
2599-
knnQuery = new ToParentBlockJoinQuery(knnQuery, parentFilter, ScoreMode.Max);
2600-
}
26012595
} else {
26022596
knnQuery = parentFilter != null
26032597
? new ESDiversifyingChildrenByteKnnVectorQuery(name(), queryVector, filter, k, numCands, parentFilter, searchStrategy)
@@ -2661,9 +2655,6 @@ && isNotUnitVector(squaredMagnitude)) {
26612655
: new BooleanQuery.Builder().add(createExactKnnFloatQuery(queryVector), BooleanClause.Occur.SHOULD)
26622656
.add(parentFilter != null ? new ToChildBlockJoinQuery(filter, parentFilter) : filter, BooleanClause.Occur.FILTER)
26632657
.build();
2664-
if (parentFilter != null) {
2665-
knnQuery = new ToParentBlockJoinQuery(knnQuery, parentFilter, ScoreMode.Max);
2666-
}
26672658
} else if (indexOptions instanceof BBQIVFIndexOptions bbqIndexOptions) {
26682659
knnQuery = parentFilter != null
26692660
? new DiversifyingChildrenIVFKnnFloatVectorQuery(

0 commit comments

Comments
 (0)