-
Notifications
You must be signed in to change notification settings - Fork 25.1k
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.
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
Factor out sort values from InternalSearchHit #22080
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9939049
Factor out sort values from InternalSearchHit
cbuescher a7ae785
review comments
cbuescher 2c8f26c
Addressing review comment
cbuescher 6e9a583
Using common helper methods
cbuescher 5ac0054
Re-adding XContentParserUtils.ensureFieldName helper
cbuescher 5b0d3f1
No null checks in ensureFieldName
cbuescher File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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 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
168 changes: 168 additions & 0 deletions
168
core/src/main/java/org/elasticsearch/search/internal/SearchSortValues.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.search.internal; | ||
|
|
||
| import org.apache.lucene.util.BytesRef; | ||
| import org.elasticsearch.common.io.stream.StreamInput; | ||
| import org.elasticsearch.common.io.stream.StreamOutput; | ||
| import org.elasticsearch.common.io.stream.Writeable; | ||
| import org.elasticsearch.common.xcontent.ToXContent; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
| import org.elasticsearch.common.xcontent.XContentParser; | ||
| import org.elasticsearch.common.xcontent.XContentParserUtils; | ||
| import org.elasticsearch.search.DocValueFormat; | ||
| import org.elasticsearch.search.internal.InternalSearchHit.Fields; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Arrays; | ||
| import java.util.Objects; | ||
|
|
||
| public class SearchSortValues implements ToXContent, Writeable { | ||
|
|
||
| static final SearchSortValues EMPTY = new SearchSortValues(new Object[0]); | ||
| private final Object[] sortValues; | ||
|
|
||
| SearchSortValues(Object[] sortValues) { | ||
| this.sortValues = Objects.requireNonNull(sortValues, "sort values must not be empty"); | ||
| } | ||
|
|
||
| public SearchSortValues(Object[] sortValues, DocValueFormat[] sortValueFormats) { | ||
| Objects.requireNonNull(sortValues); | ||
| Objects.requireNonNull(sortValueFormats); | ||
| this.sortValues = Arrays.copyOf(sortValues, sortValues.length); | ||
| for (int i = 0; i < sortValues.length; ++i) { | ||
| if (this.sortValues[i] instanceof BytesRef) { | ||
| this.sortValues[i] = sortValueFormats[i].format((BytesRef) sortValues[i]); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public SearchSortValues(StreamInput in) throws IOException { | ||
| int size = in.readVInt(); | ||
| if (size > 0) { | ||
| sortValues = new Object[size]; | ||
| for (int i = 0; i < sortValues.length; i++) { | ||
| byte type = in.readByte(); | ||
| if (type == 0) { | ||
| sortValues[i] = null; | ||
| } else if (type == 1) { | ||
| sortValues[i] = in.readString(); | ||
| } else if (type == 2) { | ||
| sortValues[i] = in.readInt(); | ||
| } else if (type == 3) { | ||
| sortValues[i] = in.readLong(); | ||
| } else if (type == 4) { | ||
| sortValues[i] = in.readFloat(); | ||
| } else if (type == 5) { | ||
| sortValues[i] = in.readDouble(); | ||
| } else if (type == 6) { | ||
| sortValues[i] = in.readByte(); | ||
| } else if (type == 7) { | ||
| sortValues[i] = in.readShort(); | ||
| } else if (type == 8) { | ||
| sortValues[i] = in.readBoolean(); | ||
| } else { | ||
| throw new IOException("Can't match type [" + type + "]"); | ||
| } | ||
| } | ||
| } else { | ||
| sortValues = new Object[0]; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void writeTo(StreamOutput out) throws IOException { | ||
| out.writeVInt(sortValues.length); | ||
| for (Object sortValue : sortValues) { | ||
| if (sortValue == null) { | ||
| out.writeByte((byte) 0); | ||
| } else { | ||
| Class type = sortValue.getClass(); | ||
| if (type == String.class) { | ||
| out.writeByte((byte) 1); | ||
| out.writeString((String) sortValue); | ||
| } else if (type == Integer.class) { | ||
| out.writeByte((byte) 2); | ||
| out.writeInt((Integer) sortValue); | ||
| } else if (type == Long.class) { | ||
| out.writeByte((byte) 3); | ||
| out.writeLong((Long) sortValue); | ||
| } else if (type == Float.class) { | ||
| out.writeByte((byte) 4); | ||
| out.writeFloat((Float) sortValue); | ||
| } else if (type == Double.class) { | ||
| out.writeByte((byte) 5); | ||
| out.writeDouble((Double) sortValue); | ||
| } else if (type == Byte.class) { | ||
| out.writeByte((byte) 6); | ||
| out.writeByte((Byte) sortValue); | ||
| } else if (type == Short.class) { | ||
| out.writeByte((byte) 7); | ||
| out.writeShort((Short) sortValue); | ||
| } else if (type == Boolean.class) { | ||
| out.writeByte((byte) 8); | ||
| out.writeBoolean((Boolean) sortValue); | ||
| } else { | ||
| throw new IOException("Can't handle sort field value of type [" + type + "]"); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { | ||
| if (sortValues.length > 0) { | ||
| builder.startArray(Fields.SORT); | ||
| for (Object sortValue : sortValues) { | ||
| builder.value(sortValue); | ||
| } | ||
| builder.endArray(); | ||
| } | ||
| return builder; | ||
| } | ||
|
|
||
| public static SearchSortValues fromXContent(XContentParser parser) throws IOException { | ||
| XContentParserUtils.ensureFieldName(parser, parser.currentToken(), Fields.SORT); | ||
| XContentParser.Token token = parser.nextToken(); | ||
| XContentParserUtils.ensureExpectedToken(XContentParser.Token.START_ARRAY, token, parser::getTokenLocation); | ||
| return new SearchSortValues(parser.list().toArray()); | ||
| } | ||
|
|
||
| public Object[] sortValues() { | ||
| return sortValues; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object obj) { | ||
| if (this == obj) { | ||
| return true; | ||
| } | ||
| if (obj == null || getClass() != obj.getClass()) { | ||
| return false; | ||
| } | ||
| SearchSortValues other = (SearchSortValues) obj; | ||
| return Arrays.equals(sortValues, other.sortValues); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Arrays.hashCode(sortValues); | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you move
writeToup here? I like to get reading and writing on the same page if possible.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
++