enable bwc tests and bump versions after backporting #37639

Author: bleskes

build.gradle

@@ -159,8 +159,8 @@ task verifyVersions {
  * the enabled state of every bwc task. It should be set back to true
  * after the backport of the backcompat code is complete.
  */
-final boolean bwc_tests_enabled = false
-final String bwc_tests_disabled_issue = "backporting https://github.com/elastic/elasticsearch/pull/37639" /* place a PR link here when committing bwc changes */
+final boolean bwc_tests_enabled = true
+final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
 if (bwc_tests_enabled == false) {
   if (bwc_tests_disabled_issue.isEmpty()) {
     throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml

@@ -44,17 +44,11 @@ setup:
 
 ---
 "Parent/child inner hits with seq no":
-  - skip:
-      version: " - 6.99.99"
-      reason: support was added in 7.0
-
   - do:
       search:
-        rest_total_hits_as_int: true
         body: { "query" : { "has_child" :
             { "type" : "child", "query" : { "match_all" : {} }, "inner_hits" : { "seq_no_primary_term": true} }
         } }
-  - match: { hits.total: 1 }
   - match: { hits.hits.0._index: "test" }
   - match: { hits.hits.0._id: "1" }
   - match: { hits.hits.0.inner_hits.child.hits.hits.0._index: "test"}

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/200_top_hits_metric.yml

@@ -87,9 +87,6 @@ setup:
 
 ---
 "top_hits aggregation with sequence numbers":
-  - skip:
-      version: " - 6.99.99"
-      reason: support was added in 7.0
 
   - do:
       search:

rest-api-spec/src/main/resources/rest-api-spec/test/search/300_sequence_numbers.yml

@@ -24,10 +24,6 @@ setup:
 
 ---
 "sequence numbers are returned if requested from body":
-  - skip:
-      version: " - 6.99.99"
-      reason: sequence numbers were added in 7.0.0
-
   - do:
       search:
         index: _all
@@ -43,10 +39,6 @@ setup:
 
 ---
 "sequence numbers are returned if requested from url":
-  - skip:
-      version: " - 6.99.99"
-      reason: sequence numbers were added in 7.0.0
-
   - do:
       search:
         index: _all

server/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java

@@ -156,7 +156,7 @@ public InnerHitBuilder(StreamInput in) throws IOException {
         size = in.readVInt();
         explain = in.readBoolean();
         version = in.readBoolean();
-        if (in.getVersion().onOrAfter(Version.V_7_0_0)){
+        if (in.getVersion().onOrAfter(Version.V_6_7_0)){
             seqNoAndPrimaryTerm = in.readBoolean();
         } else {
             seqNoAndPrimaryTerm = false;
@@ -205,7 +205,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeVInt(size);
         out.writeBoolean(explain);
         out.writeBoolean(version);
-        if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
             out.writeBoolean(seqNoAndPrimaryTerm);
         }
         out.writeBoolean(trackScores);

server/src/main/java/org/elasticsearch/search/SearchHit.java

@@ -784,7 +784,7 @@ public void readFrom(StreamInput in) throws IOException {
         type = in.readOptionalText();
         nestedIdentity = in.readOptionalWriteable(NestedIdentity::new);
         version = in.readLong();
-        if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
             seqNo = in.readZLong();
             primaryTerm = in.readVLong();
         }
@@ -856,7 +856,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalText(type);
         out.writeOptionalWriteable(nestedIdentity);
         out.writeLong(version);
-        if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
             out.writeZLong(seqNo);
             out.writeVLong(primaryTerm);
         }

server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregationBuilder.java

@@ -140,7 +140,7 @@ public TopHitsAggregationBuilder(StreamInput in) throws IOException {
         }
         trackScores = in.readBoolean();
         version = in.readBoolean();
-        if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
             seqNoAndPrimaryTerm = in.readBoolean();
         }
     }
@@ -179,7 +179,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
         }
         out.writeBoolean(trackScores);
         out.writeBoolean(version);
-        if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
             out.writeBoolean(seqNoAndPrimaryTerm);
         }
     }

server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java

@@ -250,7 +250,7 @@ public SearchSourceBuilder(StreamInput in) throws IOException {
         timeout = in.readOptionalTimeValue();
         trackScores = in.readBoolean();
         version = in.readOptionalBoolean();
-        if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
             seqNoAndPrimaryTerm = in.readOptionalBoolean();
         } else {
             seqNoAndPrimaryTerm = null;
@@ -318,7 +318,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalTimeValue(timeout);
         out.writeBoolean(trackScores);
         out.writeOptionalBoolean(version);
-        if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
             out.writeOptionalBoolean(seqNoAndPrimaryTerm);
         }
         out.writeNamedWriteableList(extBuilders);