Skip to content

Cherry-pick #5361: Version bump to OpenSearch 3.7 #5395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ahkcs wants to merge 1 commit into from
Closed

Cherry-pick #5361: Version bump to OpenSearch 3.7 #5395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .../java/org/opensearch/sql/spark/transport/format/CreateAsyncQueryRequestConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ public void fromXContentWithDuplicateFields() throws IOException {
Assertions.assertTrue(
illegalArgumentException
.getMessage()
.contains("Error while parsing the request body: Duplicate field 'datasource'"));
.contains(
"Error while parsing the request body: Duplicate Object property \"datasource\""));
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "3.6.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "3.7.0-SNAPSHOT")
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
version_tokens = opensearch_version.tokenize('-')
Expand Down
12 changes: 6 additions & 6 deletions ...rc/test/java/org/opensearch/sql/directquery/rest/RestDirectQueryManagementActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,16 +103,16 @@ public void testWhenDataSourcesAreEnabled() {
"{\"query\":\"up\",\"language\":\"promql\",\"options\":{\"queryType\":\"instant\",\"time\":\"1609459200\"}}";
when(request.contentParser())
.thenReturn(
new org.opensearch.common.xcontent.json.JsonXContentParser(
org.opensearch.common.xcontent.json.JsonXContent.jsonXContent.createParser(
org.opensearch.core.xcontent.NamedXContentRegistry.EMPTY,
org.opensearch.core.xcontent.DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
new com.fasterxml.jackson.core.JsonFactory().createParser(requestContent)));
requestContent));
when(request.contentParser())
.thenReturn(
new org.opensearch.common.xcontent.json.JsonXContentParser(
org.opensearch.common.xcontent.json.JsonXContent.jsonXContent.createParser(
org.opensearch.core.xcontent.NamedXContentRegistry.EMPTY,
org.opensearch.core.xcontent.DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
new com.fasterxml.jackson.core.JsonFactory().createParser(requestContent)));
requestContent));

unit.handleRequest(request, channel, nodeClient);
verify(threadPool, Mockito.times(1))
Expand Down Expand Up @@ -389,10 +389,10 @@ private ActionListener makeRequest(String requestContent) {
Mockito.when(request.param("dataSources")).thenReturn("testDataSource");
Mockito.when(request.contentParser())
.thenReturn(
new org.opensearch.common.xcontent.json.JsonXContentParser(
org.opensearch.common.xcontent.json.JsonXContent.jsonXContent.createParser(
org.opensearch.core.xcontent.NamedXContentRegistry.EMPTY,
org.opensearch.core.xcontent.DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
new com.fasterxml.jackson.core.JsonFactory().createParser(requestContent)));
requestContent));
Mockito.when(request.consumedParams()).thenReturn(java.util.Collections.emptyList());
Mockito.when(request.params()).thenReturn(java.util.Collections.emptyMap());

Expand Down
6 changes: 2 additions & 4 deletions docs/dev/opensearch-nested-field-subquery.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ GET /employee_nested/_search
"_source": {
"includes": [
"name"
],
"excludes": []
]
}
}

Expand Down Expand Up @@ -110,8 +109,7 @@ WHERE EXISTS(SELECT *
"_source": {
"includes": [
"name"
],
"excludes": []
]
}
}

Expand Down
12 changes: 4 additions & 8 deletions docs/dev/sql-nested-function-select-clause.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ A basic nested function in the SELECT clause and output DSL pushed to OpenSearch
"_source": {
"includes": [
"message.info"
],
"excludes": []
]
}
}
}
Expand Down Expand Up @@ -147,8 +146,7 @@ Example with multiple SELECT clause function calls sharing same path. These two
"includes": [
"message.info",
"message.author"
],
"excludes": []
]
}
}
}
Expand Down Expand Up @@ -187,8 +185,7 @@ An example with multiple nested function calls in the SELECT clause having diffe
"_source": {
"includes": [
"comment.data"
],
"excludes": []
]
}
}
}
Expand All @@ -207,8 +204,7 @@ An example with multiple nested function calls in the SELECT clause having diffe
"_source": {
"includes": [
"message.info"
],
"excludes": []
]
}
}
}
Expand Down
18 changes: 6 additions & 12 deletions docs/user/beyond/fulltext.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ Explain::
"includes" : [
"account_number",
"address"
],
"excludes" : [ ]
]
}
}

Expand Down Expand Up @@ -150,8 +149,7 @@ Explain::
"includes" : [
"account_number",
"address"
],
"excludes" : [ ]
]
}
}

Expand Down Expand Up @@ -230,8 +228,7 @@ Explain::
"includes" : [
"firstname",
"lastname"
],
"excludes" : [ ]
]
}
}

Expand Down Expand Up @@ -311,8 +308,7 @@ Explain::
"includes" : [
"account_number",
"address"
],
"excludes" : [ ]
]
}
}

