Decode max and min optimization more carefully #52336
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
Fixes the the no-query optimization for `min` and `max` aggregations for `date_nanos` fields by delegating decoding dates "through" their `resolution` member. Closes elastic#52220
|
Pinging @elastic/es-analytics-geo (:Analytics/Aggregations) |
nik9000
commented
Feb 13, 2020
| @@ -98,7 +98,7 @@ public LeafBucketCollector getLeafCollector(LeafReaderContext ctx, | |||
| if (pointConverter != null) { | |||
| Number segMax = findLeafMaxValue(ctx.reader(), pointField, pointConverter); | |||
| if (segMax != null) { | |||
| /** | |||
There was a problem hiding this comment.
This was a javadoc comment in an invalid spot for javadoc.
| @@ -799,21 +815,6 @@ public void testMinShortcutRandom() throws Exception { | |||
| (v) -> DoublePoint.decodeDimension(v, 0)); | |||
| } | |||
|
|
|||
| private void testMinCase(IndexSearcher searcher, | |||
There was a problem hiding this comment.
This isn't used any more.
| @@ -889,12 +890,17 @@ private Aggregator mockAggregator() { | |||
| return config; | |||
| } | |||
|
|
|||
| private ValuesSourceConfig<ValuesSource.Numeric> mockDateValuesSourceConfig(String fieldName, boolean indexed) { | |||
| private ValuesSourceConfig<ValuesSource.Numeric> mockDateValuesSourceConfig(String fieldName, boolean indexed, | |||
There was a problem hiding this comment.
There is a ton more ceremony here because resolution is only set when you call build. Bleh.
not-napoleon
approved these changes
Feb 13, 2020
| assertNull( | ||
| MinAggregator.getPointReaderOrNull( | ||
| mockSearchContext(new MatchAllDocsQuery()), | ||
| mockAggregator(), | ||
| mockDateValuesSourceConfig("number", true) | ||
| mockDateValuesSourceConfig("number", true, randomFrom(DateFieldMapper.Resolution.values())) |
There was a problem hiding this comment.
I'm a little uncomfortable using a randomization for coverage here. I'd rather loop over the possible resolution values like we loop over the possible numeric types above.
|
Thanks @not-napoleon ! |
nik9000
added a commit
to nik9000/elasticsearch
that referenced
this pull request
Feb 14, 2020
Fixes the the no-query optimization for `min` and `max` aggregations for `date_nanos` fields by delegating decoding dates "through" their `resolution` member. Closes elastic#52220
nik9000
added a commit
to nik9000/elasticsearch
that referenced
this pull request
Feb 14, 2020
Fixes the the no-query optimization for `min` and `max` aggregations for `date_nanos` fields by delegating decoding dates "through" their `resolution` member. Closes elastic#52220
nik9000
added a commit
that referenced
this pull request
Feb 14, 2020
nik9000
added a commit
that referenced
this pull request
Feb 14, 2020
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.
Fixes the the no-query optimization for
minandmaxaggregationsfor
date_nanosfields by delegating decoding dates "through" theirresolutionmember.Closes #52220