From f65b317b7256be7d29febc72ea943397c354e9d8 Mon Sep 17 00:00:00 2001 From: bowenlan-amzn Date: Tue, 12 Aug 2025 09:10:51 -0700 Subject: [PATCH 1/2] bump version on main branch to 3.3 Signed-off-by: bowenlan-amzn --- .ci/bwcVersions | 1 + buildSrc/version.properties | 2 +- gradle/libs.versions.toml | 2 +- libs/core/src/main/java/org/opensearch/Version.java | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.ci/bwcVersions b/.ci/bwcVersions index 8ad56c66dd09e..05121e16e3896 100644 --- a/.ci/bwcVersions +++ b/.ci/bwcVersions @@ -48,3 +48,4 @@ BWC_VERSION: - "2.19.3" - "3.0.0" - "3.1.0" + - "3.2.0" diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 3ac58c3cfc095..8ab641b598eb4 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,2 +1,2 @@ # Please use ../gradle/libs.versions.toml for dependency management -opensearch = 3.2.0 +opensearch = 3.3.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 24f128885f457..58cae3ee6b986 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -opensearch = "3.2.0" +opensearch = "3.3.0" lucene = "10.2.2" bundled_jdk_vendor = "adoptium" diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java index bfe03a23141d9..a5b682d653295 100644 --- a/libs/core/src/main/java/org/opensearch/Version.java +++ b/libs/core/src/main/java/org/opensearch/Version.java @@ -120,7 +120,8 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_10_1_0); public static final Version V_3_1_0 = new Version(3010099, org.apache.lucene.util.Version.LUCENE_10_2_1); public static final Version V_3_2_0 = new Version(3020099, org.apache.lucene.util.Version.LUCENE_10_2_2); - public static final Version CURRENT = V_3_2_0; + public static final Version V_3_3_0 = new Version(3030099, org.apache.lucene.util.Version.LUCENE_10_2_2); + public static final Version CURRENT = V_3_3_0; public static Version fromId(int id) { final Version known = LegacyESVersion.idToVersion.get(id); From e12b414bdd80c5cdfa73c76c620ada473cda8022 Mon Sep 17 00:00:00 2001 From: bowenlan-amzn Date: Tue, 12 Aug 2025 10:45:19 -0700 Subject: [PATCH 2/2] fix test failure Signed-off-by: bowenlan-amzn --- .../rest-api-spec/test/search/400_max_score.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/400_max_score.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/400_max_score.yml index f81aafb3150de..4bd9f03df1da7 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/400_max_score.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/400_max_score.yml @@ -38,23 +38,25 @@ teardown: - do: search: + rest_total_hits_as_int: true index: test_1 body: query: { term: { foo: bar} } sort: [{ _score: desc }, { _doc: desc }] - match: { hits.total: 2 } - length: { hits.hits: 2 } - - match: { max_score: 1.0 } + - match: { hits.max_score: 1.0 } - do: search: + rest_total_hits_as_int: true index: test_1 body: query: { term: { foo: bar} } sort: [{ _score: asc }, { _doc: desc }] - match: { hits.total: 2 } - length: { hits.hits: 2 } - - match: { max_score: null } + - match: { hits.max_score: null } --- "Test max score with sorting on score firstly with concurrent segment search enabled": @@ -70,20 +72,22 @@ teardown: - do: search: + rest_total_hits_as_int: true index: test_1 body: query: { term: { foo: bar} } sort: [{ _score: desc }, { _doc: desc }] - match: { hits.total: 2 } - length: { hits.hits: 2 } - - match: { max_score: 1.0 } + - match: { hits.max_score: 1.0 } - do: search: + rest_total_hits_as_int: true index: test_1 body: query: { term: { foo: bar} } sort: [{ _score: asc }, { _doc: desc }] - match: { hits.total: 2 } - length: { hits.hits: 2 } - - match: { max_score: null } + - match: { hits.max_score: null }