Skip to content

Commit bb2dd72

Browse files
authored
[Transform] finish backport: adapt versions to 7.13 and re-enable BWC tests (#71851)
1 parent cb7d51b commit bb2dd72

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

build.gradle

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

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

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/TransformFeatureSetUsage.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.elasticsearch.xpack.core.XPackField;
1818

1919
import java.io.IOException;
20-
import java.util.Collections;
2120
import java.util.Map;
2221
import java.util.Map.Entry;
2322
import java.util.Objects;
@@ -33,11 +32,7 @@ public class TransformFeatureSetUsage extends Usage {
3332
public TransformFeatureSetUsage(StreamInput in) throws IOException {
3433
super(in);
3534
this.transformCountByState = in.readMap(StreamInput::readString, StreamInput::readLong);
36-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // TODO: V_7_13_0
37-
this.transformCountByFeature = in.readMap(StreamInput::readString, StreamInput::readLong);
38-
} else {
39-
this.transformCountByFeature = Collections.emptyMap();
40-
}
35+
this.transformCountByFeature = in.readMap(StreamInput::readString, StreamInput::readLong);
4136
this.accumulatedStats = new TransformIndexerStats(in);
4237
}
4338

@@ -59,9 +54,7 @@ public Version getMinimalSupportedVersion() {
5954
public void writeTo(StreamOutput out) throws IOException {
6055
super.writeTo(out);
6156
out.writeMap(transformCountByState, StreamOutput::writeString, StreamOutput::writeLong);
62-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // TODO: V_7_13_0
63-
out.writeMap(transformCountByFeature, StreamOutput::writeString, StreamOutput::writeLong);
64-
}
57+
out.writeMap(transformCountByFeature, StreamOutput::writeString, StreamOutput::writeLong);
6558
accumulatedStats.writeTo(out);
6659
}
6760

0 commit comments

Comments
 (0)