Skip to content

Commit 019aa99

Browse files
ahkcsahkcs
committed
Version bump to OpenSearch 3.7 (Jackson 2 → 3 parser API + _source excludes serialization) (opensearch-project#5361)
Signed-off-by: Kai Huang <ahkcs@amazon.com>
1 parent 5fa54c3 commit 019aa99

318 files changed

Lines changed: 493 additions & 605 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎async-query/src/test/java/org/opensearch/sql/spark/transport/format/CreateAsyncQueryRequestConverterTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public void fromXContentWithDuplicateFields() throws IOException {
5454
Assertions.assertTrue(
5555
illegalArgumentException
5656
.getMessage()
57-
.contains("Error while parsing the request body: Duplicate field 'datasource'"));
57+
.contains(
58+
"Error while parsing the request body: Duplicate Object property \"datasource\""));
5859
}
5960

6061
@Test

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
buildscript {
88
ext {
9-
opensearch_version = System.getProperty("opensearch.version", "3.6.0-SNAPSHOT")
9+
opensearch_version = System.getProperty("opensearch.version", "3.7.0-SNAPSHOT")
1010
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
1111
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
1212
version_tokens = opensearch_version.tokenize('-')

‎direct-query/src/test/java/org/opensearch/sql/directquery/rest/RestDirectQueryManagementActionTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,16 @@ public void testWhenDataSourcesAreEnabled() {
103103
"{\"query\":\"up\",\"language\":\"promql\",\"options\":{\"queryType\":\"instant\",\"time\":\"1609459200\"}}";
104104
when(request.contentParser())
105105
.thenReturn(
106-
new org.opensearch.common.xcontent.json.JsonXContentParser(
106+
org.opensearch.common.xcontent.json.JsonXContent.jsonXContent.createParser(
107107
org.opensearch.core.xcontent.NamedXContentRegistry.EMPTY,
108108
org.opensearch.core.xcontent.DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
109-
new com.fasterxml.jackson.core.JsonFactory().createParser(requestContent)));
109+
requestContent));
110110
when(request.contentParser())
111111
.thenReturn(
112-
new org.opensearch.common.xcontent.json.JsonXContentParser(
112+
org.opensearch.common.xcontent.json.JsonXContent.jsonXContent.createParser(
113113
org.opensearch.core.xcontent.NamedXContentRegistry.EMPTY,
114114
org.opensearch.core.xcontent.DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
115-
new com.fasterxml.jackson.core.JsonFactory().createParser(requestContent)));
115+
requestContent));
116116

117117
unit.handleRequest(request, channel, nodeClient);
118118
verify(threadPool, Mockito.times(1))
@@ -389,10 +389,10 @@ private ActionListener makeRequest(String requestContent) {
389389
Mockito.when(request.param("dataSources")).thenReturn("testDataSource");
390390
Mockito.when(request.contentParser())
391391
.thenReturn(
392-
new org.opensearch.common.xcontent.json.JsonXContentParser(
392+
org.opensearch.common.xcontent.json.JsonXContent.jsonXContent.createParser(
393393
org.opensearch.core.xcontent.NamedXContentRegistry.EMPTY,
394394
org.opensearch.core.xcontent.DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
395-
new com.fasterxml.jackson.core.JsonFactory().createParser(requestContent)));
395+
requestContent));
396396
Mockito.when(request.consumedParams()).thenReturn(java.util.Collections.emptyList());
397397
Mockito.when(request.params()).thenReturn(java.util.Collections.emptyMap());
398398

‎docs/dev/opensearch-nested-field-subquery.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ GET /employee_nested/_search
5353
"_source": {
5454
"includes": [
5555
"name"
56-
],
57-
"excludes": []
56+
]
5857
}
5958
}
6059
@@ -110,8 +109,7 @@ WHERE EXISTS(SELECT *
110109
"_source": {
111110
"includes": [
112111
"name"
113-
],
114-
"excludes": []
112+
]
115113
}
116114
}
117115

