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

[Version] Add Version 1.4.0-Beta

This commit is contained in:
Simon Willnauer 2014-09-11 22:10:19 +02:00
parent a0e9951e8a
commit b9ee915763
55 changed files with 142 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/elasticsearch/Version.java
View File

@ -198,6 +198,8 @@ public class Version implements Serializable {
public static final Version V_1_3_2 = new Version(V_1_3_2_ID, false, org.apache.lucene.util.Version.LUCENE_4_9);
public static final int V_1_3_3_ID = /*00*/1030399;
public static final Version V_1_3_3 = new Version(V_1_3_3_ID, false, org.apache.lucene.util.Version.LUCENE_4_9);
public static final int V_1_4_0_Beta_ID = /*00*/1040001;
public static final Version V_1_4_0_Beta = new Version(V_1_4_0_Beta_ID, false, org.apache.lucene.util.Version.LUCENE_4_10_0);
public static final int V_1_4_0_ID = /*00*/1040099;
public static final Version V_1_4_0 = new Version(V_1_4_0_ID, false, org.apache.lucene.util.Version.LUCENE_4_10_0);
public static final int V_2_0_0_ID = /*00*/2000099;
@ -219,6 +221,8 @@ public class Version implements Serializable {
return V_2_0_0;
case V_1_4_0_ID:
return V_1_4_0;
case V_1_4_0_Beta_ID:
return V_1_4_0_Beta;
case V_1_3_3_ID:
return V_1_3_3;
case V_1_3_2_ID:

8
src/main/java/org/elasticsearch/action/OriginalIndices.java
View File

@ -62,7 +62,7 @@ public class OriginalIndices implements IndicesRequest {
}
public static OriginalIndices readOptionalOriginalIndices(StreamInput in) throws IOException {
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
boolean empty = in.readBoolean();
if (!empty) {
return new OriginalIndices(in.readStringArray(), IndicesOptions.readIndicesOptions(in));
@ -72,7 +72,7 @@ public class OriginalIndices implements IndicesRequest {
}
public static void writeOptionalOriginalIndices(OriginalIndices originalIndices, StreamOutput out) throws IOException {
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
boolean empty = originalIndices == EMPTY;
out.writeBoolean(empty);
if (!empty) {
@ -83,7 +83,7 @@ public class OriginalIndices implements IndicesRequest {
}
public static OriginalIndices readOriginalIndices(StreamInput in) throws IOException {
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
return new OriginalIndices(in.readStringArray(), IndicesOptions.readIndicesOptions(in));
}
return OriginalIndices.EMPTY;
@ -91,7 +91,7 @@ public class OriginalIndices implements IndicesRequest {
public static void writeOriginalIndices(OriginalIndices originalIndices, StreamOutput out) throws IOException {
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeStringArrayNullable(originalIndices.indices);
originalIndices.indicesOptions.writeIndicesOptions(out);
}

4
src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java
View File

@ -218,7 +218,7 @@ public class NodeStats extends NodeOperationResponse implements ToXContent {
if (in.readBoolean()) {
http = HttpStats.readHttpStats(in);
}
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
breaker = AllCircuitBreakerStats.readOptionalAllCircuitBreakerStats(in);
} else {
// If 1.3.0 or earlier, only a single CircuitBreakerStats can be read
@ -288,7 +288,7 @@ public class NodeStats extends NodeOperationResponse implements ToXContent {
out.writeBoolean(true);
http.writeTo(out);
}
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeOptionalStreamable(breaker);
} else {
// Writing to a 1.3.0 or earlier stream expects only a single breaker stats

4
src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java vendored
View File

@ -118,7 +118,7 @@ public class ClearIndicesCacheRequest extends BroadcastOperationRequest<ClearInd
recycler = in.readBoolean();
fields = in.readStringArray();
filterKeys = in.readStringArray();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
queryCache = in.readBoolean();
}
}
@ -131,7 +131,7 @@ public class ClearIndicesCacheRequest extends BroadcastOperationRequest<ClearInd
out.writeBoolean(recycler);
out.writeStringArrayNullable(fields);
out.writeStringArrayNullable(filterKeys);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeBoolean(queryCache);
}
}

4
src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java vendored
View File

@ -97,7 +97,7 @@ class ShardClearIndicesCacheRequest extends BroadcastShardOperationRequest {
recycler = in.readBoolean();
fields = in.readStringArray();
filterKeys = in.readStringArray();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
queryCache = in.readBoolean();
}
}
@ -111,7 +111,7 @@ class ShardClearIndicesCacheRequest extends BroadcastShardOperationRequest {
out.writeBoolean(recycler);
out.writeStringArrayNullable(fields);
out.writeStringArrayNullable(filterKeys);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeBoolean(queryCache);
}
}

4
src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java
View File

@ -107,7 +107,7 @@ public class FlushRequest extends BroadcastOperationRequest<FlushRequest> {
super.writeTo(out);
out.writeBoolean(full);
out.writeBoolean(force);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeBoolean(waitIfOngoing);
}
}
@ -117,7 +117,7 @@ public class FlushRequest extends BroadcastOperationRequest<FlushRequest> {
super.readFrom(in);
full = in.readBoolean();
force = in.readBoolean();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
waitIfOngoing = in.readBoolean();
} else {
waitIfOngoing = false;

4
src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java
View File

@ -63,7 +63,7 @@ class ShardFlushRequest extends BroadcastShardOperationRequest {
super.readFrom(in);
full = in.readBoolean();
force = in.readBoolean();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
waitIfOngoing = in.readBoolean();
} else {
waitIfOngoing = false;
@ -75,7 +75,7 @@ class ShardFlushRequest extends BroadcastShardOperationRequest {
super.writeTo(out);
out.writeBoolean(full);
out.writeBoolean(force);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeBoolean(waitIfOngoing);
}
}

4
src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java
View File

@ -537,7 +537,7 @@ public class CommonStats implements Streamable, ToXContent {
if (in.getVersion().onOrAfter(Version.V_1_2_0)) {
suggest = in.readOptionalStreamable(new SuggestStats());
}
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
queryCache = in.readOptionalStreamable(new QueryCacheStats());
}
}
@ -638,7 +638,7 @@ public class CommonStats implements Streamable, ToXContent {
if (out.getVersion().onOrAfter(Version.V_1_2_0)) {
out.writeOptionalStreamable(suggest);
}
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeOptionalStreamable(queryCache);
}
}

