elastic · nknize · Jul 10, 2019 · Jul 9, 2019 · Jul 10, 2019 · Jul 10, 2019
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.0.0
-lucene            = 8.1.0
+lucene            = 8.2.0-snapshot-860e0be5378
 
 bundled_jdk       = 12.0.1+12@69cfe15208a647278a19ef0990eea691
 

diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
@@ -5,8 +5,8 @@ bare_version never includes -alpha or -beta
 :bare_version:          8.0.0
 :major-version:         8.x
 :prev-major-version:    7.x
-:lucene_version:        8.1.0
-:lucene_version_path:   8_1_0
+:lucene_version:        8.2.0
+:lucene_version_path:   8_2_0
 :branch:                master
 :jdk:                   11.0.2
 :jdk_major:             11

diff --git a/modules/lang-expression/licenses/lucene-expressions-8.1.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.1.0.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.2.0-snapshot-860e0be5378.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+779a843cfa50fc09eb0cbadebe1ae2de35fb80b4
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.1.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.1.0.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.2.0-snapshot-860e0be5378.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+9ec124ed1efe19b6a6ebdc9ce299d2a3726cf040
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.1.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.1.0.jar.sha1
diff --git a/.../analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.2.0-snapshot-860e0be5378.jar.sha1 b/.../analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+86c02792e73efdc762e2e65ea7e78912ca01ab65
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.1.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.1.0.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.2.0-snapshot-860e0be5378.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+7fd7096cbee02f0c888df1bf391e0fe2d12422e6
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.1.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.1.0.jar.sha1
diff --git a/.../analysis-phonetic/licenses/lucene-analyzers-phonetic-8.2.0-snapshot-860e0be5378.jar.sha1 b/.../analysis-phonetic/licenses/lucene-analyzers-phonetic-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+9d22bef4e7aa7b651eda01ad99e608018da9527d
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.1.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.1.0.jar.sha1
diff --git a/...ns/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.2.0-snapshot-860e0be5378.jar.sha1 b/...ns/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+1600d60203bf6b53244668352f4026653497abd1
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.1.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.1.0.jar.sha1
diff --git a/...ns/analysis-stempel/licenses/lucene-analyzers-stempel-8.2.0-snapshot-860e0be5378.jar.sha1 b/...ns/analysis-stempel/licenses/lucene-analyzers-stempel-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+2902e1e58cf5d8bbb2ed98d85b1dcddff3b46cbe
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.1.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.1.0.jar.sha1
diff --git a/...alysis-ukrainian/licenses/lucene-analyzers-morfologik-8.2.0-snapshot-860e0be5378.jar.sha1 b/...alysis-ukrainian/licenses/lucene-analyzers-morfologik-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+d85bddbdc8a890bd90b572b7fe8e8f944af7fc70
diff --git a/server/licenses/lucene-analyzers-common-8.1.0.jar.sha1 b/server/licenses/lucene-analyzers-common-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-analyzers-common-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-analyzers-common-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+ceed9fd2c88f62b9f039e28eef57f5d95e71c578
diff --git a/server/licenses/lucene-backward-codecs-8.1.0.jar.sha1 b/server/licenses/lucene-backward-codecs-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-backward-codecs-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+24feeb6db1bc38b1a7aa31eaa052b5af323f206c
diff --git a/server/licenses/lucene-core-8.1.0.jar.sha1 b/server/licenses/lucene-core-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-core-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-core-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+d5f5b26c967dce353db5b69f52a22ab1c39e3ce6
diff --git a/server/licenses/lucene-grouping-8.1.0.jar.sha1 b/server/licenses/lucene-grouping-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-grouping-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-grouping-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+45d506e861bcfe5dcffeab89e08f046934b540cb
diff --git a/server/licenses/lucene-highlighter-8.1.0.jar.sha1 b/server/licenses/lucene-highlighter-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-highlighter-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-highlighter-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+0a6c96eff6c944ec576873e1d1936fd6b265afd4
diff --git a/server/licenses/lucene-join-8.1.0.jar.sha1 b/server/licenses/lucene-join-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-join-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-join-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+9b9fba1279c24d2daac0a8c54228c0bbc4375d60
diff --git a/server/licenses/lucene-memory-8.1.0.jar.sha1 b/server/licenses/lucene-memory-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-memory-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-memory-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+d723326c2d973928a07868ec97282dea2f3ae511
diff --git a/server/licenses/lucene-misc-8.1.0.jar.sha1 b/server/licenses/lucene-misc-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-misc-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-misc-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+5c5422ee3afeebbe6114ef989888e15a7fd7af0e
diff --git a/server/licenses/lucene-queries-8.1.0.jar.sha1 b/server/licenses/lucene-queries-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-queries-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-queries-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+5006b9e0ef1bc9c9857742c898ab79eb276891c5
diff --git a/server/licenses/lucene-queryparser-8.1.0.jar.sha1 b/server/licenses/lucene-queryparser-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-queryparser-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-queryparser-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+a2e1ef30071d5f5da5b2c515455c70919e131d43
diff --git a/server/licenses/lucene-sandbox-8.1.0.jar.sha1 b/server/licenses/lucene-sandbox-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-sandbox-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-sandbox-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+921849a9546d7582b530415ceb718896bde3f017
diff --git a/server/licenses/lucene-spatial-8.1.0.jar.sha1 b/server/licenses/lucene-spatial-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-spatial-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-spatial-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+81aecdc5655a43de5de16d27e7c9f79dd22e338a
diff --git a/server/licenses/lucene-spatial-extras-8.1.0.jar.sha1 b/server/licenses/lucene-spatial-extras-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-spatial-extras-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+268880a91f20eed94c5e48e53d50b7b9a32680d0
diff --git a/server/licenses/lucene-spatial3d-8.1.0.jar.sha1 b/server/licenses/lucene-spatial3d-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-spatial3d-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+72169e3d35627df0c6f713288a7a32d02fb13117
diff --git a/server/licenses/lucene-suggest-8.1.0.jar.sha1 b/server/licenses/lucene-suggest-8.1.0.jar.sha1
diff --git a/server/licenses/lucene-suggest-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-suggest-8.2.0-snapshot-860e0be5378.jar.sha1
@@ -0,0 +1 @@
+3b33ee4801404570028e8431ccb327e37a20ddfa
diff --git a/server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java
@@ -137,10 +137,10 @@ protected FieldHighlighter getFieldHighlighter(String field, Query query, Set<Te
         Set<HighlightFlag> highlightFlags = getFlags(field);
         PhraseHelper phraseHelper = getPhraseHelper(field, query, highlightFlags);
         CharacterRunAutomaton[] automata = getAutomata(field, query, highlightFlags);
-        OffsetSource offsetSource = getOptimizedOffsetSource(field, terms, phraseHelper, automata);
+        UHComponents components = new UHComponents(field, fieldMatcher, query, terms, phraseHelper, automata, false , highlightFlags);
+        OffsetSource offsetSource = getOptimizedOffsetSource(components);
         BreakIterator breakIterator = new SplittingBreakIterator(getBreakIterator(field),
             UnifiedHighlighter.MULTIVAL_SEP_CHAR);
-        UHComponents components = new UHComponents(field, fieldMatcher, query, terms, phraseHelper, automata, highlightFlags);
         FieldOffsetStrategy strategy = getOffsetStrategy(offsetSource, components);
         return new CustomFieldHighlighter(field, strategy, breakIteratorLocale, breakIterator,
             getScorer(field), maxPassages, (noMatchSize > 0 ? 1 : 0), getFormatter(field), noMatchSize, fieldValue);

diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
@@ -55,7 +55,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_7_2_1 = new Version(7020199, org.apache.lucene.util.Version.LUCENE_8_0_0);
     public static final Version V_7_3_0 = new Version(7030099, org.apache.lucene.util.Version.LUCENE_8_1_0);
     public static final Version V_7_4_0 = new Version(7040099, org.apache.lucene.util.Version.LUCENE_8_1_0);
-    public static final Version V_8_0_0 = new Version(8000099, org.apache.lucene.util.Version.LUCENE_8_1_0);
+    public static final Version V_8_0_0 = new Version(8000099, org.apache.lucene.util.Version.LUCENE_8_2_0);
     public static final Version CURRENT = V_8_0_0;
 
     private static final ImmutableOpenIntMap<Version> idToVersion;

diff --git a/server/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java b/server/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.common.geo;
 
-import org.apache.lucene.document.LatLonShape.QueryRelation;
+import org.apache.lucene.document.ShapeField.QueryRelation;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java
@@ -34,7 +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.queries.intervals.IntervalsSource;
 import org.apache.lucene.search.spans.SpanMultiTermQueryWrapper;
 import org.apache.lucene.search.spans.SpanQuery;
 import org.apache.lucene.util.BytesRef;

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java
@@ -44,8 +44,8 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.SynonymQuery;
 import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.intervals.Intervals;
-import org.apache.lucene.search.intervals.IntervalsSource;
+import org.apache.lucene.queries.intervals.Intervals;
+import org.apache.lucene.queries.intervals.IntervalsSource;
 import org.apache.lucene.search.spans.FieldMaskingSpanQuery;
 import org.apache.lucene.search.spans.SpanMultiTermQueryWrapper;
 import org.apache.lucene.search.spans.SpanNearQuery;
@@ -421,13 +421,13 @@ public Query prefixQuery(String value, MultiTermQuery.RewriteMethod method, Quer
 
         public IntervalsSource intervals(BytesRef term) {
             if (term.length > maxChars) {
-                return Intervals.prefix(term.utf8ToString());
+                return Intervals.prefix(term);
             }
             if (term.length >= minChars) {
                 return Intervals.fixField(name(), Intervals.term(term));
             }
             String wildcardTerm = term.utf8ToString() + "?".repeat(Math.max(0, minChars - term.length));
-            return Intervals.or(Intervals.fixField(name(), Intervals.wildcard(wildcardTerm)), Intervals.term(term));
+            return Intervals.or(Intervals.fixField(name(), Intervals.wildcard(new BytesRef(wildcardTerm))), Intervals.term(term));
         }
 
         @Override
@@ -671,7 +671,7 @@ public IntervalsSource intervals(String text, int maxGaps, boolean ordered,
                 if (prefixFieldType != null) {
                     return prefixFieldType.intervals(normalizedTerm);
                 }
-                return Intervals.prefix(normalizedTerm.utf8ToString()); // TODO make Intervals.prefix() take a BytesRef
+                return Intervals.prefix(normalizedTerm);
             }
             IntervalBuilder builder = new IntervalBuilder(name(), analyzer == null ? searchAnalyzer() : analyzer);
             return builder.analyzeText(text, maxGaps, ordered);

diff --git a/server/src/main/java/org/elasticsearch/index/query/IntervalBuilder.java b/server/src/main/java/org/elasticsearch/index/query/IntervalBuilder.java
@@ -29,9 +29,9 @@
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.MatchesIterator;
 import org.apache.lucene.search.QueryVisitor;
-import org.apache.lucene.search.intervals.IntervalIterator;
-import org.apache.lucene.search.intervals.Intervals;
-import org.apache.lucene.search.intervals.IntervalsSource;
+import org.apache.lucene.queries.intervals.IntervalIterator;
+import org.apache.lucene.queries.intervals.Intervals;
+import org.apache.lucene.queries.intervals.IntervalsSource;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.graph.GraphTokenStreamFiniteStrings;
 

diff --git a/server/src/main/java/org/elasticsearch/index/query/IntervalFilterScript.java b/server/src/main/java/org/elasticsearch/index/query/IntervalFilterScript.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.index.query;
 
-import org.apache.lucene.search.intervals.IntervalIterator;
+import org.apache.lucene.queries.intervals.IntervalIterator;
 import org.elasticsearch.script.ScriptContext;
 
 /**

diff --git a/server/src/main/java/org/elasticsearch/index/query/IntervalQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/IntervalQueryBuilder.java
@@ -21,7 +21,7 @@
 
 import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.search.intervals.IntervalQuery;
+import org.apache.lucene.queries.intervals.IntervalQuery;
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;

diff --git a/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java b/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java
@@ -20,10 +20,10 @@
 package org.elasticsearch.index.query;
 
 import org.apache.lucene.index.IndexOptions;
-import org.apache.lucene.search.intervals.FilteredIntervalsSource;
-import org.apache.lucene.search.intervals.IntervalIterator;
-import org.apache.lucene.search.intervals.Intervals;
-import org.apache.lucene.search.intervals.IntervalsSource;
+import org.apache.lucene.queries.intervals.FilteredIntervalsSource;
+import org.apache.lucene.queries.intervals.IntervalIterator;
+import org.apache.lucene.queries.intervals.Intervals;
+import org.apache.lucene.queries.intervals.IntervalsSource;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.Version;
 import org.elasticsearch.common.ParseField;
@@ -585,12 +585,12 @@ public IntervalsSource getSource(QueryShardContext context, MappedFieldType fiel
                 }
                 BytesRef normalizedTerm = analyzer.normalize(useField, pattern);
                 // TODO Intervals.wildcard() should take BytesRef
-                source = Intervals.fixField(useField, Intervals.wildcard(normalizedTerm.utf8ToString()));
+                source = Intervals.fixField(useField, Intervals.wildcard(normalizedTerm));
             }
             else {
                 checkPositions(fieldType);
                 BytesRef normalizedTerm = analyzer.normalize(fieldType.name(), pattern);
-                source = Intervals.wildcard(normalizedTerm.utf8ToString());
+                source = Intervals.wildcard(normalizedTerm);
             }
             return source;
         }

diff --git a/server/src/test/java/org/elasticsearch/index/query/IntervalBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/IntervalBuilderTests.java
@@ -23,8 +23,8 @@
 import org.apache.lucene.analysis.CannedTokenStream;
 import org.apache.lucene.analysis.Token;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.search.intervals.Intervals;
-import org.apache.lucene.search.intervals.IntervalsSource;
+import org.apache.lucene.queries.intervals.Intervals;
+import org.apache.lucene.queries.intervals.IntervalsSource;
 import org.elasticsearch.test.ESTestCase;
 
 import java.io.IOException;

diff --git a/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java
@@ -22,8 +22,9 @@
 import org.apache.lucene.search.BoostQuery;
 import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.search.intervals.IntervalQuery;
-import org.apache.lucene.search.intervals.Intervals;
+import org.apache.lucene.queries.intervals.IntervalQuery;
+import org.apache.lucene.queries.intervals.Intervals;
+import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.compress.CompressedXContent;
@@ -395,7 +396,7 @@ public void testPrefixes() throws IOException {
         String json = "{ \"intervals\" : { \"" + STRING_FIELD_NAME + "\": { " +
             "\"prefix\" : { \"prefix\" : \"term\" } } } }";
         IntervalQueryBuilder builder = (IntervalQueryBuilder) parseQuery(json);
-        Query expected = new IntervalQuery(STRING_FIELD_NAME, Intervals.prefix("term"));
+        Query expected = new IntervalQuery(STRING_FIELD_NAME, Intervals.prefix(new BytesRef("term")));
         assertEquals(expected, builder.toQuery(createShardContext()));
 
         String no_positions_json = "{ \"intervals\" : { \"" + NO_POSITIONS_FIELD + "\": { " +
@@ -422,7 +423,7 @@ public void testPrefixes() throws IOException {
             "\"prefix\" : { \"prefix\" : \"t\" } } } }";
         builder = (IntervalQueryBuilder) parseQuery(short_prefix_json);
         expected = new IntervalQuery(PREFIXED_FIELD, Intervals.or(
-            Intervals.fixField(PREFIXED_FIELD + "._index_prefix", Intervals.wildcard("t?")),
+            Intervals.fixField(PREFIXED_FIELD + "._index_prefix", Intervals.wildcard(new BytesRef("t?"))),
             Intervals.term("t")));
         assertEquals(expected, builder.toQuery(createShardContext()));
 
@@ -454,7 +455,7 @@ public void testWildcard() throws IOException {
             "\"wildcard\" : { \"pattern\" : \"Te?m\" } } } }";
 
         IntervalQueryBuilder builder = (IntervalQueryBuilder) parseQuery(json);
-        Query expected = new IntervalQuery(STRING_FIELD_NAME, Intervals.wildcard("te?m"));
+        Query expected = new IntervalQuery(STRING_FIELD_NAME, Intervals.wildcard(new BytesRef("te?m")));
         assertEquals(expected, builder.toQuery(createShardContext()));
 
         String no_positions_json = "{ \"intervals\" : { \"" + NO_POSITIONS_FIELD + "\": { " +
@@ -468,14 +469,14 @@ public void testWildcard() throws IOException {
             "\"wildcard\" : { \"pattern\" : \"Te?m\", \"analyzer\" : \"keyword\" } } } }";
 
         builder = (IntervalQueryBuilder) parseQuery(keyword_json);
-        expected = new IntervalQuery(STRING_FIELD_NAME, Intervals.wildcard("Te?m"));
+        expected = new IntervalQuery(STRING_FIELD_NAME, Intervals.wildcard(new BytesRef("Te?m")));
         assertEquals(expected, builder.toQuery(createShardContext()));
 
         String fixed_field_json = "{ \"intervals\" : { \"" + STRING_FIELD_NAME + "\": { " +
             "\"wildcard\" : { \"pattern\" : \"Te?m\", \"use_field\" : \"masked_field\" } } } }";
 
         builder = (IntervalQueryBuilder) parseQuery(fixed_field_json);
-        expected = new IntervalQuery(STRING_FIELD_NAME, Intervals.fixField(MASKED_FIELD, Intervals.wildcard("te?m")));
+        expected = new IntervalQuery(STRING_FIELD_NAME, Intervals.fixField(MASKED_FIELD, Intervals.wildcard(new BytesRef("te?m"))));
         assertEquals(expected, builder.toQuery(createShardContext()));
 
         String fixed_field_json_no_positions = "{ \"intervals\" : { \"" + STRING_FIELD_NAME + "\": { " +
@@ -489,7 +490,8 @@ public void testWildcard() throws IOException {
             "\"wildcard\" : { \"pattern\" : \"Te?m\", \"use_field\" : \"masked_field\", \"analyzer\" : \"keyword\" } } } }";
 
         builder = (IntervalQueryBuilder) parseQuery(fixed_field_analyzer_json);
-        expected = new IntervalQuery(STRING_FIELD_NAME, Intervals.fixField(MASKED_FIELD, Intervals.wildcard("Te?m")));
+        expected = new IntervalQuery(STRING_FIELD_NAME, Intervals.fixField(MASKED_FIELD,
+            Intervals.wildcard(new BytesRef("Te?m"))));
         assertEquals(expected, builder.toQuery(createShardContext()));
     }