Skip to content

Commit 93021f7

Browse files
authored
Adjust serialization versions for prefer_v2_templates flag (#55478)
This adjusts the minimum version for serialization for #55411. It should only be merged after #55476 has been merged
1 parent 5fd2918 commit 93021f7

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_index_template/15_composition.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
"Component and index template composition":
33
- skip:
4-
version: " - 7.9.99"
4+
version: " - 7.7.99"
55
reason: "index template v2 API unavailable before 7.8"
66
features: allowed_warnings
77

@@ -89,7 +89,7 @@
8989
---
9090
"Index template priority":
9191
- skip:
92-
version: " - 7.9.99"
92+
version: " - 7.7.99"
9393
reason: "index template v2 API unavailable before 7.8"
9494
features: allowed_warnings
9595

@@ -133,7 +133,7 @@
133133
---
134134
"Component template only composition":
135135
- skip:
136-
version: " - 7.9.99"
136+
version: " - 7.7.99"
137137
reason: "index template v2 API unavailable before 7.8"
138138
features: allowed_warnings
139139

@@ -179,7 +179,7 @@
179179
---
180180
"Index template without component templates":
181181
- skip:
182-
version: " - 7.9.99"
182+
version: " - 7.7.99"
183183
reason: "index template v2 API unavailable before 7.8"
184184
features: allowed_warnings
185185

@@ -208,8 +208,8 @@
208208
---
209209
"Version 1 templates are preferred if the flag is set":
210210
- skip:
211-
version: " - 7.9.99"
212-
reason: "not backported yet"
211+
version: " - 7.7.99"
212+
reason: "index template v2 API unavailable before 7.8"
213213
features: allowed_warnings
214214

215215
- do:

server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public CreateIndexRequest(StreamInput in) throws IOException {
110110
aliases.add(new Alias(in));
111111
}
112112
waitForActiveShards = ActiveShardCount.readFrom(in);
113-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
113+
if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
114114
preferV2Templates = in.readOptionalBoolean();
115115
}
116116
}
@@ -484,7 +484,7 @@ public void writeTo(StreamOutput out) throws IOException {
484484
alias.writeTo(out);
485485
}
486486
waitForActiveShards.writeTo(out);
487-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
487+
if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
488488
out.writeOptionalBoolean(preferV2Templates);
489489
}
490490
}

server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public BulkRequest(StreamInput in) throws IOException {
8989
}
9090
refreshPolicy = RefreshPolicy.readFrom(in);
9191
timeout = in.readTimeValue();
92-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
92+
if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
9393
this.preferV2Templates = in.readOptionalBoolean();
9494
}
9595
}
@@ -371,7 +371,7 @@ public void writeTo(StreamOutput out) throws IOException {
371371
}
372372
refreshPolicy.writeTo(out);
373373
out.writeTimeValue(timeout);
374-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
374+
if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
375375
out.writeOptionalBoolean(preferV2Templates);
376376
}
377377
}

server/src/main/java/org/elasticsearch/action/index/IndexRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public IndexRequest(StreamInput in) throws IOException {
144144
}
145145
ifSeqNo = in.readZLong();
146146
ifPrimaryTerm = in.readVLong();
147-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
147+
if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
148148
this.preferV2Templates = in.readOptionalBoolean();
149149
}
150150
}
@@ -656,7 +656,7 @@ public void writeTo(StreamOutput out) throws IOException {
656656
}
657657
out.writeZLong(ifSeqNo);
658658
out.writeVLong(ifPrimaryTerm);
659-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
659+
if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
660660
out.writeOptionalBoolean(preferV2Templates);
661661
}
662662
}

server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public UpdateRequest(StreamInput in) throws IOException {
153153
ifPrimaryTerm = in.readVLong();
154154
detectNoop = in.readBoolean();
155155
scriptedUpsert = in.readBoolean();
156-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
156+
if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
157157
preferV2Templates = in.readOptionalBoolean();
158158
}
159159
}
@@ -855,7 +855,7 @@ public void writeTo(StreamOutput out) throws IOException {
855855
out.writeVLong(ifPrimaryTerm);
856856
out.writeBoolean(detectNoop);
857857
out.writeBoolean(scriptedUpsert);
858-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
858+
if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
859859
out.writeOptionalBoolean(preferV2Templates);
860860
}
861861
}

0 commit comments

Comments
 (0)