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

Remove PROTOTYPE from MLT.Item 

Relates to #17085
This commit is contained in:
Nik Everett 2016-04-01 12:52:22 -04:00
parent ca54b408a3
commit 0539def016
2 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java
View File

@ -147,10 +147,7 @@ public class MoreLikeThisQueryBuilder extends AbstractQueryBuilder<MoreLikeThisQ
private long version = Versions.MATCH_ANY;
private VersionType versionType = VersionType.INTERNAL;
static final Item PROTOTYPE = new Item();
public Item() {
}
Item(Item copy) {
@ -199,6 +196,41 @@ public class MoreLikeThisQueryBuilder extends AbstractQueryBuilder<MoreLikeThisQ
this.doc = doc.bytes();
}
/**
* Read from a stream.
*/
Item(StreamInput in) throws IOException {
index = in.readOptionalString();
type = in.readOptionalString();
if (in.readBoolean()) {
doc = (BytesReference) in.readGenericValue();
} else {
id = in.readString();
}
fields = in.readOptionalStringArray();
perFieldAnalyzer = (Map<String, String>) in.readGenericValue();
routing = in.readOptionalString();
version = in.readLong();
versionType = VersionType.readVersionTypeFrom(in);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalString(index);
out.writeOptionalString(type);
out.writeBoolean(doc != null);
if (doc != null) {
out.writeGenericValue(doc);
} else {
out.writeString(id);
}
out.writeOptionalStringArray(fields);
out.writeGenericValue(perFieldAnalyzer);
out.writeOptionalString(routing);
out.writeLong(version);
versionType.writeTo(out);
}
public String index() {
return index;
}
@ -404,45 +436,6 @@ public class MoreLikeThisQueryBuilder extends AbstractQueryBuilder<MoreLikeThisQ
}
}
@Override
public Item readFrom(StreamInput in) throws IOException {
Item item = new Item();
item.index = in.readOptionalString();
item.type = in.readOptionalString();
if (in.readBoolean()) {
item.doc = (BytesReference) in.readGenericValue();
} else {
item.id = in.readString();
}
item.fields = in.readOptionalStringArray();
item.perFieldAnalyzer = (Map<String, String>) in.readGenericValue();
item.routing = in.readOptionalString();
item.version = in.readLong();
item.versionType = VersionType.readVersionTypeFrom(in);
return item;
}
public static Item readItemFrom(StreamInput in) throws IOException {
return PROTOTYPE.readFrom(in);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalString(index);
out.writeOptionalString(type);
out.writeBoolean(doc != null);
if (doc != null) {
out.writeGenericValue(doc);
} else {
out.writeString(id);
}
out.writeOptionalStringArray(fields);
out.writeGenericValue(perFieldAnalyzer);
out.writeOptionalString(routing);
out.writeLong(version);
versionType.writeTo(out);
}
@Override
public int hashCode() {
return Objects.hash(index, type, id, doc, Arrays.hashCode(fields), perFieldAnalyzer, routing,
@ -989,7 +982,7 @@ public class MoreLikeThisQueryBuilder extends AbstractQueryBuilder<MoreLikeThisQ
int size = in.readVInt();
Item[] items = new Item[size];
for (int i = 0; i < size; i++) {
items[i] = Item.readItemFrom(in);
items[i] = new Item(in);
}
return items;
}

2
core/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java
View File

@ -290,7 +290,7 @@ public class MoreLikeThisQueryBuilderTests extends AbstractQueryTestCase<MoreLik
Item expectedItem = generateRandomItem();
BytesStreamOutput output = new BytesStreamOutput();
expectedItem.writeTo(output);
Item newItem = Item.readItemFrom(StreamInput.wrap(output.bytes()));
Item newItem = new Item(StreamInput.wrap(output.bytes()));
assertEquals(expectedItem, newItem);
}