Expand Down Expand Up @@ -386,8 +382,7 @@ Explain::
"includes" : [
"account_number",
"address"
],
"excludes" : [ ]
]
}
}

Expand Down Expand Up @@ -492,8 +487,7 @@ Explain::
"account_number",
"address",
"_score"
],
"excludes" : [ ]
]
},
"sort" : [
{
Expand Down
9 changes: 3 additions & 6 deletions docs/user/beyond/partiql.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,7 @@ Explain::
"_source" : {
"includes" : [
"projects.name"
],
"excludes" : [ ]
]
}
}
}
Expand All @@ -305,8 +304,7 @@ Explain::
"_source" : {
"includes" : [
"name"
],
"excludes" : [ ]
]
}
}

Expand Down Expand Up @@ -423,8 +421,7 @@ Explain::
"_source" : {
"includes" : [
"name"
],
"excludes" : [ ]
]
}
}

Expand Down
45 changes: 15 additions & 30 deletions docs/user/dql/basics.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,7 @@ Explain::
"includes" : [
"firstname",
"lastname"
],
"excludes" : [ ]
]
}
}

Expand Down Expand Up @@ -181,8 +180,7 @@ Explain::
"_routing",
"_sort",
"lastname"
],
"excludes" : [ ]
]
}
}

Expand Down Expand Up @@ -220,8 +218,7 @@ Explain::
"_source" : {
"includes" : [
"account_number"
],
"excludes" : [ ]
]
}
}

Expand Down Expand Up @@ -260,8 +257,7 @@ Explain::
"_source" : {
"includes" : [
"age"
],
"excludes" : [ ]
]
},
"stored_fields" : "age",
"aggregations" : {
Expand Down Expand Up @@ -422,8 +418,7 @@ Explain::
"_source" : {
"includes" : [
"account_number"
],
"excludes" : [ ]
]
}
}

Expand Down Expand Up @@ -493,8 +488,7 @@ Explain::
"includes" : [
"account_number",
"employer"
],
"excludes" : [ ]
]
}
}

Expand Down Expand Up @@ -539,8 +533,7 @@ Explain::
"_source" : {
"includes" : [
"age"
],
"excludes" : [ ]
]
},
"stored_fields" : "age",
"aggregations" : {
Expand Down Expand Up @@ -603,8 +596,7 @@ Explain::
"_source" : {
"includes" : [
"account_number"
],
"excludes" : [ ]
]
},
"stored_fields" : "account_number",
"aggregations" : {
Expand Down Expand Up @@ -667,8 +659,7 @@ Explain::
"_source" : {
"includes" : [
"age"
],
"excludes" : [ ]
]
},
"stored_fields" : "age",
"aggregations" : {
Expand Down Expand Up @@ -731,8 +722,7 @@ Explain::
"_source" : {
"includes" : [
"script"
],
"excludes" : [ ]
]
},
"stored_fields" : "abs(age)",
"script_fields" : {
Expand Down Expand Up @@ -815,8 +805,7 @@ Explain::
"includes" : [
"age",
"MAX"
],
"excludes" : [ ]
]
},
"stored_fields" : "age",
"aggregations" : {
Expand Down Expand Up @@ -904,8 +893,7 @@ Explain::
"_source" : {
"includes" : [
"account_number"
],
"excludes" : [ ]
]
},
"sort" : [
{
Expand Down Expand Up @@ -955,8 +943,7 @@ Explain::
"_source" : {
"includes" : [
"employer"
],
"excludes" : [ ]
]
},
"sort" : [
{
Expand Down Expand Up @@ -1075,8 +1062,7 @@ Explain::
"_source" : {
"includes" : [
"account_number"
],
"excludes" : [ ]
]
},
"sort" : [
{
Expand Down Expand Up @@ -1120,8 +1106,7 @@ Explain::
"_source" : {
"includes" : [
"account_number"
],
"excludes" : [ ]
]
},
"sort" : [
{
Expand Down
6 changes: 1 addition & 5 deletions docs/user/dql/complex.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ Explain::
"size" : 200,
"from" : 0,
"_source" : {
"excludes" : [ ],
"includes" : [
"firstname",
"lastname",
Expand Down Expand Up @@ -223,8 +222,7 @@ Explain::
"firstname",
"lastname",
"age"
],
"excludes" : [ ]
]
}
}

Expand Down Expand Up @@ -325,7 +323,6 @@ Explain::
"size" : 200,
"from" : 0,
"_source" : {
"excludes" : [ ],
"includes" : [
"id",
"name"
Expand All @@ -338,7 +335,6 @@ Explain::
"size" : 200,
"from" : 0,
"_source" : {
"excludes" : [ ],
"includes" : [
"account_number",
"firstname",
Expand Down
3 changes: 1 addition & 2 deletions docs/user/interfaces/endpoint.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ Explain::
"includes" : [
"firstname",
"lastname"
],
"excludes" : [ ]
]
}
}

Expand Down
Loading
Loading