Skip to content

Use stock DVSkipper competitive iterator instead of SecondarySortIterator #138087

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 3 commits into from
Nov 14, 2025
Merged

Use stock DVSkipper competitive iterator instead of SecondarySortIterator #138087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc892fb
Use stock DVSkipper competitive iterator instead of SecondarySortIter…
romseygeek Nov 14, 2025
54d2ee2
Remove SecondarySortIterator
romseygeek Nov 14, 2025
80a5d04
Merge remote-tracking branch 'origin/main' into sort/ssi-post-init
romseygeek Nov 14, 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
37 changes: 0 additions & 37 deletions ...in/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@
*/
package org.elasticsearch.index.fielddata.fieldcomparator;

import org.apache.lucene.index.DocValuesSkipper;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.LeafFieldComparator;
import org.apache.lucene.search.LongValues;
import org.apache.lucene.search.Pruning;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BitSet;
import org.elasticsearch.common.time.DateUtils;
Expand All @@ -31,7 +29,6 @@
import org.elasticsearch.index.fielddata.SortedNumericLongValues;
import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData;
import org.elasticsearch.lucene.comparators.XLongComparator;
import org.elasticsearch.lucene.comparators.XNumericComparator;
import org.elasticsearch.search.DocValueFormat;
import org.elasticsearch.search.MultiValueMode;
import org.elasticsearch.search.sort.BucketedSort;
Expand Down Expand Up @@ -114,40 +111,6 @@ public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws I
protected NumericDocValues getNumericDocValues(LeafReaderContext context, String field) throws IOException {
return wrap(getLongValues(context, lMissingValue), maxDoc);
}

@Override
protected XNumericComparator<Long>.CompetitiveDISIBuilder buildCompetitiveDISIBuilder(LeafReaderContext context)
throws IOException {
Sort indexSort = context.reader().getMetaData().sort();
if (indexSort == null) {
return super.buildCompetitiveDISIBuilder(context);
}
SortField[] sortFields = indexSort.getSort();
if (sortFields.length != 2) {
return super.buildCompetitiveDISIBuilder(context);
}
if (sortFields[1].getField().equals(field) == false) {
return super.buildCompetitiveDISIBuilder(context);
}
DocValuesSkipper skipper = context.reader().getDocValuesSkipper(field);
DocValuesSkipper primaryFieldSkipper = context.reader().getDocValuesSkipper(sortFields[0].getField());
if (primaryFieldSkipper == null || skipper.docCount() != maxDoc || primaryFieldSkipper.docCount() != maxDoc) {
return super.buildCompetitiveDISIBuilder(context);
}
return new CompetitiveDISIBuilder(this) {
@Override
protected int docCount() {
return skipper.docCount();
}

@Override
protected void doUpdateCompetitiveIterator() {
competitiveIterator.update(
new SecondarySortIterator(docValues, skipper, primaryFieldSkipper, minValueAsLong, maxValueAsLong)
);
}
};
}
};
}
};
Expand Down
168 changes: 0 additions & 168 deletions ...rc/main/java/org/elasticsearch/index/fielddata/fieldcomparator/SecondarySortIterator.java
View file
Open in desktop

This file was deleted.

94 changes: 0 additions & 94 deletions ...st/java/org/elasticsearch/index/fielddata/fieldcomparator/SecondarySortIteratorTests.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import org.elasticsearch.search.DocValueFormat;
import org.elasticsearch.test.index.IndexVersionUtils;
import org.elasticsearch.xcontent.XContentBuilder;
import org.junit.Assert;

import java.io.IOException;
import java.math.BigDecimal;
Expand Down Expand Up @@ -934,7 +935,7 @@ protected List<SortShortcutSupport> getSortShortcutSupport() {
b -> b.field("type", "date").field("ignore_malformed", false),
b -> b.startObject("host.name").field("type", "keyword").endObject(),
b -> b.field("@timestamp", "2025-10-30T00:00:00").field("host.name", "foo"),
checkClass
Assert::assertNotNull
),
new SortShortcutSupport(b -> b.field("type", "date"), b -> b.field("field", "2025-10-30T00:00:00"), true),
new SortShortcutSupport(b -> b.field("type", "date_nanos"), b -> b.field("field", "2025-10-30T00:00:00"), true),
Expand Down
Loading