Skip to content

Commit 54c35c6

Browse files
author
Christoph Büscher
authored
[Tests] Fix skip version in yaml test for range fields in query_string (#27878)
The mixed cluster test are currently failing the range/10_basic rest tests because they are testing the use of range fields in query_string queries in a mixed cluster with 5.6 nodes. According to #26552 this feature was only merged to version 6.1.0. This change moves the test causing these failures to their own test section that can be skipped for versions before 6.1.0.
1 parent bde251d commit 54c35c6

File tree

1 file changed

+85
-36
lines changed
  • rest-api-spec/src/main/resources/rest-api-spec/test/range

1 file changed

+85
-36
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/range/10_basic.yml

Lines changed: 85 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@ setup:
5555

5656
- match: { hits.total: 3 }
5757

58-
- do:
59-
search:
60-
body: { "size" : 0, "query" : { "query_string" : { "query" : "integer_range:[3 TO 4]" } } }
61-
62-
- match: { hits.total: 3 }
63-
6458
- do:
6559
search:
6660
body: { "size" : 0, "query" : { "range" : { "integer_range" : { "gte": 3, "lte" : 4, "relation": "intersects" } } } }
@@ -113,12 +107,6 @@ setup:
113107

114108
- match: { hits.total: 3 }
115109

116-
- do:
117-
search:
118-
body: { "size" : 0, "query" : { "query_string" : { "query" : "long_range:[3 TO 4]" } } }
119-
120-
- match: { hits.total: 3 }
121-
122110
- do:
123111
search:
124112
body: { "size" : 0, "query" : { "range" : { "long_range" : { "gte": 3, "lte" : 4, "relation": "intersects" } } } }
@@ -171,12 +159,6 @@ setup:
171159

172160
- match: { hits.total: 3 }
173161

174-
- do:
175-
search:
176-
body: { "size" : 0, "query" : { "query_string" : { "query" : "float_range:[3 TO 4]" } } }
177-
178-
- match: { hits.total: 3 }
179-
180162
- do:
181163
search:
182164
body: { "size" : 0, "query" : { "range" : { "float_range" : { "gte": 3, "lte" : 4, "relation": "intersects" } } } }
@@ -229,12 +211,6 @@ setup:
229211

230212
- match: { hits.total: 3 }
231213

232-
- do:
233-
search:
234-
body: { "size" : 0, "query" : { "query_string" : { "query" : "double_range:[3 TO 4]" } } }
235-
236-
- match: { hits.total: 3 }
237-
238214
- do:
239215
search:
240216
body: { "size" : 0, "query" : { "range" : { "double_range" : { "gte": 3, "lte" : 4, "relation": "intersects" } } } }
@@ -287,12 +263,6 @@ setup:
287263

288264
- match: { hits.total: 3 }
289265

290-
- do:
291-
search:
292-
body: { "size" : 0, "query" : { "query_string" : { "query" : "ip_range:[192.168.0.3 TO 192.168.0.4]" } } }
293-
294-
- match: { hits.total: 3 }
295-
296266
- do:
297267
search:
298268
body: { "size" : 0, "query" : { "range" : { "ip_range" : { "gte": "192.168.0.3", "lte" : "192.168.0.4", "relation": "intersects" } } } }
@@ -345,12 +315,6 @@ setup:
345315

346316
- match: { hits.total: 3 }
347317

348-
- do:
349-
search:
350-
body: { "size" : 0, "query" : { "query_string" : { "query" : "date_range:[2017-09-03 TO 2017-09-04]" } } }
351-
352-
- match: { hits.total: 3 }
353-
354318
- do:
355319
search:
356320
body: { "size" : 0, "query" : { "range" : { "date_range" : { "gte": "2017-09-03", "lte" : "2017-09-04", "relation": "intersects" } } } }
@@ -368,3 +332,88 @@ setup:
368332
body: { "size" : 0, "query" : { "range" : { "date_range" : { "gte": "2017-09-03", "lte" : "2017-09-04", "relation": "within" } } } }
369333

370334
- match: { hits.total: 0 }
335+
336+
---
337+
"Query on range fields in query_string":
338+
339+
- skip:
340+
version: " - 6.0.99"
341+
reason: "Support for range field in query_string was introduced in 6.1 (#26552)"
342+
343+
- do:
344+
index:
345+
index: test
346+
type: doc
347+
id: 1
348+
body: { "integer_range" : { "gte": 1, "lte": 5 },
349+
"long_range" : { "gte": 1, "lte": 5 },
350+
"float_range" : { "gte": 1, "lte": 5 },
351+
"double_range" : { "gte": 1, "lte": 5 },
352+
"ip_range" : { "gte": "192.168.0.1", "lte": "192.168.0.5" },
353+
"date_range" : { "gte": "2017-09-01", "lte": "2017-09-05" }
354+
}
355+
356+
- do:
357+
index:
358+
index: test
359+
type: doc
360+
id: 2
361+
body: { "integer_range" : { "gte": 1, "lte": 3 },
362+
"long_range" : { "gte": 1, "lte": 3 },
363+
"float_range" : { "gte": 1, "lte": 3 },
364+
"double_range" : { "gte": 1, "lte":3 },
365+
"ip_range" : { "gte": "192.168.0.1", "lte": "192.168.0.3" },
366+
"date_range" : { "gte": "2017-09-01", "lte": "2017-09-03" }
367+
}
368+
369+
- do:
370+
index:
371+
index: test
372+
type: doc
373+
id: 3
374+
body: { "integer_range" : { "gte": 4, "lte": 5 },
375+
"long_range" : { "gte": 4, "lte": 5 },
376+
"float_range" : { "gte": 4, "lte": 5 },
377+
"double_range" : { "gte": 4, "lte":5 },
378+
"ip_range" : { "gte": "192.168.0.4", "lte": "192.168.0.5" },
379+
"date_range" : { "gte": "2017-09-04", "lte": "2017-09-05" }
380+
}
381+
382+
- do:
383+
indices.refresh: {}
384+
385+
- do:
386+
search:
387+
body: { "size" : 0, "query" : { "query_string" : { "query" : "integer_range:[3 TO 4]" } } }
388+
389+
- match: { hits.total: 3 }
390+
391+
- do:
392+
search:
393+
body: { "size" : 0, "query" : { "query_string" : { "query" : "long_range:[3 TO 4]" } } }
394+
395+
- match: { hits.total: 3 }
396+
397+
- do:
398+
search:
399+
body: { "size" : 0, "query" : { "query_string" : { "query" : "float_range:[3 TO 4]" } } }
400+
401+
- match: { hits.total: 3 }
402+
403+
- do:
404+
search:
405+
body: { "size" : 0, "query" : { "query_string" : { "query" : "double_range:[3 TO 4]" } } }
406+
407+
- match: { hits.total: 3 }
408+
409+
- do:
410+
search:
411+
body: { "size" : 0, "query" : { "query_string" : { "query" : "ip_range:[192.168.0.3 TO 192.168.0.4]" } } }
412+
413+
- match: { hits.total: 3 }
414+
415+
- do:
416+
search:
417+
body: { "size" : 0, "query" : { "query_string" : { "query" : "date_range:[2017-09-03 TO 2017-09-04]" } } }
418+
419+
- match: { hits.total: 3 }

0 commit comments

Comments
 (0)