Skip to content
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

TimeSeries Desc Sort gets skipped with Lucene 10 upgrade #17329

Merged
merged 9 commits into from
Mar 25, 2025
Merged

TimeSeries Desc Sort gets skipped with Lucene 10 upgrade #17329

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0442ed9
Ensuring time series desc sort optimisation invokes searchLeaf on Ctx…
expani Feb 11, 2025
21d5903
Added TODO to remove when migrating towards CollectorManager
expani Feb 11, 2025
368383f
Merge branch 'opensearch-project:main' into perf_16934_1
expani Feb 11, 2025
21a924d
remove post collection as it happens in child method
expani Feb 12, 2025
990c3bd
Merge branch 'opensearch-project:main' into perf_16934_1
expani Mar 24, 2025
0ce530b
Fixed concurrent search related UTs
expani Mar 25, 2025
1757058
Directly using leafContexts to form slice
expani Mar 25, 2025
ccf11fb
iter
expani Mar 25, 2025
4ddd3fa
Merge branch 'opensearch-project:main' into perf_16934_1
expani Mar 25, 2025
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
13 changes: 11 additions & 2 deletions server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.CollectorManager;
import org.apache.lucene.search.ConjunctionUtils;
import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
Expand Down Expand Up @@ -257,8 +258,15 @@

@Override
public void search(Query query, Collector collector) throws IOException {
super.search(query, collector);
searchContext.bucketCollectorProcessor().processPostCollection(collector);
// TODO : Remove when switching to use the @org.apache.lucene.search.IndexSearcher#search(Query, CollectorManager) variant from
// @org.opensearch.search.query.QueryPhase#searchWithCollector which then calls the overridden
// search(LeafReaderContextPartition[] partitions, Weight weight, Collector collector)
query = collector.scoreMode().needsScores() ? rewrite(query) : rewrite(new ConstantScoreQuery(query));
Weight weight = createWeight(query, collector.scoreMode(), 1);
LeafReaderContextPartition[] partitions = (getLeafContexts() == null)
? new LeafReaderContextPartition[0]

Check warning on line 267 in server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java#L267 

Added line #L267 was not covered by tests
: getLeafContexts().stream().map(LeafReaderContextPartition::createForEntireSegment).toArray(LeafReaderContextPartition[]::new);
search(partitions, weight, collector);
}

public void search(
Expand Down Expand Up @@ -297,6 +305,7 @@
searchLeaf(partition.ctx, partition.minDocId, partition.maxDocId, weight, collector);
}
}
// TODO : Make this a responsibility for the callers rather than implicitly getting it done here ?
searchContext.bucketCollectorProcessor().processPostCollection(collector);
} catch (Throwable t) {
searchContext.indexShard().getSearchOperationListener().onFailedSliceExecution(searchContext);
Expand Down
Loading