[ESQL] Refactor Element Type selection to use a switch #110111
Merged
Conversation
This file contains 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
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
nik9000
approved these changes
Jun 24, 2024
bpintea
reviewed
Jun 24, 2024
| @@ -296,6 +272,6 @@ public static ElementType toElementType(DataType dataType, MappedFieldType.Field | |||
| * Returns DOC_VALUES if the given boolean is set. | |||
| */ | |||
| public static MappedFieldType.FieldExtractPreference extractPreference(boolean hasPreference) { | |||
| return hasPreference ? MappedFieldType.FieldExtractPreference.DOC_VALUES : MappedFieldType.FieldExtractPreference.NONE; | |||
| return hasPreference ? DOC_VALUES : MappedFieldType.FieldExtractPreference.NONE; | |||
There was a problem hiding this comment.
Nit: might be worth statically importing MappedFieldType.FieldExtractPreference.NONE as well, they're part of the same enum.
| case BOOLEAN -> ElementType.BOOLEAN; | ||
| case DOC_DATA_TYPE -> ElementType.DOC; | ||
| case TSID_DATA_TYPE -> ElementType.BYTES_REF; | ||
| case GEO_POINT, CARTESIAN_POINT -> fieldExtractPreference == DOC_VALUES ? ElementType.LONG : ElementType.BYTES_REF; | ||
| // TODO: support forStats for shape aggregations, like st_centroid |
There was a problem hiding this comment.
This comment is out of date, and can be removed. When we do doc-values they will almost certainly also be backed by ByteRefs, so no consideration for fieldExtractPreference is needed (the term forStats was used before we moved to FieldExtractPreference).
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerUtils.java
Outdated
Show resolved
Hide resolved
…planner/PlannerUtils.java Co-authored-by: Craig Taverner <[email protected]>
|
@elasticmachine run elasticsearch-ci/part-3 |
|
Test failure reproduces on main, so it's not related to this PR. I opened an issue for it: #110152 |
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.
Similar to #110036, this creates the opportunity for the compiler to flag this as a place which needs to be changed when we add a data type. It's also fewer lines of code, and makes it explicit which types are not supported.
Ideally, this would also become a property on DataType, but that can't happen until we pull it out of core.