Skip to content

Commit 279bf21

Browse files
authored
Enable bwc tests and adjust versioning. (#66016)
Backporting #66004 to 7.x branch. Relates to #64710
1 parent 4a5a16a commit 279bf21

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ public DataStreamTemplate(boolean hidden) {
296296
}
297297

298298
DataStreamTemplate(StreamInput in) throws IOException {
299-
hidden = in.getVersion().onOrAfter(DataStream.HIDDEN_VERSION) && in.readBoolean();
299+
hidden = in.getVersion().onOrAfter(DataStream.NEW_FEATURES_VERSION) && in.readBoolean();
300300
}
301301

302302
public String getTimestampField() {
@@ -318,7 +318,7 @@ public boolean isHidden() {
318318

319319
@Override
320320
public void writeTo(StreamOutput out) throws IOException {
321-
if (out.getVersion().onOrAfter(DataStream.HIDDEN_VERSION)) {
321+
if (out.getVersion().onOrAfter(DataStream.NEW_FEATURES_VERSION)) {
322322
out.writeBoolean(hidden);
323323
}
324324
}

server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,11 @@
4343
public final class DataStream extends AbstractDiffable<DataStream> implements ToXContentObject {
4444

4545
public static final String BACKING_INDEX_PREFIX = ".ds-";
46-
public static final Version HIDDEN_VERSION = Version.V_7_11_0;
47-
public static final Version REPLICATED_VERSION = Version.V_7_11_0;
46+
47+
/**
48+
* The version when data stream metadata, hidden data streams and replicated data streams was introduced.
49+
*/
50+
public static final Version NEW_FEATURES_VERSION = Version.V_7_11_0;
4851

4952
private final String name;
5053
private final TimestampField timeStampField;
@@ -187,9 +190,9 @@ public static String getDefaultBackingIndexName(String dataStreamName, long gene
187190

188191
public DataStream(StreamInput in) throws IOException {
189192
this(in.readString(), new TimestampField(in), in.readList(Index::new), in.readVLong(),
190-
in.getVersion().onOrAfter(Version.V_7_11_0) ? in.readMap(): null,
191-
in.getVersion().onOrAfter(HIDDEN_VERSION) && in.readBoolean(),
192-
in.getVersion().onOrAfter(REPLICATED_VERSION) && in.readBoolean());
193+
in.getVersion().onOrAfter(NEW_FEATURES_VERSION) ? in.readMap(): null,
194+
in.getVersion().onOrAfter(NEW_FEATURES_VERSION) && in.readBoolean(),
195+
in.getVersion().onOrAfter(NEW_FEATURES_VERSION) && in.readBoolean());
193196
}
194197

195198
public static Diff<DataStream> readDiffFrom(StreamInput in) throws IOException {
@@ -202,13 +205,9 @@ public void writeTo(StreamOutput out) throws IOException {
202205
timeStampField.writeTo(out);
203206
out.writeList(indices);
204207
out.writeVLong(generation);
205-
if (out.getVersion().onOrAfter(Version.V_7_11_0)) {
208+
if (out.getVersion().onOrAfter(NEW_FEATURES_VERSION)) {
206209
out.writeMap(metadata);
207-
}
208-
if (out.getVersion().onOrAfter(HIDDEN_VERSION)) {
209210
out.writeBoolean(hidden);
210-
}
211-
if (out.getVersion().onOrAfter(REPLICATED_VERSION)) {
212211
out.writeBoolean(replicated);
213212
}
214213
}

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DeleteDataStreamAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public Request(StreamInput in) throws IOException {
6868
super(in);
6969
this.names = in.readStringArray();
7070
this.wildcardExpressionsOriginallySpecified = in.getVersion().onOrAfter(Version.V_7_10_0) && in.readBoolean();
71-
if (in.getVersion().onOrAfter(DataStream.HIDDEN_VERSION)) {
71+
if (in.getVersion().onOrAfter(DataStream.NEW_FEATURES_VERSION)) {
7272
this.indicesOptions = IndicesOptions.readIndicesOptions(in);
7373
}
7474
}
@@ -80,7 +80,7 @@ public void writeTo(StreamOutput out) throws IOException {
8080
if (out.getVersion().onOrAfter(Version.V_7_10_0)) {
8181
out.writeBoolean(wildcardExpressionsOriginallySpecified);
8282
}
83-
if (out.getVersion().onOrAfter(DataStream.HIDDEN_VERSION)) {
83+
if (out.getVersion().onOrAfter(DataStream.NEW_FEATURES_VERSION)) {
8484
indicesOptions.writeIndicesOptions(out);
8585
}
8686
}

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/GetDataStreamAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public ActionRequestValidationException validate() {
5656
public Request(StreamInput in) throws IOException {
5757
super(in);
5858
this.names = in.readOptionalStringArray();
59-
if (in.getVersion().onOrAfter(DataStream.HIDDEN_VERSION)) {
59+
if (in.getVersion().onOrAfter(DataStream.NEW_FEATURES_VERSION)) {
6060
this.indicesOptions = IndicesOptions.readIndicesOptions(in);
6161
}
6262
}
@@ -65,7 +65,7 @@ public Request(StreamInput in) throws IOException {
6565
public void writeTo(StreamOutput out) throws IOException {
6666
super.writeTo(out);
6767
out.writeOptionalStringArray(names);
68-
if (out.getVersion().onOrAfter(DataStream.HIDDEN_VERSION)) {
68+
if (out.getVersion().onOrAfter(DataStream.NEW_FEATURES_VERSION)) {
6969
indicesOptions.writeIndicesOptions(out);
7070
}
7171
}

0 commit comments

Comments
 (0)