honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup version constant for unsupported version in QuerySearchResult

This commit is contained in:
Simon Willnauer 2016-09-13 17:20:34 +02:00
parent 013e3f6fcc
commit c84bc25500
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java
View File

@ -21,7 +21,6 @@ package org.elasticsearch.search.query;
import org.apache.lucene.search.FieldDoc; import org.apache.lucene.search.FieldDoc;
import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopDocs;
import org.elasticsearch.Version;
import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
@ -42,9 +41,6 @@ import static java.util.Collections.emptyList;
import static org.elasticsearch.common.lucene.Lucene.readTopDocs; import static org.elasticsearch.common.lucene.Lucene.readTopDocs;
import static org.elasticsearch.common.lucene.Lucene.writeTopDocs; import static org.elasticsearch.common.lucene.Lucene.writeTopDocs;
/**
*
*/
public class QuerySearchResult extends QuerySearchResultProvider { public class QuerySearchResult extends QuerySearchResultProvider {
private long id; private long id;
@ -209,7 +205,6 @@ public class QuerySearchResult extends QuerySearchResultProvider {
public void readFromWithId(long id, StreamInput in) throws IOException { public void readFromWithId(long id, StreamInput in) throws IOException {
this.id = id; this.id = id;
// shardTarget = readSearchShardTarget(in);
from = in.readVInt(); from = in.readVInt();
size = in.readVInt(); size = in.readVInt();
int numSortFieldsPlus1 = in.readVInt(); int numSortFieldsPlus1 = in.readVInt();
@ -232,10 +227,7 @@ public class QuerySearchResult extends QuerySearchResultProvider {
} }
searchTimedOut = in.readBoolean(); searchTimedOut = in.readBoolean();
terminatedEarly = in.readOptionalBoolean(); terminatedEarly = in.readOptionalBoolean();
profileShardResults = in.readOptionalWriteable(ProfileShardResult::new);
if (in.getVersion().onOrAfter(Version.V_2_2_0) && in.readBoolean()) {
profileShardResults = new ProfileShardResult(in);
}
} }
@Override @Override
@ -246,7 +238,6 @@ public class QuerySearchResult extends QuerySearchResultProvider {
} }
public void writeToNoId(StreamOutput out) throws IOException { public void writeToNoId(StreamOutput out) throws IOException {
// shardTarget.writeTo(out);
out.writeVInt(from); out.writeVInt(from);
out.writeVInt(size); out.writeVInt(size);
if (sortValueFormats == null) { if (sortValueFormats == null) {
@ -273,14 +264,6 @@ public class QuerySearchResult extends QuerySearchResultProvider {
} }
out.writeBoolean(searchTimedOut); out.writeBoolean(searchTimedOut);
out.writeOptionalBoolean(terminatedEarly); out.writeOptionalBoolean(terminatedEarly);
out.writeOptionalWriteable(profileShardResults);
if (out.getVersion().onOrAfter(Version.V_2_2_0)) {
if (profileShardResults == null) {
out.writeBoolean(false);
} else {
out.writeBoolean(true);
profileShardResults.writeTo(out);
}
}
} }
} }