elastic · dnhatn · Feb 29, 2020 · Feb 29, 2020
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 7.7.0
-lucene            = 8.5.0-snapshot-b01d7cb
+lucene            = 8.5.0-snapshot-c4475920b08
 
 bundled_jdk_vendor = adoptopenjdk
 bundled_jdk = 13.0.2+8

diff --git a/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-b01d7cb.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-c4475920b08.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+48cb44f1dc8d3368d70581ffdbeab98ac5f5167f
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-c4475920b08.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+0748be5811dfe6725847d2e87890a990c58cc3de
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/.../analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-c4475920b08.jar.sha1 b/.../analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+f693cd60ad8ca9b7d3082f7b9ee6054b9c819b48
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-c4475920b08.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+72c34e18af81ee1d18e9927fb95690fe056cbd4f
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/.../analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-c4475920b08.jar.sha1 b/.../analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+655438348dcad9a98b5affa76caa3d67aa4bee51
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/...ns/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-c4475920b08.jar.sha1 b/...ns/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+b99147dad649fce0b0423e41f90c79e0f2fba2b7
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/...ns/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-c4475920b08.jar.sha1 b/...ns/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+00ce3e23cf7aba8c1b3e777de92fd31ec1d4d814
diff --git a/...s/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-b01d7cb.jar.sha1 b/...s/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/...alysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-c4475920b08.jar.sha1 b/...alysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+2b03f79d61517d8e6a8744dbd89e61ad661f6a62
diff --git a/server/licenses/lucene-analyzers-common-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-analyzers-common-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-analyzers-common-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-analyzers-common-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+1963afb27f340df8fc304d377971424832f4ce1a
diff --git a/server/licenses/lucene-backward-codecs-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-backward-codecs-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-backward-codecs-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+fdff4122e8b8a2dbbc9de24be6963e7d7e33b794
diff --git a/server/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-core-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-core-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+ca406661129d35008411365d2b6e747dc39378af
diff --git a/server/licenses/lucene-grouping-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-grouping-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-grouping-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-grouping-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+db053d5861406393254c28f6e46767879b504bb3
diff --git a/server/licenses/lucene-highlighter-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-highlighter-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-highlighter-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-highlighter-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+f5520ee7145f5d1ef02c7dc87483255d81b5bc6c
diff --git a/server/licenses/lucene-join-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-join-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-join-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-join-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+2d81c0a3473cc865e7c4858890b7fbfb869bfbf8
diff --git a/server/licenses/lucene-memory-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-memory-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-memory-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-memory-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+6d009afeb485307dce111afb8bb157ebbbb0f212
diff --git a/server/licenses/lucene-misc-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-misc-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-misc-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-misc-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+3a62908ec9eb6e826a56e697322c4c6b6c9a8573
diff --git a/server/licenses/lucene-queries-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-queries-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-queries-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-queries-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+d71d54ed6e0cf482ce16cf4f419441d83f646827
diff --git a/server/licenses/lucene-queryparser-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-queryparser-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-queryparser-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-queryparser-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+181915a7d21b73dff16591b20cdee22648e4181f
diff --git a/server/licenses/lucene-sandbox-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-sandbox-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-sandbox-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-sandbox-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+d3d0bb76d9f4a5368d286a934615dbca7703b3d8
diff --git a/server/licenses/lucene-spatial-extras-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-spatial-extras-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-spatial-extras-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+95b9fd35e91a34c090ecf301d4dc29cabd198e6f
diff --git a/server/licenses/lucene-spatial3d-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-spatial3d-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-spatial3d-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+1c8da46c3a172830372dfc23e18e9151bb14562c
diff --git a/server/licenses/lucene-suggest-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-suggest-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/server/licenses/lucene-suggest-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-suggest-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+b3ad5d3476ed85a529892962d057518555ccfcc9
diff --git a/server/src/main/java/org/elasticsearch/index/search/MatchQuery.java b/server/src/main/java/org/elasticsearch/index/search/MatchQuery.java
@@ -33,6 +33,7 @@
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.BoostAttribute;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.MultiTermQuery;
 import org.apache.lucene.search.Query;
@@ -60,6 +61,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -274,7 +276,7 @@ public Query parse(Type type, String fieldName, Object value) throws IOException
                     && (fieldType instanceof TextFieldMapper.TextFieldType || fieldType instanceof KeywordFieldMapper.KeywordFieldType)) {
                 return builder.newPrefixQuery(term);
             } else {
-                return builder.newTermQuery(term);
+                return builder.newTermQuery(term, BoostAttribute.DEFAULT_BOOST);
             }
         }
 
@@ -562,7 +564,7 @@ private SpanQuery createSpanQuery(TokenStream in, String field, boolean isPrefix
         }
 
         @Override
