Fielddata: Remove custom comparators and use Lucene's instead #6981
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
This commit removes custom comparators in favor of the ones that are in Lucene. The major change is for nested documents: instead of having a comparator wrapper that deals with nested documents, this is done at the fielddata level by having a selector that returns the value to use for comparison. Sorting with custom missing string values might be slower since it is using TermValComparator since Lucene's TermOrdValComparator only supports sorting missing values first or last. But other than this particular case, this change will allow us to benefit from improvements on comparators from the Lucene side. Close elastic#5980
| * parent + 1, or 0 if there is no previous parent, and R (excluded). | ||
| */ | ||
| // TODO: better name | ||
| public static class NestedLayout { |
|
I left a bunch of cosmetic comments - this looks very clean and a nice reduction of complexity :) |
|
@s1monw pushed a new commit to address your comments |
| } else { | ||
| final FixedBitSet fixedBitSet = new FixedBitSet(maxDoc); | ||
| fixedBitSet.or(set.iterator()); | ||
| return fixedBitSet; |
There was a problem hiding this comment.
can we deprecate the method so it doesnt spread? If it spreads somewhere else, then it would need more logic to handle all the cases (e.g. DISI.iterator() == null etc)
|
LGTM maybe @rmuir can take another look? |
| return new BytesRefOrdValComparator((IndexOrdinalsFieldData) indexFieldData, numHits, sortMode, missingBytes); | ||
| // The ordinal-based comparator only supports sorting missing values first or last so when | ||
| // a missing value is provided we fall back to the (slow) value-based comparator | ||
| if (sortMissingFirst(missingValue) || sortMissingLast(missingValue)) { |
There was a problem hiding this comment.
Can you add a TODO/followup here to just make SortedDocValues "view" that exposes 'missing' as arbitrary value? I can work on it, just so its always fast...
|
Awesome, this looks great. I just added minor questions/comments/TODOs, but i think its ready. |
|
@rmuir pushed a new commit |
|
+1 |
jpountz
changed the title
clintongormley
changed the title
clintongormley
added
:Search/Search
clintongormley
added
:Search/Search
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.
This commit removes custom comparators in favor of the ones that are in Lucene.
The major change is for nested documents: instead of having a comparator wrapper
that deals with nested documents, this is done at the fielddata level by having
a selector that returns the value to use for comparison.
Sorting with custom missing string values might be slower since it is using
TermValComparator since Lucene's TermOrdValComparator only supports sorting
missing values first or last. But other than this particular case, this change
will allow us to benefit from improvements on comparators from the Lucene side.
Close #5980