Replace MappedFieldType isIndexed with finer-grained IndexType #135892
+694
−525
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The addition of sparse indexes means that our existing isIndexed boolean does not provide enough information to select the best query strategy in several cases. This changes isIndexed to a new IndexType that contains information about the specific type of index structures available for a given field.
romseygeek
added
>non-issue
:StorageEngine/Mapping
|
Pinging @elastic/es-storage-engine (Team:StorageEngine) |
elasticsearchmachine
added
the
serverless-linked
felixbarny
reviewed
Oct 7, 2025
server/src/main/java/org/elasticsearch/index/mapper/IndexType.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/index/mapper/IndexType.java
Outdated
Show resolved
Hide resolved
gmarouli
reviewed
Oct 7, 2025
There was a problem hiding this comment.
LGTM. To the best of my abilities, I focused on checking if the correct enum was used, I would like to entertain @felixbarny idea, it could have made this review also easier. But if we choose to keep the enum, then I will +1
| failIfNotIndexedNorDocValuesFallback(context); | ||
| long scaledValue = Math.round(scale(value)); | ||
| return NumberFieldMapper.NumberType.LONG.termQuery(name(), scaledValue, isIndexed()); | ||
| return NumberFieldMapper.NumberType.LONG.termQuery(name(), scaledValue, indexType() == IndexType.POINTS); |
There was a problem hiding this comment.
Nit: should we use IndexType.hasPoints(indexType) like in other places in this class, assuming it's the same?
My main reason is that when reading the code it makes me think that there is something different going on here and it requires the use of the explicit indexType() == IndexType.POINTS. If that's the case, maybe a quick comment would be helpful.
server/src/main/java/org/elasticsearch/index/mapper/IndexType.java
Outdated
Show resolved
Hide resolved
felixbarny
reviewed
Oct 8, 2025
server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/index/mapper/IndexType.java
Outdated
Show resolved
Hide resolved
felixbarny
reviewed
Oct 8, 2025
server/src/main/java/org/elasticsearch/index/mapper/IndexType.java
Outdated
Show resolved
Hide resolved
felixbarny
approved these changes
Oct 8, 2025
romseygeek
added
the
auto-merge-without-approval
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The addition of sparse indexes means that our existing isIndexed boolean
does not provide enough information to select the best query strategy in
several cases. This changes isIndexed to a new IndexType that contains
information about the specific type of index structures available for a given field.