Add intervals query

rest-api-spec/src/main/resources/rest-api-spec/test/search/230_interval_query.yml

@@ -0,0 +1,58 @@
+setup:
+  - skip:
+      version: " - 6.99.99"
+      reason:  "Implemented in 7.0"
+
+  - do:
+        indices.create:
+          index:  test
+          body:
+            mappings:
+              test:
+                properties:
+                  text:
+                    type: text
+                    analyzer: standard
+  - do:
+        bulk:
+          refresh: true
+          body:
+            - '{"index": {"_index": "test", "_type": "test", "_id": "1"}}'
+            - '{"text" : "Some like it hot, some like it cold"}'
+            - '{"index": {"_index": "test", "_type": "test", "_id": "2"}}'
+            - '{"text" : "Its cold outside, theres no kind of atmosphere"}'
+            - '{"index": {"_index": "test", "_type": "test", "_id": "3"}}'
+            - '{"text" : "Baby its cold there outside"}'
+            - '{"index": {"_index": "test", "_type": "test", "_id": "4"}}'
+            - '{"text" : "Outside it is cold and wet"}'
+
+---
+"Test ordered matching":
+  - do:
+        search:
+          index: test
+          body:
+            query:
+              intervals:
+                field: text
+                source:
+                  match:
+                    text: "cold outside"
+                    type: ordered
+  - match: { hits.total: 2 }
+
+---
+"Test default unordered matching":
+  - do:
+        search:
+          index: test
+          body:
+            query:
+              intervals:
+                field: text
+                source:
+                  match:
+                    text: "cold outside"
+  - match: { hits.total: 3 }
+
+

server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java

@@ -34,6 +34,7 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermInSetQuery;
 import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.intervals.IntervalsSource;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.Nullable;
@@ -374,6 +375,15 @@ public Query multiPhraseQuery(String field, TokenStream stream, int slop, boolea
             + "] which is of type [" + typeName() + "]");
     }
 
+    public enum IntervalType {
+        ORDERED, UNORDERED, PHRASE
+    }
+
+    public IntervalsSource intervals(String text, IntervalType type) throws IOException {
+        throw new IllegalArgumentException("Can only use interval queries on text fields - not on [" + name
+            + "] which is of type [" + typeName() + "]");
+    }
+
     /**
      * An enum used to describe the relation between the range of terms in a
      * shard when compared with a query range
@@ -465,4 +475,5 @@ public static Term extractTerm(Query termQuery) {
         }
         return ((TermQuery) termQuery).getTerm();
     }
+
 }

server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java

@@ -39,6 +39,7 @@
 import org.apache.lucene.search.PhraseQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.intervals.IntervalsSource;
 import org.elasticsearch.Version;
 import org.elasticsearch.common.collect.Iterators;
 import org.elasticsearch.common.settings.Settings;
@@ -48,6 +49,7 @@
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.fielddata.plain.PagedBytesIndexFieldData;
+import org.elasticsearch.index.query.IntervalBuilder;
 import org.elasticsearch.index.query.QueryShardContext;
 
 import java.io.IOException;
@@ -579,6 +581,15 @@ public Query existsQuery(QueryShardContext context) {
             }
         }
 
+        @Override
+        public IntervalsSource intervals(String text, IntervalType type) throws IOException {
+            if (indexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) < 0) {
+                throw new IllegalArgumentException("Cannot create source against field [" + name() + "] with no positions indexed");
+            }
+            IntervalBuilder builder = new IntervalBuilder(name(), searchAnalyzer());
+            return builder.analyzeText(text, type);
+        }
+
         @Override
         public Query phraseQuery(String field, TokenStream stream, int slop, boolean enablePosIncrements) throws IOException {