Upgrade to new lucene snapshot 9.7.0-snapshot-41cd1f7a88c (#96741)

Notable changes: * more efficient backwards reads in NIOFSDirectory * faster merging when using soft deletes * workaround security manager when using vector API
elastic · Jun 12, 2023 · d927d1a · d927d1a
1 parent 5a623ee
commit d927d1a
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 74 deletions.
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.9.0
-lucene            = 9.7.0-snapshot-24df30cca69
+lucene            = 9.7.0-snapshot-41cd1f7a88c
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 20.0.1+9@b4887098932d415489976708ad6d1a4b

diff --git a/docs/changelog/96741.yaml b/docs/changelog/96741.yaml
@@ -0,0 +1,5 @@
+pr: 96741
+summary: Upgrade to new lucene snapshot 9.7.0-snapshot-a8602d6ef88
+area: Search
+type: upgrade
+issues: []
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
diff --git a/...is-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisFactoryTests.java b/...is-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisFactoryTests.java
@@ -137,6 +137,7 @@ protected Map<String, Class<?>> getTokenFilters() {
         filters.put("germanstem", GermanStemTokenFilterFactory.class);
         // this filter is not exposed and should only be used internally
         filters.put("fixedshingle", Void.class);
+        filters.put("word2vecsynonym", Void.class); // not exposed
         return filters;
     }
 

diff --git a/server/src/main/java/org/elasticsearch/index/query/CombinedFieldsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/CombinedFieldsQueryBuilder.java
@@ -21,6 +21,7 @@
 import org.apache.lucene.search.similarities.Similarity;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.QueryBuilder;
+import org.apache.lucene.util.TermAndBoost;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;

diff --git a/server/src/main/java/org/elasticsearch/index/search/MatchQueryParser.java b/server/src/main/java/org/elasticsearch/index/search/MatchQueryParser.java
@@ -28,6 +28,7 @@
 import org.apache.lucene.search.MultiTermQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.QueryBuilder;
+import org.apache.lucene.util.TermAndBoost;
 import org.apache.lucene.util.graph.GraphTokenStreamFiniteStrings;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.io.stream.StreamInput;

diff --git a/server/src/main/java/org/elasticsearch/index/search/MultiMatchQueryParser.java b/server/src/main/java/org/elasticsearch/index/search/MultiMatchQueryParser.java
@@ -18,6 +18,7 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.TermAndBoost;
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.query.AbstractQueryBuilder;

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
@@ -195,7 +195,9 @@ public abstract class AnalysisFactoryTestCase extends ESTestCase {
         entry("spanishpluralstem", Void.class),
         // LUCENE-10352
         entry("daitchmokotoffsoundex", Void.class),
-        entry("persianstem", Void.class)
+        entry("persianstem", Void.class),
+        // not exposed
+        entry("word2vecsynonym", Void.class)
     );
 
     static final Map<String, Class<?>> KNOWN_CHARFILTERS = Map.of(