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

Fix total hits serialization of the search response (#36290) 

This change removes the custom serialization of the total hits
and reuses the shard's serialization of Lucene#read/writeTopDocs
in the client code. This also removes the incorrect assertion that
trips randomly in bwc tests.

Closes #36284
This commit is contained in:
Jim Ferenczi 2018-12-06 07:02:22 +01:00 committed by Julie Tibshirani
parent 3652f90552
commit 3ac64c1ec2
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/org/elasticsearch/common/lucene/Lucene.java
View File

@ -298,7 +298,7 @@ public class Lucene {
return false; return false;
} }
private static TotalHits readTotalHits(StreamInput in) throws IOException { public static TotalHits readTotalHits(StreamInput in) throws IOException {
long totalHits = in.readVLong(); long totalHits = in.readVLong();
TotalHits.Relation totalHitsRelation = TotalHits.Relation.EQUAL_TO; TotalHits.Relation totalHitsRelation = TotalHits.Relation.EQUAL_TO;
if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0)) { if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0)) {
@ -418,7 +418,7 @@ public class Lucene {
private static final Class<?> GEO_DISTANCE_SORT_TYPE_CLASS = LatLonDocValuesField.newDistanceSort("some_geo_field", 0, 0).getClass(); private static final Class<?> GEO_DISTANCE_SORT_TYPE_CLASS = LatLonDocValuesField.newDistanceSort("some_geo_field", 0, 0).getClass();
private static void writeTotalHits(StreamOutput out, TotalHits totalHits) throws IOException { public static void writeTotalHits(StreamOutput out, TotalHits totalHits) throws IOException {
out.writeVLong(totalHits.value); out.writeVLong(totalHits.value);
if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0)) { if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0)) {
out.writeEnum(totalHits.relation); out.writeEnum(totalHits.relation);

18
server/src/main/java/org/elasticsearch/search/SearchHits.java
View File

@ -21,12 +21,12 @@ package org.elasticsearch.search;
import org.apache.lucene.search.TotalHits; import org.apache.lucene.search.TotalHits;
import org.apache.lucene.search.TotalHits.Relation; import org.apache.lucene.search.TotalHits.Relation;
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;
import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.common.io.stream.Streamable;
import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
@ -276,14 +276,7 @@ public final class SearchHits implements Streamable, ToXContentFragment, Iterabl
final TotalHits in; final TotalHits in;
Total(StreamInput in) throws IOException { Total(StreamInput in) throws IOException {
final long value = in.readVLong(); this.in = Lucene.readTotalHits(in);
final Relation relation;
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
relation = in.readEnum(Relation.class);
} else {
relation = Relation.EQUAL_TO;
}
this.in = new TotalHits(value, relation);
} }
Total(TotalHits in) { Total(TotalHits in) {
@ -306,12 +299,7 @@ public final class SearchHits implements Streamable, ToXContentFragment, Iterabl
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
out.writeVLong(in.value); Lucene.writeTotalHits(out, in);
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
out.writeEnum(in.relation);
} else {
assert in.relation == Relation.EQUAL_TO;
}
} }
@Override @Override