Skip to content

Address issue with DateFieldMapper#isFieldWithinQuery(...) #138032

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

Address issue with DateFieldMapper#isFieldWithinQuery(...) #138032

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
77033d9
Address issue with DateFieldMapper#isFieldWithinQuery(...)
martijnvg Nov 13, 2025
200a222
Merge remote-tracking branch 'es/main' into date_field_mapper_skipper…
martijnvg 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
7 changes: 4 additions & 3 deletions server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,9 +841,10 @@ public Relation isFieldWithinQuery(
}
for (LeafReaderContext ctx : leaves) {
DocValuesSkipper skipper = ctx.reader().getDocValuesSkipper(name());
assert skipper != null : "no skipper for field:" + name() + " and reader:" + reader;
minValue = Long.min(minValue, skipper.minValue());
maxValue = Long.max(maxValue, skipper.maxValue());
if (skipper != null) {
minValue = Long.min(minValue, skipper.minValue());
maxValue = Long.max(maxValue, skipper.maxValue());
}
}
return isFieldWithinQuery(minValue, maxValue, from, to, includeLower, includeUpper, timeZone, dateParser, context, name());
}
Expand Down
38 changes: 37 additions & 1 deletion server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,44 @@ public void testIsFieldWithinQueryDateNanosDocValueSkipper() throws IOException
isFieldWithinRangeTestCase(ft);
}

public void isFieldWithinRangeTestCase(DateFieldType ft) throws IOException {
public void testIsFieldWithinQueryDocValueSkipperNotInAllSegments() throws IOException {
var ft = new DateFieldType(
"my_date",
IndexType.skippers(),
false,
DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER,
Resolution.NANOSECONDS,
null,
null,
Collections.emptyMap()
);

try (Directory dir = newDirectory()) {
try (IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null))) {
// Simulates one segment have no my_date field
LuceneDocument doc = new LuceneDocument();
doc.add(SortedNumericDocValuesField.indexedField("my_other_date", 123456789000L));
w.addDocument(doc);
w.flush();

doc = new LuceneDocument();
Field field = SortedNumericDocValuesField.indexedField("my_date", ft.parse("2015-10-12"));
doc.add(field);
w.addDocument(doc);
field.setLongValue(ft.parse("2016-04-03"));
w.addDocument(doc);
try (DirectoryReader reader = DirectoryReader.open(w)) {
DateMathParser alternateFormat = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.toDateMathParser();
doTestIsFieldWithinQuery(ft, reader, null, null);
doTestIsFieldWithinQuery(ft, reader, null, alternateFormat);
doTestIsFieldWithinQuery(ft, reader, ZoneOffset.UTC, null);
doTestIsFieldWithinQuery(ft, reader, ZoneOffset.UTC, alternateFormat);
}
}
}
}

public void isFieldWithinRangeTestCase(DateFieldType ft) throws IOException {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null));
LuceneDocument doc = new LuceneDocument();
Expand Down