Skip to content

Upgrade to lucene 10.2 #17960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Upgrade to lucene 10.2 #17960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
opensearch = "3.0.0"
lucene = "10.1.0"
lucene = "10.2.0"

bundled_jdk_vendor = "adoptium"
bundled_jdk = "21.0.6+7"
Expand Down
21 changes: 9 additions & 12 deletions server/src/main/java/org/opensearch/search/approximate/ApproximatePointRangeQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.PointValues;
import org.apache.lucene.search.ConstantScoreScorer;
import org.apache.lucene.search.ConstantScoreScorerSupplier;
import org.apache.lucene.search.ConstantScoreWeight;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PointRangeQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryVisitor;
import org.apache.lucene.search.ScoreMode;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.ScorerSupplier;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.ArrayUtil;
Expand Down Expand Up @@ -365,17 +364,16 @@ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOExcepti
return pointRangeQueryWeight.scorerSupplier(context);
} else {
if (sortOrder == null || sortOrder.equals(SortOrder.ASC)) {
return new ScorerSupplier() {
return new ConstantScoreScorerSupplier(score(), scoreMode, reader.maxDoc()) {

final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values, pointRangeQuery.getField());
final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values);
final PointValues.IntersectVisitor visitor = getIntersectVisitor(result, docCount);
long cost = -1;

@Override
public Scorer get(long leadCost) throws IOException {
public DocIdSetIterator iterator(long l) throws IOException {
intersectLeft(values.getPointTree(), visitor, docCount);
DocIdSetIterator iterator = result.build().iterator();
return new ConstantScoreScorer(score(), scoreMode, iterator);
return result.build().iterator();
}

@Override
Expand All @@ -393,17 +391,16 @@ public long cost() {
// than expected
final int deletedDocs = reader.numDeletedDocs();
size += deletedDocs;
return new ScorerSupplier() {
return new ConstantScoreScorerSupplier(score(), scoreMode, reader.maxDoc()) {

final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values, pointRangeQuery.getField());
final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values);
final PointValues.IntersectVisitor visitor = getIntersectVisitor(result, docCount);
long cost = -1;

@Override
public Scorer get(long leadCost) throws IOException {
public DocIdSetIterator iterator(long l) throws IOException {
intersectRight(values.getPointTree(), visitor, docCount);
DocIdSetIterator iterator = result.build().iterator();
return new ConstantScoreScorer(score(), scoreMode, iterator);
return result.build().iterator();
}

@Override
Expand Down
11 changes: 5 additions & 6 deletions server/src/main/java/org/opensearch/search/query/BitmapIndexQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.PointValues;
import org.apache.lucene.search.ConstantScoreScorer;
import org.apache.lucene.search.ConstantScoreScorerSupplier;
import org.apache.lucene.search.ConstantScoreWeight;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchNoDocsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryVisitor;
import org.apache.lucene.search.ScoreMode;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.ScorerSupplier;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.Accountable;
Expand Down Expand Up @@ -109,16 +108,16 @@ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOExcepti
throw new IllegalArgumentException("field must have only one dimension");
}

return new ScorerSupplier() {
return new ConstantScoreScorerSupplier(score(), scoreMode, reader.maxDoc()) {
long cost = -1;

final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values, field);
final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values);
final MergePointVisitor visitor = new MergePointVisitor(result);

@Override
public Scorer get(long leadCost) throws IOException {
public DocIdSetIterator iterator(long l) throws IOException {
values.intersect(visitor);
return new ConstantScoreScorer(score(), scoreMode, result.build().iterator());
return result.build().iterator();
}

@Override
Expand Down
Loading