|
35 | 35 | import org.apache.lucene.search.FieldExistsQuery; |
36 | 36 | import org.apache.lucene.search.Query; |
37 | 37 | import org.apache.lucene.search.join.BitSetProducer; |
38 | | -import org.apache.lucene.search.join.ToChildBlockJoinQuery; |
39 | 38 | import org.apache.lucene.search.knn.KnnSearchStrategy; |
40 | 39 | import org.apache.lucene.util.BitUtil; |
41 | 40 | import org.apache.lucene.util.BytesRef; |
@@ -2550,7 +2549,7 @@ private Query createKnnBitQuery( |
2550 | 2549 | knnQuery = filter == null |
2551 | 2550 | ? createExactKnnBitQuery(queryVector) |
2552 | 2551 | : new BooleanQuery.Builder().add(createExactKnnBitQuery(queryVector), BooleanClause.Occur.SHOULD) |
2553 | | - .add(parentFilter != null ? new ToChildBlockJoinQuery(filter, parentFilter) : filter, BooleanClause.Occur.FILTER) |
| 2552 | + .add(filter, BooleanClause.Occur.FILTER) |
2554 | 2553 | .build(); |
2555 | 2554 | } else { |
2556 | 2555 | knnQuery = parentFilter != null |
@@ -2588,7 +2587,7 @@ private Query createKnnByteQuery( |
2588 | 2587 | knnQuery = filter == null |
2589 | 2588 | ? createExactKnnByteQuery(queryVector) |
2590 | 2589 | : new BooleanQuery.Builder().add(createExactKnnByteQuery(queryVector), BooleanClause.Occur.SHOULD) |
2591 | | - .add(parentFilter != null ? new ToChildBlockJoinQuery(filter, parentFilter) : filter, BooleanClause.Occur.FILTER) |
| 2590 | + .add(filter, BooleanClause.Occur.FILTER) |
2592 | 2591 | .build(); |
2593 | 2592 | } else { |
2594 | 2593 | knnQuery = parentFilter != null |
@@ -2651,7 +2650,7 @@ && isNotUnitVector(squaredMagnitude)) { |
2651 | 2650 | knnQuery = filter == null |
2652 | 2651 | ? createExactKnnFloatQuery(queryVector) |
2653 | 2652 | : new BooleanQuery.Builder().add(createExactKnnFloatQuery(queryVector), BooleanClause.Occur.SHOULD) |
2654 | | - .add(parentFilter != null ? new ToChildBlockJoinQuery(filter, parentFilter) : filter, BooleanClause.Occur.FILTER) |
| 2653 | + .add(filter, BooleanClause.Occur.FILTER) |
2655 | 2654 | .build(); |
2656 | 2655 | } else if (indexOptions instanceof BBQIVFIndexOptions bbqIndexOptions) { |
2657 | 2656 | knnQuery = parentFilter != null |
|
0 commit comments