-        protected Query newTermQuery(Term term) {
+        protected Query newTermQuery(Term term, float boost) {
             Supplier<Query> querySupplier;
             if (fuzziness != null) {
                 querySupplier = () -> {
@@ -613,7 +615,8 @@ private Query analyzeTerm(String field, TokenStream stream, boolean isPrefix) th
             final Term term = new Term(field, termAtt.getBytesRef());
             int lastOffset = offsetAtt.endOffset();
             stream.end();
-            return isPrefix && lastOffset == offsetAtt.endOffset() ? newPrefixQuery(term) : newTermQuery(term);
+            return isPrefix && lastOffset == offsetAtt.endOffset() ?
+                newPrefixQuery(term) : newTermQuery(term, BoostAttribute.DEFAULT_BOOST);
         }
 
         private void add(BooleanQuery.Builder q, String field, List<Term> current, BooleanClause.Occur operator, boolean isPrefix) {
@@ -624,11 +627,14 @@ private void add(BooleanQuery.Builder q, String field, List<Term> current, Boole
                 if (isPrefix) {
                     q.add(newPrefixQuery(current.get(0)), operator);
                 } else {
-                    q.add(newTermQuery(current.get(0)), operator);
+                    q.add(newTermQuery(current.get(0), BoostAttribute.DEFAULT_BOOST), operator);
                 }
             } else {
                 // We don't apply prefix on synonyms
-                q.add(newSynonymQuery(current.toArray(new Term[current.size()])), operator);
+                final TermAndBoost[] termAndBoosts = current.stream()
+                    .map(t -> new TermAndBoost(t, BoostAttribute.DEFAULT_BOOST))
+                    .toArray(TermAndBoost[]::new);
+                q.add(newSynonymQuery(termAndBoosts), operator);
             }
         }
 
@@ -739,10 +745,13 @@ public Query next() {
                     Term[] terms = graph.getTerms(field, start);
                     assert terms.length > 0;
                     if (terms.length == 1) {
-                        queryPos = usePrefix ? newPrefixQuery(terms[0]) : newTermQuery(terms[0]);
+                        queryPos = usePrefix ? newPrefixQuery(terms[0]) : newTermQuery(terms[0], BoostAttribute.DEFAULT_BOOST);
                     } else {
                         // We don't apply prefix on synonyms
-                        queryPos = newSynonymQuery(terms);
+                        final TermAndBoost[] termAndBoosts = Arrays.stream(terms)
+                            .map(t -> new TermAndBoost(t, BoostAttribute.DEFAULT_BOOST))
+                            .toArray(TermAndBoost[]::new);
+                        queryPos = newSynonymQuery(termAndBoosts);
                     }
                 }
                 if (queryPos != null) {

diff --git a/server/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java b/server/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
@@ -180,16 +180,16 @@ private class BlendedQueryBuilder extends MatchQueryBuilder {
         }
 
         @Override
-        protected Query newSynonymQuery(Term[] terms) {
+        protected Query newSynonymQuery(TermAndBoost[] terms) {
             BytesRef[] values = new BytesRef[terms.length];
             for (int i = 0; i < terms.length; i++) {
-                values[i] = terms[i].bytes();
+                values[i] = terms[i].term.bytes();
             }
             return blendTerms(context, values, commonTermsCutoff, tieBreaker, lenient, blendedFields);
         }
 
         @Override
-        protected Query newTermQuery(Term term) {
+        protected Query newTermQuery(Term term, float boost) {
             return blendTerm(context, term.bytes(), commonTermsCutoff, tieBreaker, lenient, blendedFields);
         }
 

diff --git a/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java b/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java
@@ -28,6 +28,7 @@
 import org.apache.lucene.queryparser.classic.Token;
 import org.apache.lucene.queryparser.classic.XQueryParser;
 import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BoostAttribute;
 import org.apache.lucene.search.BoostQuery;
 import org.apache.lucene.search.DisjunctionMaxQuery;
 import org.apache.lucene.search.FuzzyQuery;
@@ -588,7 +589,7 @@ private Query getPossiblyAnalyzedPrefixQuery(String field, String termStr) throw
                 if (isLastPos) {
                     posQuery = currentFieldType.prefixQuery(plist.get(0), getMultiTermRewriteMethod(), context);
                 } else {
-                    posQuery = newTermQuery(new Term(field, plist.get(0)));
+                    posQuery = newTermQuery(new Term(field, plist.get(0)), BoostAttribute.DEFAULT_BOOST);
                 }
             } else if (isLastPos == false) {
                 // build a synonym query for terms in the same position.

diff --git a/server/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java b/server/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java
@@ -26,6 +26,7 @@
 import org.apache.lucene.queryparser.simple.SimpleQueryParser;
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.BoostAttribute;
 import org.apache.lucene.search.BoostQuery;
 import org.apache.lucene.search.DisjunctionMaxQuery;
 import org.apache.lucene.search.MatchNoDocsQuery;
@@ -104,7 +105,7 @@ public void setDefaultOperator(BooleanClause.Occur operator) {
     }
 
     @Override
-    protected Query newTermQuery(Term term) {
+    protected Query newTermQuery(Term term, float boost) {
         MappedFieldType ft = context.fieldMapper(term.field());
         if (ft == null) {
             return newUnmappedFieldQuery(term.field());
@@ -259,7 +260,7 @@ private Query newPossiblyAnalyzedQuery(String field, String termStr, Analyzer an
                 if (isLastPos) {
                     posQuery = new PrefixQuery(new Term(field, plist.get(0)));
                 } else {
-                    posQuery = newTermQuery(new Term(field, plist.get(0)));
+                    posQuery = newTermQuery(new Term(field, plist.get(0)), BoostAttribute.DEFAULT_BOOST);
                 }
             } else if (isLastPos == false) {
                 // build a synonym query for terms in the same position.

diff --git a/test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java b/test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java
@@ -194,7 +194,7 @@ public abstract class AnalysisFactoryTestCase extends ESTestCase {
         .put("concatenategraph", Void.class)
         // LUCENE-8936
         .put("spanishminimalstem", Void.class)
-
+        .put("delimitedboost", Void.class)
         .immutableMap();
 
     static final Map<String,Class<?>> KNOWN_CHARFILTERS = new MapBuilder<String,Class<?>>()

diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-c4475920b08.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-c4475920b08.jar.sha1
@@ -0,0 +1 @@
+ca406661129d35008411365d2b6e747dc39378af