‎docs/dev/sql-nested-function-select-clause.md‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ A basic nested function in the SELECT clause and output DSL pushed to OpenSearch
106106
"_source": {
107107
"includes": [
108108
"message.info"
109-
],
110-
"excludes": []
109+
]
111110
}
112111
}
113112
}
@@ -147,8 +146,7 @@ Example with multiple SELECT clause function calls sharing same path. These two
147146
"includes": [
148147
"message.info",
149148
"message.author"
150-
],
151-
"excludes": []
149+
]
152150
}
153151
}
154152
}
@@ -187,8 +185,7 @@ An example with multiple nested function calls in the SELECT clause having diffe
187185
"_source": {
188186
"includes": [
189187
"comment.data"
190-
],
191-
"excludes": []
188+
]
192189
}
193190
}
194191
}
@@ -207,8 +204,7 @@ An example with multiple nested function calls in the SELECT clause having diffe
207204
"_source": {
208205
"includes": [
209206
"message.info"
210-
],
211-
"excludes": []
207+
]
212208
}
213209
}
214210
}

‎docs/user/beyond/fulltext.rst‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ Explain::
8080
"includes" : [
8181
"account_number",
8282
"address"
83-
],
84-
"excludes" : [ ]
83+
]
8584
}
8685
}
8786

@@ -150,8 +149,7 @@ Explain::
150149
"includes" : [
151150
"account_number",
152151
"address"
153-
],
154-
"excludes" : [ ]
152+
]
155153
}
156154
}
157155

@@ -230,8 +228,7 @@ Explain::
230228
"includes" : [
231229
"firstname",
232230
"lastname"
233-
],
234-
"excludes" : [ ]
231+
]
235232
}
236233
}
237234

@@ -311,8 +308,7 @@ Explain::
311308
"includes" : [
312309
"account_number",
313310
"address"
314-
],
315-
"excludes" : [ ]
311+
]
316312
}
317313
}
318314

@@ -386,8 +382,7 @@ Explain::
386382
"includes" : [
387383
"account_number",
388384
"address"
389-
],
390-
"excludes" : [ ]
385+
]
391386
}
392387
}
393388

@@ -492,8 +487,7 @@ Explain::
492487
"account_number",
493488
"address",
494489
"_score"
495-
],
496-
"excludes" : [ ]
490+
]
497491
},
498492
"sort" : [
499493
{

‎docs/user/beyond/partiql.rst‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,7 @@ Explain::
286286
"_source" : {
287287
"includes" : [
288288
"projects.name"
289-
],
290-
"excludes" : [ ]
289+
]
291290
}
292291
}
293292
}
@@ -305,8 +304,7 @@ Explain::
305304
"_source" : {
306305
"includes" : [
307306
"name"
308-
],
309-
"excludes" : [ ]
307+
]
310308
}
311309
}
312310

@@ -423,8 +421,7 @@ Explain::
423421
"_source" : {
424422
"includes" : [
425423
"name"
426-
],
427-
"excludes" : [ ]
424+
]
428425
}
429426
}
430427

‎docs/user/dql/basics.rst‎

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ Explain::
136136
"includes" : [
137137
"firstname",
138138
"lastname"
139-
],
140-
"excludes" : [ ]
139+
]
141140
}
142141
}
143142

@@ -181,8 +180,7 @@ Explain::
181180
"_routing",
182181
"_sort",
183182
"lastname"
184-
],
185-
"excludes" : [ ]
183+
]
186184
}
187185
}
188186

@@ -220,8 +218,7 @@ Explain::
220218
"_source" : {
221219
"includes" : [
222220
"account_number"
223-
],
224-
"excludes" : [ ]
221+
]
225222
}
226223
}
227224

@@ -260,8 +257,7 @@ Explain::
260257
"_source" : {
261258
"includes" : [
262259
"age"
263-
],
264-
"excludes" : [ ]
260+
]
265261
},
266262
"stored_fields" : "age",
267263
"aggregations" : {
@@ -422,8 +418,7 @@ Explain::
422418
"_source" : {
423419
"includes" : [
424420
"account_number"
425-
],
426-
"excludes" : [ ]
421+
]
427422
}
428423
}
429424

