From 00a48001e10da284181fe94d4024edd40a33b137 Mon Sep 17 00:00:00 2001 From: Igor Motov Date: Thu, 4 Feb 2021 11:22:46 -0500 Subject: [PATCH] Re-enable BWC tests after backport of changes in values source Relates to #68490 --- build.gradle | 4 ++-- .../aggregations/support/MultiValuesSourceFieldConfig.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index c22c800260aef..0d82993af14cc 100644 --- a/build.gradle +++ b/build.gradle @@ -178,8 +178,8 @@ String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull */ if ( BuildParams.inFipsJvm ) { - bwc_tests_enabled = false - bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/issues/66772" + bwc_tests_enabled = true + bwc_tests_disabled_issue = "" } if (bwc_tests_enabled == false) { if (bwc_tests_disabled_issue.isEmpty()) { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java index 524d7d5177221..6ac22308e47dd 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java @@ -122,7 +122,7 @@ public MultiValuesSourceFieldConfig(StreamInput in) throws IOException { } else { this.filter = null; } - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { + if (in.getVersion().onOrAfter(Version.V_7_12_0)) { this.userValueTypeHint = in.readOptionalWriteable(ValueType::readFromStream); this.format = in.readOptionalString(); } else { @@ -173,7 +173,7 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getVersion().onOrAfter(Version.V_7_8_0)) { out.writeOptionalNamedWriteable(filter); } - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getVersion().onOrAfter(Version.V_7_12_0)) { out.writeOptionalWriteable(userValueTypeHint); out.writeOptionalString(format); }