From e3da1f4a5b0f9407f85bede4fe6d39d50970192d Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Mon, 7 Dec 2020 16:38:27 +0100 Subject: [PATCH] adapt versions to 7.11 --- .../xpack/core/transform/transforms/SettingsConfig.java | 4 ++-- .../xpack/core/transform/transforms/TransformConfig.java | 4 ++-- .../xpack/core/transform/transforms/TransformConfigTests.java | 4 ++-- .../elasticsearch/xpack/transform/transforms/pivot/Pivot.java | 2 +- 4 files changed, 7 insertions(+), 7 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 ab4d297fd2d06..b7b0b09dffbf4 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 @@ -72,7 +72,7 @@ public SettingsConfig(Integer maxPageSearchSize, Float docsPerSecond, Integer da public SettingsConfig(final StreamInput in) throws IOException { this.maxPageSearchSize = in.readOptionalInt(); this.docsPerSecond = in.readOptionalFloat(); - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: change to V_7_11 + if (in.getVersion().onOrAfter(Version.V_7_11_0)) { this.datesAsEpochMillis = in.readOptionalInt(); } else { this.datesAsEpochMillis = DEFAULT_DATES_AS_EPOCH_MILLIS; @@ -115,7 +115,7 @@ public boolean isValid() { public void writeTo(StreamOutput out) throws IOException { out.writeOptionalInt(maxPageSearchSize); out.writeOptionalFloat(docsPerSecond); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: change to V_7_11_0 + if (out.getVersion().onOrAfter(Version.V_7_11_0)) { out.writeOptionalInt(datesAsEpochMillis); } } 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 27f16f854d8bc..162320a1bd48e 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 @@ -455,7 +455,7 @@ public static TransformConfig rewriteForUpdate(final TransformConfig transformCo // quick check if a rewrite is required, if none found just return the original // a failing quick check, does not mean a rewrite is necessary if (transformConfig.getVersion() != null - && transformConfig.getVersion().onOrAfter(Version.V_8_0_0) // todo: V_7_11_0 + && transformConfig.getVersion().onOrAfter(Version.V_7_11_0) && (transformConfig.getPivotConfig() == null || transformConfig.getPivotConfig().getMaxPageSearchSize() == null)) { return transformConfig; } @@ -491,7 +491,7 @@ private static TransformConfig applyRewriteForUpdate(Builder builder) { } // 2. set dates_as_epoch_millis to true for transforms < 7.11 to keep BWC - if (builder.getVersion() != null && builder.getVersion().before(Version.V_8_0_0)) { // todo: V_7_11_0 + if (builder.getVersion() != null && builder.getVersion().before(Version.V_7_11_0)) { builder.setSettings( new SettingsConfig(builder.getSettings().getMaxPageSearchSize(), builder.getSettings().getDocsPerSecond(), true) ); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigTests.java index a23a3a26d44ab..341f8cd717fa3 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigTests.java @@ -421,12 +421,12 @@ public void testRewriteForBWCOfDateNormalization() throws IOException { TransformConfig explicitTrueAfter711 = new TransformConfig.Builder(transformConfig).setSettings( new SettingsConfig.Builder(transformConfigRewritten.getSettings()).setDatesAsEpochMillis(true).build() - ).setVersion(Version.V_8_0_0).build(); // todo: V_7_11_0 + ).setVersion(Version.V_7_11_0).build(); transformConfigRewritten = TransformConfig.rewriteForUpdate(explicitTrueAfter711); assertTrue(transformConfigRewritten.getSettings().getDatesAsEpochMillis()); - assertEquals(Version.V_8_0_0, transformConfigRewritten.getVersion()); // todo: V_7_11_0 + assertEquals(Version.V_7_11_0, transformConfigRewritten.getVersion()); } private TransformConfig createTransformConfigFromString(String json, String id) throws IOException { diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/Pivot.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/Pivot.java index 744825f2e2b6f..e5bd102b39481 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/Pivot.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/Pivot.java @@ -228,7 +228,7 @@ public Stream> extractResults( // >= 7.11 as string // note: it depends on the version when the transform has been created, not the version of the code boolean datesAsEpoch = settings.getDatesAsEpochMillis() != null ? settings.getDatesAsEpochMillis() - : version.onOrAfter(Version.V_8_0_0) ? false // todo V_7_11_0 + : version.onOrAfter(Version.V_7_11_0) ? false : true; return AggregationResultUtils.extractCompositeAggregationResults(