@@ -493,8 +488,7 @@ Explain::
493488
"includes" : [
494489
"account_number",
495490
"employer"
496-
],
497-
"excludes" : [ ]
491+
]
498492
}
499493
}
500494

@@ -539,8 +533,7 @@ Explain::
539533
"_source" : {
540534
"includes" : [
541535
"age"
542-
],
543-
"excludes" : [ ]
536+
]
544537
},
545538
"stored_fields" : "age",
546539
"aggregations" : {
@@ -603,8 +596,7 @@ Explain::
603596
"_source" : {
604597
"includes" : [
605598
"account_number"
606-
],
607-
"excludes" : [ ]
599+
]
608600
},
609601
"stored_fields" : "account_number",
610602
"aggregations" : {
@@ -667,8 +659,7 @@ Explain::
667659
"_source" : {
668660
"includes" : [
669661
"age"
670-
],
671-
"excludes" : [ ]
662+
]
672663
},
673664
"stored_fields" : "age",
674665
"aggregations" : {
@@ -731,8 +722,7 @@ Explain::
731722
"_source" : {
732723
"includes" : [
733724
"script"
734-
],
735-
"excludes" : [ ]
725+
]
736726
},
737727
"stored_fields" : "abs(age)",
738728
"script_fields" : {
@@ -815,8 +805,7 @@ Explain::
815805
"includes" : [
816806
"age",
817807
"MAX"
818-
],
819-
"excludes" : [ ]
808+
]
820809
},
821810
"stored_fields" : "age",
822811
"aggregations" : {
@@ -904,8 +893,7 @@ Explain::
904893
"_source" : {
905894
"includes" : [
906895
"account_number"
907-
],
908-
"excludes" : [ ]
896+
]
909897
},
910898
"sort" : [
911899
{
@@ -955,8 +943,7 @@ Explain::
955943
"_source" : {
956944
"includes" : [
957945
"employer"
958-
],
959-
"excludes" : [ ]
946+
]
960947
},
961948
"sort" : [
962949
{
@@ -1075,8 +1062,7 @@ Explain::
10751062
"_source" : {
10761063
"includes" : [
10771064
"account_number"
1078-
],
1079-
"excludes" : [ ]
1065+
]
10801066
},
10811067
"sort" : [
10821068
{
@@ -1120,8 +1106,7 @@ Explain::
11201106
"_source" : {
11211107
"includes" : [
11221108
"account_number"
1123-
],
1124-
"excludes" : [ ]
1109+
]
11251110
},
11261111
"sort" : [
11271112
{

‎docs/user/dql/complex.rst‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ Explain::
112112
"size" : 200,
113113
"from" : 0,
114114
"_source" : {
115-
"excludes" : [ ],
116115
"includes" : [
117116
"firstname",
118117
"lastname",
@@ -223,8 +222,7 @@ Explain::
223222
"firstname",
224223
"lastname",
225224
"age"
226-
],
227-
"excludes" : [ ]
225+
]
228226
}
229227
}
230228

@@ -325,7 +323,6 @@ Explain::
325323
"size" : 200,
326324
"from" : 0,
327325
"_source" : {
328-
"excludes" : [ ],
329326
"includes" : [
330327
"id",
331328
"name"
@@ -338,7 +335,6 @@ Explain::
338335
"size" : 200,
339336
"from" : 0,
340337
"_source" : {
341-
"excludes" : [ ],
342338
"includes" : [
343339
"account_number",
344340
"firstname",

‎docs/user/interfaces/endpoint.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ Explain::
8888
"includes" : [
8989
"firstname",
9090
"lastname"
91-
],
92-
"excludes" : [ ]
91+
]
9392
}
9493
}
9594

0 commit comments

Comments
 (0)