From be825868d0d8905837110a1024027cdb9d3625fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Witek?= Date: Mon, 16 Aug 2021 22:07:57 +0200 Subject: [PATCH] Set version to 7.15 in BWC code (#76577) --- .../xpack/core/transform/transforms/SettingsConfig.java | 4 ++-- .../xpack/core/transform/transforms/TransformConfig.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SettingsConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SettingsConfig.java index 7bf5ef6edfb7d..bef7adc6f9e83 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SettingsConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SettingsConfig.java @@ -94,7 +94,7 @@ public SettingsConfig(final StreamInput in) throws IOException { } else { this.datesAsEpochMillis = DEFAULT_DATES_AS_EPOCH_MILLIS; } - if (in.getVersion().onOrAfter(Version.CURRENT)) { // TODO: 7.15 + if (in.getVersion().onOrAfter(Version.V_7_15_0)) { this.interimResults = in.readOptionalInt(); } else { this.interimResults = DEFAULT_INTERIM_RESULTS; @@ -146,7 +146,7 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getVersion().onOrAfter(Version.V_7_11_0)) { out.writeOptionalInt(datesAsEpochMillis); } - if (out.getVersion().onOrAfter(Version.CURRENT)) { // TODO: 7.15 + if (out.getVersion().onOrAfter(Version.V_7_15_0)) { out.writeOptionalInt(interimResults); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java index 2c6adbf6b0ab7..70d2596ec72e1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java @@ -562,7 +562,7 @@ private static TransformConfig applyRewriteForUpdate(Builder builder) { } // 3. set interim_results to true for transforms < 7.15 to keep BWC - if (builder.getVersion() != null && builder.getVersion().before(Version.CURRENT)) { // TODO: 7.15 + if (builder.getVersion() != null && builder.getVersion().before(Version.V_7_15_0)) { builder.setSettings( new SettingsConfig( builder.getSettings().getMaxPageSearchSize(),