Skip to content

Rewritten integer sorts need to use SortedNumericSortField #139538

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
romseygeek merged 2 commits into from
Dec 16, 2025
Merged

Rewritten integer sorts need to use SortedNumericSortField #139538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6db9579
Rewritten integer sorts need to use SortedNumericSortField
romseygeek Dec 15, 2025
556e583
Merge branch 'main' into bug/int-sortednumeric
romseygeek Dec 15, 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
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public SortField sortField(
return rewrittenSortField;
}

SortField rewrittenSortField = new SortField(sortField.getField(), SortField.Type.LONG, reverse);
SortField rewrittenSortField = new SortedNumericSortField(sortField.getField(), SortField.Type.LONG, reverse);
rewrittenSortField.setMissingValue(longSource.missingObject(missingValue, reverse));
// we don't optimize sorting on int field for old indices
rewrittenSortField.setOptimizeSortWithPoints(false);
Expand Down
4 changes: 4 additions & 0 deletions server/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.sandbox.document.HalfFloatPoint;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.SortedNumericSortField;
import org.apache.lucene.search.SortedSetSelector;
import org.apache.lucene.search.SortedSetSortField;
import org.apache.lucene.search.TermQuery;
Expand Down Expand Up @@ -720,6 +721,9 @@ public void testIntRewritesToLong() throws IOException {
private void assertIntegerSortRewrite(IndexVersion version, SortField.Type expectedType) throws IOException {
FieldSortBuilder builder = new FieldSortBuilder("custom-integer");
SortFieldAndFormat sff = builder.build(createMockSearchExecutionContext(version));
if (sff.field().getType() == SortField.Type.LONG) {
assertThat(sff.field(), instanceOf(SortedNumericSortField.class));
}
SortField sf = Lucene.rewriteMergeSortField(sff.field());
assertThat(sf.getType(), equalTo(expectedType));
}
Expand Down