Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ci/bwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,4 @@ BWC_VERSION:
- "2.19.3"
- "3.0.0"
- "3.1.0"
- "3.2.0"
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Please use ../gradle/libs.versions.toml for dependency management
opensearch = 3.2.0
opensearch = 3.3.0
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
opensearch = "3.2.0"
opensearch = "3.3.0"
lucene = "10.2.2"

bundled_jdk_vendor = "adoptium"
Expand Down
3 changes: 2 additions & 1 deletion libs/core/src/main/java/org/opensearch/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ public class Version implements Comparable<Version>, 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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand All @@ -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 }
Loading