[TEST] Add test for *_range fields in query_string queries (#27756)

[TEST] Add test for *_range fields in query_string queries

Closes #26555

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java

@@ -0,0 +1,145 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.index.mapper;
+
+import org.apache.lucene.document.DoubleRange;
+import org.apache.lucene.document.FloatRange;
+import org.apache.lucene.document.InetAddressPoint;
+import org.apache.lucene.document.InetAddressRange;
+import org.apache.lucene.document.IntRange;
+import org.apache.lucene.document.LongRange;
+import org.apache.lucene.queries.BinaryDocValuesRangeQuery;
+import org.apache.lucene.search.IndexOrDocValuesQuery;
+import org.apache.lucene.search.PointRangeQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
+import org.elasticsearch.common.compress.CompressedXContent;
+import org.elasticsearch.common.joda.DateMathParser;
+import org.elasticsearch.common.joda.Joda;
+import org.elasticsearch.common.network.InetAddresses;
+import org.elasticsearch.index.query.QueryShardContext;
+import org.elasticsearch.index.query.QueryStringQueryBuilder;
+import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.search.internal.SearchContext;
+import org.elasticsearch.test.AbstractQueryTestCase;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.Collection;
+import java.util.Collections;
+
+import static org.hamcrest.Matchers.either;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+
+public class RangeFieldQueryStringQueryBuilderTests extends AbstractQueryTestCase<QueryStringQueryBuilder> {
+
+    private static final String INTEGER_RANGE_FIELD_NAME = "mapped_int_range";
+    private static final String LONG_RANGE_FIELD_NAME = "mapped_long_range";
+    private static final String FLOAT_RANGE_FIELD_NAME = "mapped_float_range";
+    private static final String DOUBLE_RANGE_FIELD_NAME = "mapped_double_range";
+    private static final String DATE_RANGE_FIELD_NAME = "mapped_date_range";
+    private static final String IP_RANGE_FIELD_NAME = "mapped_ip_range";
+
+    @Override
+    protected Collection<Class<? extends Plugin>> getPlugins() {
+        return Collections.singleton(MapperExtrasPlugin.class);
+    }
+
+    @Override
+    protected void initializeAdditionalMappings(MapperService mapperService) throws IOException {
+        mapperService.merge("doc", new CompressedXContent(PutMappingRequest.buildFromSimplifiedDef("doc",
+            INTEGER_RANGE_FIELD_NAME, "type=integer_range",
+            LONG_RANGE_FIELD_NAME, "type=long_range",
+            FLOAT_RANGE_FIELD_NAME, "type=float_range",
+            DOUBLE_RANGE_FIELD_NAME, "type=double_range",
+            DATE_RANGE_FIELD_NAME, "type=date_range",
+            IP_RANGE_FIELD_NAME, "type=ip_range"
+        ).string()), MapperService.MergeReason.MAPPING_UPDATE, false);
+
+    }
+
+    public void testIntegerRangeQuery() throws Exception {
+        Query query = new QueryStringQueryBuilder(INTEGER_RANGE_FIELD_NAME + ":[-450 TO 45000]").toQuery(createShardContext());
+        Query range = IntRange.newIntersectsQuery(INTEGER_RANGE_FIELD_NAME, new int[]{-450}, new int[]{45000});
+        Query dv = RangeFieldMapper.RangeType.INTEGER.dvRangeQuery(INTEGER_RANGE_FIELD_NAME,
+            BinaryDocValuesRangeQuery.QueryType.INTERSECTS, -450, 45000, true, true);
+        assertEquals(new IndexOrDocValuesQuery(range, dv), query);
+    }
+
+    public void testLongRangeQuery() throws Exception {
+        Query query = new QueryStringQueryBuilder(LONG_RANGE_FIELD_NAME + ":[-450 TO 45000]").toQuery(createShardContext());
+        Query range = LongRange.newIntersectsQuery(LONG_RANGE_FIELD_NAME, new long[]{-450}, new long[]{45000});
+        Query dv = RangeFieldMapper.RangeType.LONG.dvRangeQuery(LONG_RANGE_FIELD_NAME,
+            BinaryDocValuesRangeQuery.QueryType.INTERSECTS, -450, 45000, true, true);
+        assertEquals(new IndexOrDocValuesQuery(range, dv), query);
+    }
+
+    public void testFloatRangeQuery() throws Exception {
+        Query query = new QueryStringQueryBuilder(FLOAT_RANGE_FIELD_NAME + ":[-450 TO 45000]").toQuery(createShardContext());
+        Query range = FloatRange.newIntersectsQuery(FLOAT_RANGE_FIELD_NAME, new float[]{-450}, new float[]{45000});
+        Query dv = RangeFieldMapper.RangeType.FLOAT.dvRangeQuery(FLOAT_RANGE_FIELD_NAME,
+            BinaryDocValuesRangeQuery.QueryType.INTERSECTS, -450.0f, 45000.0f, true, true);
+        assertEquals(new IndexOrDocValuesQuery(range, dv), query);
+    }
+
+    public void testDoubleRangeQuery() throws Exception {
+        Query query = new QueryStringQueryBuilder(DOUBLE_RANGE_FIELD_NAME + ":[-450 TO 45000]").toQuery(createShardContext());
+        Query range = DoubleRange.newIntersectsQuery(DOUBLE_RANGE_FIELD_NAME, new double[]{-450}, new double[]{45000});
+        Query dv = RangeFieldMapper.RangeType.DOUBLE.dvRangeQuery(DOUBLE_RANGE_FIELD_NAME,
+            BinaryDocValuesRangeQuery.QueryType.INTERSECTS, -450.0, 45000.0, true, true);
+        assertEquals(new IndexOrDocValuesQuery(range, dv), query);
+    }
+
+    public void testDateRangeQuery() throws Exception {
+        QueryShardContext context = createShardContext();
+        RangeFieldMapper.RangeFieldType type = (RangeFieldMapper.RangeFieldType) context.fieldMapper(DATE_RANGE_FIELD_NAME);
+        DateMathParser parser = type.dateMathParser;
+        Query query = new QueryStringQueryBuilder(DATE_RANGE_FIELD_NAME + ":[2010-01-01 TO 2018-01-01]").toQuery(createShardContext());
+        Query range = LongRange.newIntersectsQuery(DATE_RANGE_FIELD_NAME,
+            new long[]{ parser.parse("2010-01-01", () -> 0)}, new long[]{ parser.parse("2018-01-01", () -> 0)});
+        Query dv = RangeFieldMapper.RangeType.DATE.dvRangeQuery(DATE_RANGE_FIELD_NAME,
+            BinaryDocValuesRangeQuery.QueryType.INTERSECTS,
+            parser.parse("2010-01-01", () -> 0),
+            parser.parse("2018-01-01", () -> 0), true, true);
+        assertEquals(new IndexOrDocValuesQuery(range, dv), query);
+    }
+
+    public void testIPRangeQuery() throws Exception {
+        InetAddress lower = InetAddresses.forString("192.168.0.1");
+        InetAddress upper = InetAddresses.forString("192.168.0.5");
+        Query query = new QueryStringQueryBuilder(IP_RANGE_FIELD_NAME + ":[192.168.0.1 TO 192.168.0.5]").toQuery(createShardContext());
+        Query range = InetAddressRange.newIntersectsQuery(IP_RANGE_FIELD_NAME, lower, upper);
+        Query dv = RangeFieldMapper.RangeType.IP.dvRangeQuery(IP_RANGE_FIELD_NAME,
+            BinaryDocValuesRangeQuery.QueryType.INTERSECTS,
+            lower, upper, true, true);
+        assertEquals(new IndexOrDocValuesQuery(range, dv), query);
+    }
+
+    @Override
+    protected QueryStringQueryBuilder doCreateTestQueryBuilder() {
+        return new QueryStringQueryBuilder(INTEGER_RANGE_FIELD_NAME + ":[-450 TO 450]");
+    }
+
+    @Override
+    protected void doAssertLuceneQuery(QueryStringQueryBuilder queryBuilder, Query query, SearchContext context) throws IOException {
+        assertThat(query, either(instanceOf(PointRangeQuery.class)).or(instanceOf(IndexOrDocValuesQuery.class)));
+    }
+}

modules/mapper-extras/src/test/resources/rest-api-spec/test/range/10_basic.yml

@@ -55,6 +55,12 @@ setup:
 
   - match: { hits.total: 3 }
 
+  - do:
+      search:
+        body: { "size" : 0, "query" : { "query_string" : { "query" : "integer_range:[3 TO 4]" } } }
+
+  - match: { hits.total: 3 }
+
   - do:
       search:
         body: { "size" : 0, "query" : { "range" : { "integer_range" : { "gte": 3, "lte" : 4, "relation": "intersects" } } } }
@@ -107,6 +113,12 @@ setup:
 
   - match: { hits.total: 3 }
 
+  - do:
+      search:
+        body: { "size" : 0, "query" : { "query_string" : { "query" : "long_range:[3 TO 4]" } } }
+
+  - match: { hits.total: 3 }
+
   - do:
       search:
         body: { "size" : 0, "query" : { "range" : { "long_range" : { "gte": 3, "lte" : 4, "relation": "intersects" } } } }
@@ -159,6 +171,12 @@ setup:
 
   - match: { hits.total: 3 }
 
+  - do:
+      search:
+        body: { "size" : 0, "query" : { "query_string" : { "query" : "float_range:[3 TO 4]" } } }
+
+  - match: { hits.total: 3 }
+
   - do:
       search:
         body: { "size" : 0, "query" : { "range" : { "float_range" : { "gte": 3, "lte" : 4, "relation": "intersects" } } } }
@@ -211,6 +229,12 @@ setup:
 
   - match: { hits.total: 3 }
 
+  - do:
+      search:
+        body: { "size" : 0, "query" : { "query_string" : { "query" : "double_range:[3 TO 4]" } } }
+
+  - match: { hits.total: 3 }
+
   - do:
       search:
         body: { "size" : 0, "query" : { "range" : { "double_range" : { "gte": 3, "lte" : 4, "relation": "intersects" } } } }
@@ -263,6 +287,12 @@ setup:
 
   - match: { hits.total: 3 }
 
+  - do:
+      search:
+        body: { "size" : 0, "query" : { "query_string" : { "query" : "ip_range:[192.168.0.3 TO 192.168.0.4]" } } }
+
+  - match: { hits.total: 3 }
+
   - do:
       search:
         body: { "size" : 0, "query" : { "range" : { "ip_range" : { "gte": "192.168.0.3", "lte" : "192.168.0.4", "relation": "intersects" } } } }
@@ -315,6 +345,12 @@ setup:
 
   - match: { hits.total: 3 }
 
+  - do:
+      search:
+        body: { "size" : 0, "query" : { "query_string" : { "query" : "date_range:[2017-09-03 TO 2017-09-04]" } } }
+
+  - match: { hits.total: 3 }
+
   - do:
       search:
         body: { "size" : 0, "query" : { "range" : { "date_range" : { "gte": "2017-09-03", "lte" : "2017-09-04", "relation": "intersects" } } } }