Skip to content

Commit 10f6408

Browse files
committed
enable bwc tests and switch transport serialization version to 6.6.0 for CAS features
Relates to #36148
1 parent c3c785c commit 10f6408

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ task verifyVersions {
163163
* the enabled state of every bwc task. It should be set back to true
164164
* after the backport of the backcompat code is complete.
165165
*/
166-
final boolean bwc_tests_enabled = false
167-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/36555" /* place a PR link here when committing bwc changes */
166+
final boolean bwc_tests_enabled = true
167+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
168168
if (bwc_tests_enabled == false) {
169169
if (bwc_tests_disabled_issue.isEmpty()) {
170170
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ public void readFrom(StreamInput in) throws IOException {
282282
}
283283
version = in.readLong();
284284
versionType = VersionType.fromValue(in.readByte());
285-
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
285+
if (in.getVersion().onOrAfter(Version.V_6_6_0)) {
286286
ifSeqNo = in.readZLong();
287287
ifPrimaryTerm = in.readVLong();
288288
} else {
@@ -302,7 +302,7 @@ public void writeTo(StreamOutput out) throws IOException {
302302
}
303303
out.writeLong(version);
304304
out.writeByte(versionType.getValue());
305-
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
305+
if (out.getVersion().onOrAfter(Version.V_6_6_0)) {
306306
out.writeZLong(ifSeqNo);
307307
out.writeVLong(ifPrimaryTerm);
308308
} else if (ifSeqNo != SequenceNumbers.UNASSIGNED_SEQ_NO || ifPrimaryTerm != 0) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ public void readFrom(StreamInput in) throws IOException {
616616
} else {
617617
contentType = null;
618618
}
619-
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
619+
if (in.getVersion().onOrAfter(Version.V_6_6_0)) {
620620
ifSeqNo = in.readZLong();
621621
ifPrimaryTerm = in.readVLong();
622622
} else {
@@ -654,7 +654,7 @@ public void writeTo(StreamOutput out) throws IOException {
654654
} else {
655655
out.writeBoolean(false);
656656
}
657-
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
657+
if (out.getVersion().onOrAfter(Version.V_6_6_0)) {
658658
out.writeZLong(ifSeqNo);
659659
out.writeVLong(ifPrimaryTerm);
660660
} else if (ifSeqNo != SequenceNumbers.UNASSIGNED_SEQ_NO || ifPrimaryTerm != 0) {

server/src/main/java/org/elasticsearch/index/get/GetResult.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public void readFrom(StreamInput in) throws IOException {
384384
index = in.readString();
385385
type = in.readOptionalString();
386386
id = in.readString();
387-
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
387+
if (in.getVersion().onOrAfter(Version.V_6_6_0)) {
388388
seqNo = in.readZLong();
389389
primaryTerm = in.readVLong();
390390
} else {
@@ -416,7 +416,7 @@ public void writeTo(StreamOutput out) throws IOException {
416416
out.writeString(index);
417417
out.writeOptionalString(type);
418418
out.writeString(id);
419-
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
419+
if (out.getVersion().onOrAfter(Version.V_6_6_0)) {
420420
out.writeZLong(seqNo);
421421
out.writeVLong(primaryTerm);
422422
}

0 commit comments

Comments
 (0)