Skip to content

Commit 1796979

Browse files
committed
Reenable bwc tests for elastic#76475
Reenabling bwc tests after merge of elastic#76475
1 parent 97f6b0c commit 1796979

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ tasks.register("verifyVersions") {
138138
* after the backport of the backcompat code is complete.
139139
*/
140140

141-
boolean bwc_tests_enabled = false
141+
boolean bwc_tests_enabled = true
142142
// place a PR link here when committing bwc changes:
143-
String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/76475"
143+
String bwc_tests_disabled_issue = ""
144144
/*
145145
* FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a
146146
* JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedTerms.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected InternalMappedTerms(String name, BucketOrder reduceOrder, BucketOrder
5252
*/
5353
protected InternalMappedTerms(StreamInput in, Bucket.Reader<B> bucketReader) throws IOException {
5454
super(in);
55-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo fix after backport
55+
if (in.getVersion().onOrAfter(Version.V_7_15_0)) {
5656
if (in.readBoolean()) {
5757
docCountError = in.readZLong();
5858
} else {
@@ -70,7 +70,7 @@ protected InternalMappedTerms(StreamInput in, Bucket.Reader<B> bucketReader) thr
7070

7171
@Override
7272
protected final void writeTermTypeInfoTo(StreamOutput out) throws IOException {
73-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo fix after backport
73+
if (out.getVersion().onOrAfter(Version.V_7_15_0)) {
7474
if (docCountError != null) {
7575
out.writeBoolean(true);
7676
out.writeZLong(docCountError);

0 commit comments

Comments
 (0)