4
src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersResponse.java
View File

@ -69,7 +69,7 @@ public class GetWarmersResponse extends ActionResponse {
String[] types = in.readStringArray();
BytesReference source = in.readBytesReference();
Boolean queryCache = null;
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
queryCache = in.readOptionalBoolean();
}
warmerEntryBuilder.add(new IndexWarmersMetaData.Entry(
@ -95,7 +95,7 @@ public class GetWarmersResponse extends ActionResponse {
out.writeString(warmerEntry.name());
out.writeStringArray(warmerEntry.types());
out.writeBytesReference(warmerEntry.source());
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeOptionalBoolean(warmerEntry.queryCache());
}
}

4
src/main/java/org/elasticsearch/action/count/CountRequest.java
View File

@ -251,7 +251,7 @@ public class CountRequest extends BroadcastOperationRequest<CountRequest> {
source = in.readBytesReference();
types = in.readStringArray();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
terminateAfter = in.readVInt();
}
}
@ -265,7 +265,7 @@ public class CountRequest extends BroadcastOperationRequest<CountRequest> {
out.writeBytesReference(source);
out.writeStringArray(types);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeVInt(terminateAfter);
}
}

4
src/main/java/org/elasticsearch/action/count/CountResponse.java
View File

@ -86,7 +86,7 @@ public class CountResponse extends BroadcastOperationResponse {
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
count = in.readVLong();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
terminatedEarly = in.readBoolean();
}
}
@ -95,7 +95,7 @@ public class CountResponse extends BroadcastOperationResponse {
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
out.writeVLong(count);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeBoolean(terminatedEarly);
}
}

4
src/main/java/org/elasticsearch/action/count/ShardCountRequest.java
View File

@ -110,7 +110,7 @@ class ShardCountRequest extends BroadcastShardOperationRequest {
}
nowInMillis = in.readVLong();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
terminateAfter = in.readVInt();
} else {
terminateAfter = DEFAULT_TERMINATE_AFTER;
@ -138,7 +138,7 @@ class ShardCountRequest extends BroadcastShardOperationRequest {
}
out.writeVLong(nowInMillis);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeVInt(terminateAfter);
}
}

4
src/main/java/org/elasticsearch/action/count/ShardCountResponse.java
View File

@ -59,7 +59,7 @@ class ShardCountResponse extends BroadcastShardOperationResponse {
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
count = in.readVLong();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
terminatedEarly = in.readBoolean();
}
}
@ -68,7 +68,7 @@ class ShardCountResponse extends BroadcastShardOperationResponse {
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
out.writeVLong(count);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeBoolean(terminatedEarly);
}
}

4
src/main/java/org/elasticsearch/action/delete/ShardDeleteRequest.java
View File

@ -108,7 +108,7 @@ public class ShardDeleteRequest extends ShardReplicationOperationRequest<ShardDe
id = in.readString();
refresh = in.readBoolean();
version = Versions.readVersion(in);
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
originalIndex = in.readOptionalString();
}
}
@ -121,7 +121,7 @@ public class ShardDeleteRequest extends ShardReplicationOperationRequest<ShardDe
out.writeString(id);
out.writeBoolean(refresh);
Versions.writeVersion(version, out);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeOptionalString(originalIndex);
}
}

4
src/main/java/org/elasticsearch/action/explain/ExplainResponse.java
View File

