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

Apply bulk change to 1.3.3 

relates to #7729
This commit is contained in:
Shay Banon 2014-09-22 15:13:35 +02:00
parent 40608ce266
commit f6a0fe5c2f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java
View File

@ -102,7 +102,7 @@ public class BulkItemRequest implements Streamable {
request = new UpdateRequest();
}
request.readFrom(in);
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta1)) {
if (in.getVersion().onOrAfter(Version.V_1_3_3)) {
if (in.readBoolean()) {
primaryResponse = BulkItemResponse.readBulkItem(in);
}
@ -121,7 +121,7 @@ public class BulkItemRequest implements Streamable {
out.writeByte((byte) 2);
}
request.writeTo(out);
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta1)) {
if (out.getVersion().onOrAfter(Version.V_1_3_3)) {
out.writeOptionalStreamable(primaryResponse);
out.writeBoolean(ignoreOnReplica);
}

4
src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java
View File

@ -95,9 +95,9 @@ public class BulkShardRequest extends ShardReplicationOperationRequest<BulkShard
out.writeVInt(items.length);
for (BulkItemRequest item : items) {
if (item != null) {
// if we are serializing to a node that is pre 1.4, make sure to pass null to maintain
// if we are serializing to a node that is pre 1.3.3, make sure to pass null to maintain
// the old behavior of putting null in the request to be ignored on the replicas
if (item.isIgnoreOnReplica() && out.getVersion().before(Version.V_1_4_0_Beta1)) {
if (item.isIgnoreOnReplica() && out.getVersion().before(Version.V_1_3_3)) {
out.writeBoolean(false);
} else {
out.writeBoolean(true);