Skip to content

Minor DocValuesDocReader cleanup #123619

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

Merged
merged 5 commits into from
Feb 28, 2025
Merged

Minor DocValuesDocReader cleanup #123619

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f10da6
Minor DocValuesDocReader cleanup
javanna Feb 27, 2025
041ea7b
iter
javanna Feb 27, 2025
939dd68
Merge branch 'main' into refactoring/cleanup_doc_values_doc_reader
javanna Feb 28, 2025
2a8c6b5
iter
javanna Feb 28, 2025
7692dc4
[CI] Auto commit changes from spotless
Feb 28, 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
6 changes: 6 additions & 0 deletions ...java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.LeafFieldComparator;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.Scorable;
import org.apache.lucene.search.SortField;
Expand Down Expand Up @@ -104,6 +105,11 @@ protected SortedDocValues getSortedDocValues(LeafReaderContext context, String f

return new FieldComparator.TermValComparator(numHits, null, sortMissingLast) {

@Override
public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException {
return super.getLeafComparator(context);
}
Copy link
Member

@cbuescher cbuescher Feb 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason to add this override that I might be missing?

Copy link
Member Author

@javanna javanna Feb 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, thanks for catching it, it was a leftover of some other experiment :)


@Override
protected BinaryDocValues getBinaryDocValues(LeafReaderContext context, String field) throws IOException {
final SortedBinaryDocValues values = getValues(context);
Expand Down
7 changes: 2 additions & 5 deletions server/src/main/java/org/elasticsearch/script/DocValuesDocReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,13 @@
*/
public class DocValuesDocReader implements DocReader, LeafReaderContextSupplier {

protected final SearchLookup searchLookup;

// provide access to the leaf context reader for expressions
protected final LeafReaderContext leafReaderContext;
private final LeafReaderContext leafReaderContext;

/** A leaf lookup for the bound segment this proxy will operate on. */
protected LeafSearchLookup leafSearchLookup;
private final LeafSearchLookup leafSearchLookup;

public DocValuesDocReader(SearchLookup searchLookup, LeafReaderContext leafContext) {
this.searchLookup = searchLookup;
this.leafReaderContext = leafContext;
this.leafSearchLookup = searchLookup.getLeafSearchLookup(leafReaderContext);
}
Expand Down