@ -97,7 +97,7 @@ public class ExplainResponse extends ActionResponse {
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
index = in.readString();
type = in.readString();
id = in.readString();
@ -113,7 +113,7 @@ public class ExplainResponse extends ActionResponse {
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeString(index);
out.writeString(type);
out.writeString(id);

4
src/main/java/org/elasticsearch/action/get/GetRequest.java
View File

@ -305,7 +305,7 @@ public class GetRequest extends SingleShardOperationRequest<GetRequest> {
} else if (realtime == 1) {
this.realtime = true;
}
if(in.getVersion().onOrAfter(Version.V_1_4_0)) {
if(in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
this.ignoreErrorsOnGeneratedFields = in.readBoolean();
}
@ -339,7 +339,7 @@ public class GetRequest extends SingleShardOperationRequest<GetRequest> {
} else {
out.writeByte((byte) 1);
}
if(out.getVersion().onOrAfter(Version.V_1_4_0)) {
if(out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeBoolean(ignoreErrorsOnGeneratedFields);
}
out.writeByte(versionType.getValue());

4
src/main/java/org/elasticsearch/action/get/MultiGetRequest.java
View File

@ -513,7 +513,7 @@ public class MultiGetRequest extends ActionRequest<MultiGetRequest> implements I
} else if (realtime == 1) {
this.realtime = true;
}
if(in.getVersion().onOrAfter(Version.V_1_4_0)) {
if(in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
ignoreErrorsOnGeneratedFields = in.readBoolean();
}
@ -536,7 +536,7 @@ public class MultiGetRequest extends ActionRequest<MultiGetRequest> implements I
} else {
out.writeByte((byte) 1);
}
if(out.getVersion().onOrAfter(Version.V_1_4_0)) {
if(out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeBoolean(ignoreErrorsOnGeneratedFields);
}

8
src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java
View File

@ -121,7 +121,7 @@ public class MultiGetShardRequest extends SingleShardOperationRequest<MultiGetSh
locations = new IntArrayList(size);
items = new ArrayList<>(size);
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
for (int i = 0; i < size; i++) {
locations.add(in.readVInt());
items.add(MultiGetRequest.Item.readItem(in));
@ -175,7 +175,7 @@ public class MultiGetShardRequest extends SingleShardOperationRequest<MultiGetSh
} else if (realtime == 1) {
this.realtime = true;
}
if(in.getVersion().onOrAfter(Version.V_1_4_0)) {
if(in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
ignoreErrorsOnGeneratedFields = in.readBoolean();
}
}
@ -185,7 +185,7 @@ public class MultiGetShardRequest extends SingleShardOperationRequest<MultiGetSh
super.writeTo(out);
out.writeVInt(locations.size());
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
for (int i = 0; i < locations.size(); i++) {
out.writeVInt(locations.get(i));
items.get(i).writeTo(out);
@ -224,7 +224,7 @@ public class MultiGetShardRequest extends SingleShardOperationRequest<MultiGetSh
} else {
out.writeByte((byte) 1);
}
if(out.getVersion().onOrAfter(Version.V_1_4_0)) {
if(out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeBoolean(ignoreErrorsOnGeneratedFields);
}

4
src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequest.java
View File

@ -204,7 +204,7 @@ public class GetIndexedScriptRequest extends ActionRequest<GetIndexedScriptReque
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
if (in.getVersion().before(Version.V_1_4_0)) {
if (in.getVersion().before(Version.V_1_4_0_Beta)) {
//the index was previously serialized although not needed
in.readString();
}
@ -228,7 +228,7 @@ public class GetIndexedScriptRequest extends ActionRequest<GetIndexedScriptReque
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
if (out.getVersion().before(Version.V_1_4_0)) {
if (out.getVersion().before(Version.V_1_4_0_Beta)) {
//the index was previously serialized although not needed
out.writeString(ScriptService.SCRIPT_INDEX);
}

4
src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java
View File

@ -600,7 +600,7 @@ public class MoreLikeThisRequest extends ActionRequest<MoreLikeThisRequest> impl
}
searchType = SearchType.fromId(in.readByte());
if (in.getVersion().before(Version.V_1_4_0)) {
if (in.getVersion().before(Version.V_1_4_0_Beta)) {
//searchQueryHint was unused and removed in 1.4
if (in.readBoolean()) {
in.readString();
@ -676,7 +676,7 @@ public class MoreLikeThisRequest extends ActionRequest<MoreLikeThisRequest> impl
}
out.writeByte(searchType.id());
if (out.getVersion().before(Version.V_1_4_0)) {
if (out.getVersion().before(Version.V_1_4_0_Beta)) {
//searchQueryHint was unused and removed in 1.4
out.writeBoolean(false);
}

4
src/main/java/org/elasticsearch/action/search/SearchRequest.java
View File

@ -582,7 +582,7 @@ public class SearchRequest extends ActionRequest<SearchRequest> implements Indic
}
}
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
queryCache = in.readOptionalBoolean();
}
}
@ -627,7 +627,7 @@ public class SearchRequest extends ActionRequest<SearchRequest> implements Indic
}
}
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeOptionalBoolean(queryCache);
}
}

6
src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java
View File

@ -283,14 +283,14 @@ public abstract class TransportShardReplicationOperationAction<Request extends S
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
int shard = -1;
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
shardId = ShardId.readShardId(in);
} else {
shard = in.readVInt();
}
request = newReplicaRequestInstance();
request.readFrom(in);
if (in.getVersion().before(Version.V_1_4_0)) {
if (in.getVersion().before(Version.V_1_4_0_Beta)) {
assert shard >= 0;
//older nodes will send the concrete index as part of the request
shardId = new ShardId(request.index(), shard);
@ -300,7 +300,7 @@ public abstract class TransportShardReplicationOperationAction<Request extends S
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
shardId.writeTo(out);
} else {
out.writeVInt(shardId.id());

6
src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java
View File

@ -346,7 +346,7 @@ public abstract class TransportSingleCustomOperationAction<Request extends Singl
super.readFrom(in);
request = newRequest();
request.readFrom(in);
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
shardId = ShardId.readShardId(in);
} else {
//older nodes will send the concrete index as part of the request
@ -357,12 +357,12 @@ public abstract class TransportSingleCustomOperationAction<Request extends Singl
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
if (out.getVersion().before(Version.V_1_4_0)) {
if (out.getVersion().before(Version.V_1_4_0_Beta)) {
//older nodes expect the concrete index as part of the request
request.index(shardId.getIndex());
}
request.writeTo(out);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
shardId.writeTo(out);
} else {
out.writeVInt(shardId.id());

6
src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java
View File

@ -338,7 +338,7 @@ public abstract class TransportShardSingleOperationAction<Request extends Single
super.readFrom(in);
request = newRequest();
request.readFrom(in);
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
shardId = ShardId.readShardId(in);
} else {
//older nodes will send the concrete index as part of the request
@ -349,12 +349,12 @@ public abstract class TransportShardSingleOperationAction<Request extends Single
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
if (out.getVersion().before(Version.V_1_4_0)) {
if (out.getVersion().before(Version.V_1_4_0_Beta)) {
//older nodes expect the concrete index as part of the request
request.index(shardId.getIndex());
}
request.writeTo(out);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
shardId.writeTo(out);
} else {
out.writeVInt(shardId.id());

8
src/main/java/org/elasticsearch/action/termvector/TermVectorRequest.java
View File

@ -323,14 +323,14 @@ public class TermVectorRequest extends SingleShardOperationRequest<TermVectorReq
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
if (in.getVersion().before(Version.V_1_4_0)) {
if (in.getVersion().before(Version.V_1_4_0_Beta)) {
//term vector used to read & write the index twice, here and in the parent class
in.readString();
}
type = in.readString();
id = in.readString();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
if (in.readBoolean()) {
doc = in.readBytesReference();
}
@ -357,14 +357,14 @@ public class TermVectorRequest extends SingleShardOperationRequest<TermVectorReq
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
if (out.getVersion().before(Version.V_1_4_0)) {
if (out.getVersion().before(Version.V_1_4_0_Beta)) {
//term vector used to read & write the index twice, here and in the parent class
out.writeString(index);
}
out.writeString(type);
out.writeString(id);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeBoolean(doc != null);
if (doc != null) {
out.writeBytesReference(doc);

4
src/main/java/org/elasticsearch/action/update/UpdateRequest.java
View File

@ -672,7 +672,7 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
docAsUpsert = in.readBoolean();
version = Versions.readVersion(in);
versionType = VersionType.fromValue(in.readByte());
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
detectNoop = in.readBoolean();
scriptedUpsert = in.readBoolean();
}
@ -725,7 +725,7 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
out.writeBoolean(docAsUpsert);
Versions.writeVersion(version, out);
out.writeByte(versionType.getValue());
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeBoolean(detectNoop);
out.writeBoolean(scriptedUpsert);
}

4
src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
View File

@ -546,7 +546,7 @@ public class MappingMetaData {
out.writeBoolean(false);
}
out.writeString(mappingMd.timestamp().format());
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
if (mappingMd.timestamp().hasDefaultTimestamp()) {
out.writeBoolean(true);
out.writeString(mappingMd.timestamp().defaultTimestamp());
@ -592,7 +592,7 @@ public class MappingMetaData {
Routing routing = new Routing(in.readBoolean(), in.readBoolean() ? in.readString() : null);
// timestamp
Timestamp timestamp = new Timestamp(in.readBoolean(), in.readBoolean() ? in.readString() : null, in.readString(),
in.getVersion().onOrAfter(Version.V_1_4_0) ? (in.readBoolean() ? in.readString() : null) : TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP);
in.getVersion().onOrAfter(Version.V_1_4_0_Beta) ? (in.readBoolean() ? in.readString() : null) : TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP);
final boolean hasParentField = in.readBoolean();
return new MappingMetaData(type, source, id, routing, timestamp, hasParentField);
}

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

@ -42,7 +42,6 @@ import org.elasticsearch.index.analysis.NamedAnalyzer;
import org.elasticsearch.index.fielddata.IndexFieldData;
import java.io.IOException;
import java.util.Locale;
import static org.elasticsearch.common.lucene.search.NoopCollector.NOOP_COLLECTOR;
@ -424,7 +423,7 @@ public class Lucene {
public static Explanation readExplanation(StreamInput in) throws IOException {
Explanation explanation;
if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_1_4_0) && in.readBoolean()) {
if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_1_4_0_Beta) && in.readBoolean()) {
Boolean match = in.readOptionalBoolean();
explanation = new ComplexExplanation();
((ComplexExplanation) explanation).setMatch(match);
@ -445,7 +444,7 @@ public class Lucene {
public static void writeExplanation(StreamOutput out, Explanation explanation) throws IOException {
if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_1_4_0_Beta)) {
if (explanation instanceof ComplexExplanation) {
out.writeBoolean(true);
out.writeOptionalBoolean(((ComplexExplanation) explanation).getMatch());

4
src/main/java/org/elasticsearch/common/rounding/Rounding.java
View File

@ -219,7 +219,7 @@ public abstract class Rounding implements Streamable {
@Override
public void readFrom(StreamInput in) throws IOException {
rounding = Rounding.Streams.read(in);
if (in.getVersion().before(Version.V_1_4_0)) {
if (in.getVersion().before(Version.V_1_4_0_Beta)) {
preOffset = in.readVLong();
postOffset = in.readVLong();
} else {
@ -231,7 +231,7 @@ public abstract class Rounding implements Streamable {
@Override
public void writeTo(StreamOutput out) throws IOException {
Rounding.Streams.write(rounding, out);
if (out.getVersion().before(Version.V_1_4_0)) {
if (out.getVersion().before(Version.V_1_4_0_Beta)) {
out.writeVLong(preOffset);
out.writeVLong(postOffset);
} else {

4
src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java
View File

@ -394,7 +394,7 @@ public class MasterFaultDetection extends FaultDetection {
super.readFrom(in);
nodeId = in.readString();
masterNodeId = in.readString();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
clusterName = ClusterName.readClusterName(in);
}
}
@ -404,7 +404,7 @@ public class MasterFaultDetection extends FaultDetection {
super.writeTo(out);
out.writeString(nodeId);
out.writeString(masterNodeId);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
clusterName.writeTo(out);
}
}

4
src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java
View File

@ -335,7 +335,7 @@ public class NodesFaultDetection extends FaultDetection {
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
nodeId = in.readString();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
clusterName = ClusterName.readClusterName(in);
masterNode = DiscoveryNode.readNode(in);
clusterStateVersion = in.readLong();
@ -346,7 +346,7 @@ public class NodesFaultDetection extends FaultDetection {
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
out.writeString(nodeId);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
clusterName.writeTo(out);
masterNode.writeTo(out);
out.writeLong(clusterStateVersion);

8
src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java
View File

@ -126,7 +126,7 @@ public class MembershipAction extends AbstractComponent {
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
node = DiscoveryNode.readNode(in);
if (in.getVersion().before(Version.V_1_4_0)) {
if (in.getVersion().before(Version.V_1_4_0_Beta)) {
withClusterState = in.readBoolean();
}
}
@ -135,7 +135,7 @@ public class MembershipAction extends AbstractComponent {
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
node.writeTo(out);
if (out.getVersion().before(Version.V_1_4_0)) {
if (out.getVersion().before(Version.V_1_4_0_Beta)) {
// old with cluster state flag
out.writeBoolean(false);
}
@ -219,7 +219,7 @@ public class MembershipAction extends AbstractComponent {
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
if (in.getVersion().before(Version.V_1_4_0)) {
if (in.getVersion().before(Version.V_1_4_0_Beta)) {
// cluster name doesn't matter...
ClusterState.Builder.readFrom(in, nodesProvider.nodes().localNode(), null);
}
@ -228,7 +228,7 @@ public class MembershipAction extends AbstractComponent {
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
if (out.getVersion().before(Version.V_1_4_0)) {
if (out.getVersion().before(Version.V_1_4_0_Beta)) {
ClusterState.Builder.writeTo(clusterService.state(), out);
}
}

4
src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java
View File

@ -108,7 +108,7 @@ public interface ZenPing extends LifecycleComponent<ZenPing> {
if (in.readBoolean()) {
master = readNode(in);
}
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
this.hasJoinedOnce = in.readBoolean();
} else {
// As of 1.4.0 we prefer to elect nodes which have previously successfully joined the cluster.
@ -130,7 +130,7 @@ public interface ZenPing extends LifecycleComponent<ZenPing> {
out.writeBoolean(true);
master.writeTo(out);
}
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeBoolean(hasJoinedOnce);
}
}

8
src/main/java/org/elasticsearch/index/engine/SegmentsStats.java
View File

@ -182,10 +182,10 @@ public class SegmentsStats implements Streamable, ToXContent {
indexWriterMemoryInBytes = in.readLong();
versionMapMemoryInBytes = in.readLong();
}
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
indexWriterMaxMemoryInBytes = in.readLong();
}
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
fixedBitSetMemoryInBytes = in.readLong();
}
}
@ -198,10 +198,10 @@ public class SegmentsStats implements Streamable, ToXContent {
out.writeLong(indexWriterMemoryInBytes);
out.writeLong(versionMapMemoryInBytes);
}
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeLong(indexWriterMaxMemoryInBytes);
}
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeLong(fixedBitSetMemoryInBytes);
}
}

2
src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java
View File

@ -108,7 +108,7 @@ public abstract class DocValuesIndexFieldData {
assert !numericType.isFloatingPoint();
return new NumericDVIndexFieldData(index, fieldNames, mapper.fieldDataType());
} else if (numericType != null) {
if (Version.indexCreated(indexSettings).onOrAfter(Version.V_1_4_0)) {
if (Version.indexCreated(indexSettings).onOrAfter(Version.V_1_4_0_Beta)) {
return new SortedNumericDVIndexFieldData(index, fieldNames, numericType, mapper.fieldDataType());
} else {
// prior to ES 1.4: multi-valued numerics were boxed inside a byte[] as BINARY

4
src/main/java/org/elasticsearch/index/indexing/IndexingStats.java
View File

@ -127,7 +127,7 @@ public class IndexingStats implements Streamable, ToXContent {
deleteTimeInMillis = in.readVLong();
deleteCurrent = in.readVLong();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
noopUpdateCount = in.readVLong();
}
}
@ -142,7 +142,7 @@ public class IndexingStats implements Streamable, ToXContent {
out.writeVLong(deleteTimeInMillis);
out.writeVLong(deleteCurrent);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeVLong(noopUpdateCount);
}
}

2
src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java
View File

@ -200,7 +200,7 @@ public abstract class NumberFieldMapper<T extends Number> extends AbstractFieldM
this.ignoreMalformed = ignoreMalformed;
this.coerce = coerce;
Version v = Version.indexCreated(indexSettings);
this.useSortedNumericDocValues = v.onOrAfter(Version.V_1_4_0);
this.useSortedNumericDocValues = v.onOrAfter(Version.V_1_4_0_Beta);
}
@Override

2
src/main/java/org/elasticsearch/index/query/QueryParseContext.java
View File

@ -340,7 +340,7 @@ public class QueryParseContext {
return fieldMapping;
} else {
Version indexCreatedVersion = indexQueryParser.getIndexCreatedVersion();
if (fieldMapping == null && indexCreatedVersion.onOrAfter(Version.V_1_4_0)) {
if (fieldMapping == null && indexCreatedVersion.onOrAfter(Version.V_1_4_0_Beta)) {
throw new QueryParsingException(index, "Strict field resolution and no field mapping can be found for the field with name [" + name + "]");
} else {
return fieldMapping;

4
src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java
View File

@ -124,7 +124,7 @@ public class StoreFileMetaData implements Streamable {
String versionString = in.readOptionalString();
writtenBy = Lucene.parseVersionLenient(versionString, null);
}
if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_1_4_0_Beta)) {
hash = in.readBytesRef();
} else {
hash = new BytesRef();
@ -139,7 +139,7 @@ public class StoreFileMetaData implements Streamable {
if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_1_3_0)) {
out.writeOptionalString(writtenBy == null ? null : writtenBy.toString());
}
if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_1_4_0_Beta)) {
out.writeBytesRef(hash);
}
}

4
src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java
View File

@ -91,7 +91,7 @@ public class CircuitBreakerStats implements Streamable, ToXContent {
} else {
this.trippedCount = -1;
}
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
this.name = CircuitBreaker.Name.readFrom(in);
} else {
this.name = CircuitBreaker.Name.FIELDDATA;
@ -106,7 +106,7 @@ public class CircuitBreakerStats implements Streamable, ToXContent {
if (out.getVersion().onOrAfter(Version.V_1_2_0)) {
out.writeLong(trippedCount);
}
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
CircuitBreaker.Name.writeTo(name, out);
}
}

4
src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java
View File

@ -69,7 +69,7 @@ class RecoveryTranslogOperationsRequest extends TransportRequest {
int size = in.readVInt();
operations = Lists.newArrayListWithExpectedSize(size);
for (int i = 0; i < size; i++) {
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
operations.add(TranslogStreams.CHECKSUMMED_TRANSLOG_STREAM.read(in));
} else {
operations.add(TranslogStreams.LEGACY_TRANSLOG_STREAM.read(in));
@ -85,7 +85,7 @@ class RecoveryTranslogOperationsRequest extends TransportRequest {
shardId.writeTo(out);
out.writeVInt(operations.size());
for (Translog.Operation operation : operations) {
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
TranslogStreams.CHECKSUMMED_TRANSLOG_STREAM.write(out, operation);
} else {
TranslogStreams.LEGACY_TRANSLOG_STREAM.write(out, operation);

12
src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java
View File

@ -116,7 +116,7 @@ public class DoubleTerms extends InternalTerms {
@Override
public void readFrom(StreamInput in) throws IOException {
this.name = in.readString();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
this.docCountError = in.readLong();
} else {
this.docCountError = -1;
@ -124,7 +124,7 @@ public class DoubleTerms extends InternalTerms {
this.order = InternalOrder.Streams.readOrder(in);
this.formatter = ValueFormatterStreams.readOptional(in);
this.requiredSize = readSize(in);
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
this.shardSize = readSize(in);
this.showTermDocCountError = in.readBoolean();
} else {
@ -138,7 +138,7 @@ public class DoubleTerms extends InternalTerms {
double term = in.readDouble();
long docCount = in.readVLong();
long bucketDocCountError = -1;
if (in.getVersion().onOrAfter(Version.V_1_4_0) && showTermDocCountError) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta) && showTermDocCountError) {
bucketDocCountError = in.readLong();
}
InternalAggregations aggregations = InternalAggregations.readAggregations(in);
@ -151,13 +151,13 @@ public class DoubleTerms extends InternalTerms {
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(name);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeLong(docCountError);
}
InternalOrder.Streams.writeOrder(order, out);
ValueFormatterStreams.writeOptional(formatter, out);
writeSize(requiredSize, out);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
writeSize(shardSize, out);
out.writeBoolean(showTermDocCountError);
}
@ -166,7 +166,7 @@ public class DoubleTerms extends InternalTerms {
for (InternalTerms.Bucket bucket : buckets) {
out.writeDouble(((Bucket) bucket).term);
out.writeVLong(bucket.getDocCount());
if (out.getVersion().onOrAfter(Version.V_1_4_0) && showTermDocCountError) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta) && showTermDocCountError) {
out.writeLong(bucket.docCountError);
}
((InternalAggregations) bucket.getAggregations()).writeTo(out);

12
src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java
View File

@ -117,7 +117,7 @@ public class LongTerms extends InternalTerms {
@Override
public void readFrom(StreamInput in) throws IOException {
this.name = in.readString();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
this.docCountError = in.readLong();
} else {
this.docCountError = -1;
@ -125,7 +125,7 @@ public class LongTerms extends InternalTerms {
this.order = InternalOrder.Streams.readOrder(in);
this.formatter = ValueFormatterStreams.readOptional(in);
this.requiredSize = readSize(in);
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
this.shardSize = readSize(in);
this.showTermDocCountError = in.readBoolean();
} else {
@ -139,7 +139,7 @@ public class LongTerms extends InternalTerms {
long term = in.readLong();
long docCount = in.readVLong();
long bucketDocCountError = -1;
if (in.getVersion().onOrAfter(Version.V_1_4_0) && showTermDocCountError) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta) && showTermDocCountError) {
bucketDocCountError = in.readLong();
}
InternalAggregations aggregations = InternalAggregations.readAggregations(in);
@ -152,13 +152,13 @@ public class LongTerms extends InternalTerms {
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(name);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeLong(docCountError);
}
InternalOrder.Streams.writeOrder(order, out);
ValueFormatterStreams.writeOptional(formatter, out);
writeSize(requiredSize, out);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
writeSize(shardSize, out);
out.writeBoolean(showTermDocCountError);
}
@ -167,7 +167,7 @@ public class LongTerms extends InternalTerms {
for (InternalTerms.Bucket bucket : buckets) {
out.writeLong(((Bucket) bucket).term);
out.writeVLong(bucket.getDocCount());
if (out.getVersion().onOrAfter(Version.V_1_4_0) && showTermDocCountError) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta) && showTermDocCountError) {
out.writeLong(bucket.docCountError);
}
((InternalAggregations) bucket.getAggregations()).writeTo(out);

12
src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java
View File

@ -115,14 +115,14 @@ public class StringTerms extends InternalTerms {
@Override
public void readFrom(StreamInput in) throws IOException {
this.name = in.readString();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
this.docCountError = in.readLong();
} else {
this.docCountError = -1;
}
this.order = InternalOrder.Streams.readOrder(in);
this.requiredSize = readSize(in);
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
this.shardSize = readSize(in);
this.showTermDocCountError = in.readBoolean();
} else {
@ -136,7 +136,7 @@ public class StringTerms extends InternalTerms {
BytesRef termBytes = in.readBytesRef();
long docCount = in.readVLong();
long bucketDocCountError = -1;
if (in.getVersion().onOrAfter(Version.V_1_4_0) && showTermDocCountError) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta) && showTermDocCountError) {
bucketDocCountError = in.readLong();
}
InternalAggregations aggregations = InternalAggregations.readAggregations(in);
@ -149,12 +149,12 @@ public class StringTerms extends InternalTerms {
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeString(name);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeLong(docCountError);
}
InternalOrder.Streams.writeOrder(order, out);
writeSize(requiredSize, out);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
writeSize(shardSize, out);
out.writeBoolean(showTermDocCountError);
}
@ -163,7 +163,7 @@ public class StringTerms extends InternalTerms {
for (InternalTerms.Bucket bucket : buckets) {
out.writeBytesRef(((Bucket) bucket).termBytes);
out.writeVLong(bucket.getDocCount());
if (out.getVersion().onOrAfter(Version.V_1_4_0) && showTermDocCountError) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta) && showTermDocCountError) {
out.writeLong(bucket.docCountError);
}
((InternalAggregations) bucket.getAggregations()).writeTo(out);

4
src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java
View File

@ -113,7 +113,7 @@ public class InternalSearchResponse implements Streamable, ToXContent {
}
timedOut = in.readBoolean();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
terminatedEarly = in.readOptionalBoolean();
}
}
@ -135,7 +135,7 @@ public class InternalSearchResponse implements Streamable, ToXContent {
}
out.writeBoolean(timedOut);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeOptionalBoolean(terminatedEarly);
}

4
src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java
View File

@ -273,7 +273,7 @@ public class ShardSearchRequest extends TransportRequest implements IndicesReque
useSlowScroll = in.getVersion().before(ParsedScrollId.SCROLL_SEARCH_AFTER_MINIMUM_VERSION);
}
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
queryCache = in.readOptionalBoolean();
}
originalIndices = OriginalIndices.readOptionalOriginalIndices(in);
@ -322,7 +322,7 @@ public class ShardSearchRequest extends TransportRequest implements IndicesReque
out.writeBoolean(useSlowScroll);
}
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeOptionalBoolean(queryCache);
}
OriginalIndices.writeOptionalOriginalIndices(originalIndices, out);

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

@ -164,7 +164,7 @@ public class QuerySearchResult extends QuerySearchResultProvider {
suggest = Suggest.readSuggest(Suggest.Fields.SUGGEST, in);
}
searchTimedOut = in.readBoolean();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
terminatedEarly = in.readOptionalBoolean();
}
}
@ -194,7 +194,7 @@ public class QuerySearchResult extends QuerySearchResultProvider {
suggest.writeTo(out);
}
out.writeBoolean(searchTimedOut);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeOptionalBoolean(terminatedEarly);
}
}

4
src/main/java/org/elasticsearch/search/suggest/Suggest.java
View File

@ -589,7 +589,7 @@ public class Suggest implements Iterable<Suggest.Suggestion<? extends Entry<? ex
score = in.readFloat();
highlighted = in.readOptionalText();
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
collateMatch = in.readOptionalBoolean();
}
}
@ -600,7 +600,7 @@ public class Suggest implements Iterable<Suggest.Suggestion<? extends Entry<? ex
out.writeFloat(score);
out.writeOptionalText(highlighted);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeOptionalBoolean(collateMatch);
}
}

4
src/main/java/org/elasticsearch/search/warmer/IndexWarmersMetaData.java
View File

@ -110,7 +110,7 @@ public class IndexWarmersMetaData implements IndexMetaData.Custom {
source = in.readBytesReference();
}
Boolean queryCache = null;
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
queryCache = in.readOptionalBoolean();
}
entries[i] = new Entry(name, types, queryCache, source);
@ -130,7 +130,7 @@ public class IndexWarmersMetaData implements IndexMetaData.Custom {
out.writeBoolean(true);
out.writeBytesReference(entry.source());
}
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
out.writeOptionalBoolean(entry.queryCache());
}
}

