lucene 9.7.0

oracle · Jul 18, 2023 · ab58547 · ab58547
1 parent a47e52c
commit ab58547
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/web/SearchHelper.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/web/SearchHelper.java
@@ -542,7 +542,7 @@ private void maybeRedirectToMatchOffset(int docID, List<String> contextFields)
         int subIndex = ReaderUtil.subIndex(docID, leaves);
         LeafReaderContext leaf = leaves.get(subIndex);
 
-        Query rewritten = query.rewrite(reader);
+        Query rewritten = query.rewrite(searcher);
         Weight weight = rewritten.createWeight(searcher, ScoreMode.COMPLETE_NO_SCORES, 1);
         Matches matches = weight.matches(leaf, docID - leaf.docBase); // Adjust docID
         if (matches != null && matches != MatchesUtils.MATCH_WITH_NO_TERMS) {

diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
     </scm>
 
     <properties>
-        <lucene.version>9.6.0</lucene.version>
+        <lucene.version>9.7.0</lucene.version>
         <mavenjavadocplugin.version>3.2.0</mavenjavadocplugin.version>
         <!-- The following changed syntax from e.g. 1.8 to 11. -->
         <compileSource>11</compileSource>

diff --git a/suggester/src/main/java/org/opengrok/suggest/SuggesterSearcher.java b/suggester/src/main/java/org/opengrok/suggest/SuggesterSearcher.java
@@ -73,12 +73,15 @@ class SuggesterSearcher extends IndexSearcher {
 
     private final int numDocs;
 
+    private final IndexSearcher is;
+
     /**
      * @param reader reader of the index for which to provide suggestions
      * @param resultSize size of the results
      */
     SuggesterSearcher(final IndexReader reader, final int resultSize) {
         super(reader);
+        is = new IndexSearcher(reader);
         numDocs = reader.numDocs();
         this.resultSize = resultSize;
     }
@@ -105,7 +108,7 @@ public List<LookupResultItem> suggest(
 
         try {
             if (query != null) {
-                rewrittenQuery = query.rewrite(getIndexReader());
+                rewrittenQuery = query.rewrite(is);
             }
         } catch (IOException e) {
             logger.log(Level.WARNING, "Could not rewrite query", e);

diff --git a/suggester/src/main/java/org/opengrok/suggest/query/SuggesterPhraseQuery.java b/suggester/src/main/java/org/opengrok/suggest/query/SuggesterPhraseQuery.java
@@ -23,8 +23,8 @@
  */
 package org.opengrok.suggest.query;
 
-import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
+import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.QueryVisitor;
 import org.opengrok.suggest.query.customized.CustomPhraseQuery;
@@ -143,8 +143,8 @@ public String toString(final String field) {
     }
 
     @Override
-    public Query rewrite(final IndexReader reader) {
-        return phraseQuery.rewrite(reader);
+    public Query rewrite(IndexSearcher indexSearcher) {
+        return phraseQuery.rewrite(indexSearcher);
     }
 
     @Override

diff --git a/suggester/src/main/java/org/opengrok/suggest/query/customized/CustomPhraseQuery.java b/suggester/src/main/java/org/opengrok/suggest/query/customized/CustomPhraseQuery.java
@@ -16,7 +16,6 @@
  */
 package org.opengrok.suggest.query.customized;
 
-import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReaderContext;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.LeafReaderContext;
@@ -232,7 +231,7 @@ public String toString(String f) {
     }
 
     @Override
-    public Query rewrite(IndexReader reader) {
+    public Query rewrite(IndexSearcher indexSearcher) {
         if (terms.length == 0) {
             return new MatchAllDocsQuery();
         }