4
src/main/java/org/elasticsearch/transport/ActionNames.java
View File

@ -127,7 +127,7 @@ final class ActionNames {
}
static String incomingAction(String action, Version version) {
if (version.before(Version.V_1_4_0)) {
if (version.before(Version.V_1_4_0_Beta)) {
String post_1_4_action = post_1_4_action(action);
//custom action e.g. registered through plugin are not mapped, fallback to the original one
if (post_1_4_action != null) {
@ -138,7 +138,7 @@ final class ActionNames {
}
static String outgoingAction(String action, Version version) {
if (version.before(Version.V_1_4_0)) {
if (version.before(Version.V_1_4_0_Beta)) {
String pre_1_4_Action = pre_1_4_Action(action);
//custom actions e.g. registered through plugins are not mapped, fallback to the original one
if (pre_1_4_Action != null) {

4
src/test/java/org/elasticsearch/action/OriginalIndicesTests.java
View File

@ -51,7 +51,7 @@ public class OriginalIndicesTests extends ElasticsearchTestCase {
in.setVersion(out.getVersion());
OriginalIndices originalIndices2 = OriginalIndices.readOriginalIndices(in);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
assertThat(originalIndices2.indices(), equalTo(originalIndices.indices()));
assertThat(originalIndices2.indicesOptions(), equalTo(originalIndices.indicesOptions()));
} else {
@ -81,7 +81,7 @@ public class OriginalIndicesTests extends ElasticsearchTestCase {
in.setVersion(out.getVersion());
OriginalIndices originalIndices2 = OriginalIndices.readOptionalOriginalIndices(in);
if (out.getVersion().onOrAfter(Version.V_1_4_0)) {
if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
assertThat(originalIndices2.indices(), equalTo(originalIndices.indices()));
assertThat(originalIndices2.indicesOptions(), equalTo(originalIndices.indicesOptions()));
} else {

6
src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java
View File

@ -82,7 +82,7 @@ public class MultiGetShardRequestTests extends ElasticsearchTestCase {
assertThat(multiGetShardRequest2.preference(), equalTo(multiGetShardRequest.preference()));
assertThat(multiGetShardRequest2.realtime(), equalTo(multiGetShardRequest.realtime()));
assertThat(multiGetShardRequest2.refresh(), equalTo(multiGetShardRequest.refresh()));
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
assertThat(multiGetShardRequest2.ignoreErrorsOnGeneratedFields(), equalTo(multiGetShardRequest.ignoreErrorsOnGeneratedFields()));
} else {
assertThat(multiGetShardRequest2.ignoreErrorsOnGeneratedFields(), equalTo(false));
@ -91,7 +91,7 @@ public class MultiGetShardRequestTests extends ElasticsearchTestCase {
for (int i = 0; i < multiGetShardRequest2.items.size(); i++) {
MultiGetRequest.Item item = multiGetShardRequest.items.get(i);
MultiGetRequest.Item item2 = multiGetShardRequest2.items.get(i);
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
assertThat(item2.index(), equalTo(item.index()));
} else {
//before 1.4 we have only one index, the concrete one
@ -104,7 +104,7 @@ public class MultiGetShardRequestTests extends ElasticsearchTestCase {
assertThat(item2.versionType(), equalTo(item.versionType()));
assertThat(item2.fetchSourceContext(), equalTo(item.fetchSourceContext()));
}
if (in.getVersion().onOrAfter(Version.V_1_4_0)) {
if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta)) {
//we don't serialize the original index before 1.4, it'll get the concrete one
assertThat(multiGetShardRequest2.indices(), equalTo(multiGetShardRequest.indices()));
assertThat(multiGetShardRequest2.indicesOptions(), equalTo(multiGetShardRequest.indicesOptions()));

2
src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetTests.java
View File

@ -57,7 +57,7 @@ public class DateHistogramOffsetTests extends ElasticsearchIntegrationTest {
protected Settings nodeSettings(int nodeOrdinal) {
return ImmutableSettings.builder()
.put(super.nodeSettings(nodeOrdinal))
.put(AssertingLocalTransport.ASSERTING_TRANSPORT_MIN_VERSION_KEY, Version.V_1_4_0).build();
.put(AssertingLocalTransport.ASSERTING_TRANSPORT_MIN_VERSION_KEY, Version.V_1_4_0_Beta).build();
}
@After

18
src/test/java/org/elasticsearch/transport/ActionNamesBackwardsCompatibilityTest.java
View File

@ -118,16 +118,16 @@ public class ActionNamesBackwardsCompatibilityTest extends ElasticsearchBackward
private static final Map<String, Version> actionsVersions = new HashMap<>();
static {
actionsVersions.put(BenchmarkService.STATUS_ACTION_NAME, Version.V_1_4_0);
actionsVersions.put(BenchmarkService.START_ACTION_NAME, Version.V_1_4_0);
actionsVersions.put(BenchmarkService.ABORT_ACTION_NAME, Version.V_1_4_0);
actionsVersions.put(BenchmarkAction.NAME, Version.V_1_4_0);
actionsVersions.put(BenchmarkStatusAction.NAME, Version.V_1_4_0);
actionsVersions.put(AbortBenchmarkAction.NAME, Version.V_1_4_0);
actionsVersions.put(GetIndexAction.NAME, Version.V_1_4_0);
actionsVersions.put(BenchmarkService.STATUS_ACTION_NAME, Version.V_1_4_0_Beta);
actionsVersions.put(BenchmarkService.START_ACTION_NAME, Version.V_1_4_0_Beta);
actionsVersions.put(BenchmarkService.ABORT_ACTION_NAME, Version.V_1_4_0_Beta);
actionsVersions.put(BenchmarkAction.NAME, Version.V_1_4_0_Beta);
actionsVersions.put(BenchmarkStatusAction.NAME, Version.V_1_4_0_Beta);
actionsVersions.put(AbortBenchmarkAction.NAME, Version.V_1_4_0_Beta);
actionsVersions.put(GetIndexAction.NAME, Version.V_1_4_0_Beta);
actionsVersions.put(ExistsAction.NAME, Version.V_1_4_0);
actionsVersions.put(ExistsAction.NAME + "[s]", Version.V_1_4_0);
actionsVersions.put(ExistsAction.NAME, Version.V_1_4_0_Beta);
actionsVersions.put(ExistsAction.NAME + "[s]", Version.V_1_4_0_Beta);
actionsVersions.put(IndicesStore.ACTION_SHARD_EXISTS, Version.V_1_3_0);

6
src/test/java/org/elasticsearch/transport/ActionNamesTests.java
View File

@ -80,7 +80,7 @@ public class ActionNamesTests extends ElasticsearchIntegrationTest {
Version version = randomVersion();
String outgoingAction = ActionNames.outgoingAction(action, version);
if (version.onOrAfter(Version.V_1_4_0) || customAction || post_1_4_actions.contains(action)) {
if (version.onOrAfter(Version.V_1_4_0_Beta) || customAction || post_1_4_actions.contains(action)) {
assertThat(outgoingAction, equalTo(action));
} else {
assertThat(outgoingAction, not(equalTo(action)));
@ -103,7 +103,7 @@ public class ActionNamesTests extends ElasticsearchIntegrationTest {
if (customAction) {
action = randomAsciiOfLength(randomInt(30));
} else {
if (version.before(Version.V_1_4_0)) {
if (version.before(Version.V_1_4_0_Beta)) {
action = randomFrom(pre_1_4_names);
} else {
action = randomFrom(actions);
@ -111,7 +111,7 @@ public class ActionNamesTests extends ElasticsearchIntegrationTest {
}
String incomingAction = ActionNames.incomingAction (action, version);
if (version.onOrAfter(Version.V_1_4_0) || customAction) {
if (version.onOrAfter(Version.V_1_4_0_Beta) || customAction) {
assertThat(incomingAction, equalTo(action));
} else {
assertThat(incomingAction, not(equalTo(action)));