lucene 10.4.0

tarzanek · tarzanek · commit 54687c270837 · 2026-03-19T11:14:55.000+01:00
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexAnalysisSettingsAccessor.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexAnalysisSettingsAccessor.java
@@ -89,7 +89,7 @@ public IndexAnalysisSettings3[] read(IndexReader reader, int n) throws IOExcepti
         }
         TopDocs top = searcher.search(q, n);
 
-        int nres = top.totalHits.value > n ? n : (int) top.totalHits.value;
+        int nres = top.totalHits.value() > n ? n : (int) top.totalHits.value();
         IndexAnalysisSettings3[] res = new IndexAnalysisSettings3[nres];
 
         IndexAnalysisSettingsUpgrader upgrader = new IndexAnalysisSettingsUpgrader();
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java
@@ -2088,10 +2088,10 @@ public static Document getDocument(File file) throws ParseException, IOException
             Statistics stat = new Statistics();
             TopDocs top = searcher.search(q, 1);
             stat.report(LOGGER, Level.FINEST,
-                    String.format("search via getDocument(%s) done (%d hits)", file, top.totalHits.value),
+                    String.format("search via getDocument(%s) done (%d hits)", file, top.totalHits.value()),
                     "search.latency", new String[]{"category", "getdocument",
-                            "outcome", top.totalHits.value == 0 ? "empty" : "success"});
-            if (top.totalHits.value == 0) {
+                            "outcome", top.totalHits.value() == 0 ? "empty" : "success"});
+            if (top.totalHits.value() == 0) {
                 // No hits, no document...
                 return null;
             }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/NumLinesLOCAccessor.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/NumLinesLOCAccessor.java
@@ -65,7 +65,7 @@ class NumLinesLOCAccessor {
      */
     public boolean hasStored(IndexReader reader) throws IOException {
         DSearchResult searchResult = newDSearch(reader, 1);
-        return searchResult.hits.totalHits.value > 0;
+        return searchResult.hits.totalHits.value() > 0;
     }
 
     /**
@@ -121,8 +121,8 @@ private void storeBulk(IndexWriter writer, IndexReader reader,
 
         // Index the existing document IDs by QueryBuilder.D.
         HashMap<String, Integer> byDir = new HashMap<>();
-        int intMaximum = Integer.MAX_VALUE < searchResult.hits.totalHits.value ?
-                Integer.MAX_VALUE : (int) searchResult.hits.totalHits.value;
+        int intMaximum = Integer.MAX_VALUE < searchResult.hits.totalHits.value() ?
+                Integer.MAX_VALUE : (int) searchResult.hits.totalHits.value();
         StoredFields storedFields = searchResult.searcher.storedFields();
         for (int i = 0; i < intMaximum; ++i) {
             int docID = searchResult.hits.scoreDocs[i].doc;
@@ -148,7 +148,7 @@ private void storeIterative(IndexWriter writer, IndexReader reader,
             TopDocs hits = searcher.search(query, 1);
 
             Integer docID = null;
-            if (hits.totalHits.value > 0) {
+            if (hits.totalHits.value() > 0) {
                 docID = hits.scoreDocs[0].doc;
             }
             updateDocumentData(writer, searcher, entry, docID, isAggregatingDeltas);
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/QueryBuilder.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/QueryBuilder.java
@@ -502,7 +502,7 @@ protected Query buildQuery(String field, String queryText)
      */
     private boolean hasClause(BooleanQuery query, Occur occur) {
         for (BooleanClause clause : query) {
-            if (clause.getOccur().equals(occur)) {
+            if (clause.occur().equals(occur)) {
                 return true;
             }
         }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/SearchEngine.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/SearchEngine.java
@@ -232,7 +232,7 @@ private void searchIndex(IndexSearcher searcher, boolean paging) throws IOExcept
             topDocs = searcher.search(query, new TopFieldCollectorManager(luceneSort, numHits, Short.MAX_VALUE));
         }
         hits = topDocs.scoreDocs;
-        totalHits = (int) topDocs.totalHits.value;
+        totalHits = (int) topDocs.totalHits.value();
 
         Statistics stat = new Statistics();
         stat.report(LOGGER, Level.FINEST, "search via SearchEngine done",
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/Summarizer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/Summarizer.java
@@ -330,7 +330,7 @@ private void getTerms(Query query) {
     private void getBooleans(BooleanQuery query) {
         for (BooleanClause clause : query) {
             if (!clause.isProhibited()) {
-                getTerms(clause.getQuery());
+                getTerms(clause.query());
             }
         }
     }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/OGKUnifiedHighlighter.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/OGKUnifiedHighlighter.java
@@ -247,7 +247,7 @@ protected List<CharSequence[]> loadFieldValues(String[] fields,
     protected OffsetSource getOptimizedOffsetSource(UHComponents components) {
 
         OffsetSource res = super.getOptimizedOffsetSource(components);
-        String field = components.getField();
+        String field = components.field();
         if (res == OffsetSource.ANALYSIS) {
             /*
                   Testing showed that UnifiedHighlighter falls back to
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/QueryMatchers.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/QueryMatchers.java
@@ -105,7 +105,7 @@ private void getRegexp(RegexpQuery query) {
     private void getBooleans(BooleanQuery query) {
         for (BooleanClause clause : query) {
             if (!clause.isProhibited()) {
-                getTerms(clause.getQuery());
+                getTerms(clause.query());
             }
         }
     }
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
@@ -476,7 +476,7 @@ public SearchHelper executeQuery() {
         }
         try {
             TopFieldDocs fdocs = searcher.search(query, start + maxItems, sort);
-            totalHits = fdocs.totalHits.value;
+            totalHits = fdocs.totalHits.value();
             hits = fdocs.scoreDocs;
 
             /*
@@ -743,7 +743,7 @@ public int searchSingle(File file) throws IOException,
         query = singleBuilder.setPath(path).build();
 
         TopDocs top = searcher.search(query, 1);
-        if (top.totalHits.value == 0) {
+        if (top.totalHits.value() == 0) {
             return -1;
         }
 
diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexDatabaseTestHistBasedIterationTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexDatabaseTestHistBasedIterationTest.java
@@ -31,6 +31,7 @@
 import org.apache.lucene.index.TermsEnum;
 import org.apache.lucene.util.AttributeSource;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.IOBooleanSupplier;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -109,6 +110,11 @@ public boolean seekExact(BytesRef bytesRef) throws IOException {
             return false;
         }
 
+        @Override
+        public IOBooleanSupplier prepareSeekExact(BytesRef bytesRef) throws IOException {
+            return null;
+        }
+
         @Override
         public SeekStatus seekCeil(BytesRef bytesRef) throws IOException {
             return null;
diff --git a/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/query/SuggesterQueryParser.java b/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/query/SuggesterQueryParser.java
@@ -134,18 +134,18 @@ protected Query getBooleanQuery(final List<BooleanClause> clauses) throws ParseE
             return super.getBooleanQuery(clauses);
         }
         var reducedList = clauses.stream()
-                .filter(booleanClause -> BooleanClause.Occur.SHOULD != booleanClause.getOccur())
+                .filter(booleanClause -> BooleanClause.Occur.SHOULD != booleanClause.occur())
                 .collect(Collectors.toList());
         inSuggesterClausesList.stream()
-                .filter(booleanClause -> BooleanClause.Occur.SHOULD == booleanClause.getOccur())
+                .filter(booleanClause -> BooleanClause.Occur.SHOULD == booleanClause.occur())
                 .forEach(reducedList::add);
         return super.getBooleanQuery(reducedList);
     }
 
     private boolean isInSuggesterClauses(BooleanClause clause) {
         return suggesterClauses.stream()
                 .anyMatch(itemClause ->
-                        clause.getQuery().equals(itemClause.getQuery())
+                        clause.query().equals(itemClause.query())
                 );
     }
 
@@ -157,7 +157,7 @@ protected BooleanClause newBooleanClause(final Query q, final BooleanClause.Occu
             bc = super.newBooleanClause(((SuggesterPhraseQuery) q).getPhraseQuery(), BooleanClause.Occur.MUST);
             suggesterClauses.add(bc);
         } else if (q instanceof SuggesterQuery) {
-            bc = super.newBooleanClause(new MatchAllDocsQuery(), BooleanClause.Occur.MUST);
+            bc = super.newBooleanClause(MatchAllDocsQuery.INSTANCE, BooleanClause.Occur.MUST);
             suggesterClauses.add(bc);
         } else if (q instanceof BooleanQuery) {
             bc = super.newBooleanClause(q, occur);
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <cfraire@me.com>.
     </scm>
 
     <properties>
-        <lucene.version>9.12.3</lucene.version>
+        <lucene.version>10.4.0</lucene.version>
         <mavenjavadocplugin.version>3.6.0</mavenjavadocplugin.version>
         <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/suggester/src/main/java/org/opengrok/suggest/SuggestResultCollector.java b/suggester/src/main/java/org/opengrok/suggest/SuggestResultCollector.java
@@ -121,8 +121,8 @@ public void setScorer(Scorable scorer) throws IOException {
                         // it is mentioned in the documentation that #getChildren should not be called
                         // in #setScorer but no better way was found
                         for (var childScorer : scorer.getChildren()) {
-                            if (childScorer.child instanceof PhraseScorer) {
-                                data.scorer = (PhraseScorer) childScorer.child;
+                            if (childScorer.child() instanceof PhraseScorer) {
+                                data.scorer = (PhraseScorer) childScorer.child();
                             }
                         }
                     } catch (Exception e) {
diff --git a/suggester/src/main/java/org/opengrok/suggest/SuggesterSearcher.java b/suggester/src/main/java/org/opengrok/suggest/SuggesterSearcher.java
@@ -299,7 +299,7 @@ private boolean needPositionsAndFrequencies(final Query query) {
 
         if (query instanceof BooleanQuery) {
             for (BooleanClause bc : ((BooleanQuery) query).clauses()) {
-                if (needPositionsAndFrequencies(bc.getQuery())) {
+                if (needPositionsAndFrequencies(bc.query())) {
                     return true;
                 }
             }
diff --git a/suggester/src/main/java/org/opengrok/suggest/SuggesterUtils.java b/suggester/src/main/java/org/opengrok/suggest/SuggesterUtils.java
@@ -130,7 +130,7 @@ public static List<Term> intoTerms(final Query query) {
 
             if (q instanceof BooleanQuery) {
                 for (BooleanClause bc : ((BooleanQuery) q).clauses()) {
-                    queue.add(bc.getQuery());
+                    queue.add(bc.query());
                 }
             } else if (q instanceof TermQuery) {
                 terms.add(((TermQuery) q).getTerm());
@@ -164,7 +164,7 @@ public static List<Term> intoTermsExceptPhraseQuery(final Query query) {
 
             if (q instanceof BooleanQuery) {
                 for (BooleanClause bc : ((BooleanQuery) q).clauses()) {
-                    queue.add(bc.getQuery());
+                    queue.add(bc.query());
                 }
             } else if (q instanceof TermQuery) {
                 terms.add(((TermQuery) q).getTerm());
diff --git a/suggester/src/main/java/org/opengrok/suggest/query/customized/CustomExactPhraseScorer.java b/suggester/src/main/java/org/opengrok/suggest/query/customized/CustomExactPhraseScorer.java
@@ -29,7 +29,6 @@
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.TwoPhaseIterator;
-import org.apache.lucene.search.Weight;
 import org.jetbrains.annotations.NotNull;
 import org.opengrok.suggest.query.PhraseScorer;
 import org.opengrok.suggest.query.data.BitIntsHolder;
@@ -71,11 +70,10 @@ private static class PostingsAndPosition {
      * @param offset the offset that is added to the found match position
      */
     CustomExactPhraseScorer(
-            final Weight weight,
             final CustomPhraseQuery.PostingsAndFreq[] postings,
             final int offset
     ) {
-        super(weight);
+        super();
 
         this.offset = offset; // custom
 
@@ -128,7 +126,7 @@ public DocIdSetIterator iterator() {
 
     @Override
     public String toString() {
-        return "CustomExactPhraseScorer(" + weight + ")"; // custom – renamed class
+        return "CustomExactPhraseScorer(" + this.offset + ")"; // custom – renamed class
     }
 
     @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
@@ -31,7 +31,7 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.QueryVisitor;
 import org.apache.lucene.search.ScoreMode;
-import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.ScorerSupplier;
 import org.apache.lucene.search.Weight;
 import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.BytesRef;
@@ -224,7 +224,7 @@ public String toString(String f) {
     @Override
     public Query rewrite(IndexSearcher indexSearcher) {
         if (terms.length == 0) {
-            return new MatchAllDocsQuery();
+            return MatchAllDocsQuery.INSTANCE;
         }
 
         return this;
@@ -263,8 +263,8 @@ public Explanation explain(LeafReaderContext leafReaderContext, int i) {
         }
 
         @Override
-        public Scorer scorer(LeafReaderContext context) throws IOException {
-            LeafReader reader = context.reader();
+        public ScorerSupplier scorerSupplier(LeafReaderContext leafReaderContext) throws IOException {
+            LeafReader reader = leafReaderContext.reader();
 
             CustomPhraseQuery.PostingsAndFreq[] postingsFreqs = new CustomPhraseQuery.PostingsAndFreq[query.terms.length];
 
@@ -281,7 +281,7 @@ public Scorer scorer(LeafReaderContext context) throws IOException {
 
                 for(int i = 0; i < query.terms.length; ++i) {
                     Term t = query.terms[i];
-                    TermState state = this.states[i].get(context);
+                    TermState state = this.states[i].get(leafReaderContext).get();
                     if (state == null) {
                         return null;
                     }
@@ -294,9 +294,13 @@ public Scorer scorer(LeafReaderContext context) throws IOException {
                 if (query.slop == 0) {
                     ArrayUtil.timSort(postingsFreqs);
 
-                    return new CustomExactPhraseScorer(this, postingsFreqs, query.offset);
+                    //FIXME
+                    //return new CustomExactPhraseScorer(postingsFreqs, query.offset);
+                    return scorerSupplier(leafReaderContext);
                 } else {
-                    return new CustomSloppyPhraseScorer(this, postingsFreqs, query.slop, query.offset);
+                    //FIXME
+                    //return new CustomSloppyPhraseScorer(postingsFreqs, query.slop, query.offset);
+                    return scorerSupplier(leafReaderContext);
                 }
             }
         }
diff --git a/suggester/src/main/java/org/opengrok/suggest/query/customized/CustomSloppyPhraseScorer.java b/suggester/src/main/java/org/opengrok/suggest/query/customized/CustomSloppyPhraseScorer.java
@@ -33,7 +33,6 @@
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.TwoPhaseIterator;
-import org.apache.lucene.search.Weight;
 import org.apache.lucene.util.FixedBitSet;
 import org.jetbrains.annotations.NotNull;
 import org.opengrok.suggest.query.PhraseScorer;
@@ -78,12 +77,11 @@ final class CustomSloppyPhraseScorer extends Scorer implements PhraseScorer { //
      * @param offset the offset that is added to the found match position
      */
     CustomSloppyPhraseScorer(
-            final Weight weight,
             final CustomPhraseQuery.PostingsAndFreq[] postings,
             final int slop,
             final int offset
     ) {
-        super(weight);
+        super();
         this.slop = slop;
         this.offset = offset; // custom
         this.numPostings = postings.length;
@@ -628,7 +626,7 @@ public float score() {
 
     @Override
     public String toString() {
-        return "CustomSloppyPhraseScorer(" + weight + ")"; // custom – renamed class
+        return "CustomSloppyPhraseScorer(" + this.numPostings + ")"; // custom – renamed class
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public IndexAnalysisSettings3[] read(IndexReader reader, int n) throws IOExcepti`
`89`	`89`	`}`
`90`	`90`	`TopDocs top = searcher.search(q, n);`
`91`	`91`
`92`		`- int nres = top.totalHits.value > n ? n : (int) top.totalHits.value;`
	`92`	`+ int nres = top.totalHits.value() > n ? n : (int) top.totalHits.value();`
`93`	`93`	`IndexAnalysisSettings3[] res = new IndexAnalysisSettings3[nres];`
`94`	`94`
`95`	`95`	`IndexAnalysisSettingsUpgrader upgrader = new IndexAnalysisSettingsUpgrader();`
Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ protected Query buildQuery(String field, String queryText)`
`502`	`502`	`*/`
`503`	`503`	`private boolean hasClause(BooleanQuery query, Occur occur) {`
`504`	`504`	`for (BooleanClause clause : query) {`
`505`		`- if (clause.getOccur().equals(occur)) {`
	`505`	`+ if (clause.occur().equals(occur)) {`
`506`	`506`	`return true;`
`507`	`507`	`}`
`508`	`508`	`}`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ private void searchIndex(IndexSearcher searcher, boolean paging) throws IOExcept`
`232`	`232`	`topDocs = searcher.search(query, new TopFieldCollectorManager(luceneSort, numHits, Short.MAX_VALUE));`
`233`	`233`	`}`
`234`	`234`	`hits = topDocs.scoreDocs;`
`235`		`- totalHits = (int) topDocs.totalHits.value;`
	`235`	`+ totalHits = (int) topDocs.totalHits.value();`
`236`	`236`
`237`	`237`	`Statistics stat = new Statistics();`
`238`	`238`	`stat.report(LOGGER, Level.FINEST, "search via SearchEngine done",`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ private void getTerms(Query query) {`
`330`	`330`	`private void getBooleans(BooleanQuery query) {`
`331`	`331`	`for (BooleanClause clause : query) {`
`332`	`332`	`if (!clause.isProhibited()) {`
`333`		`- getTerms(clause.getQuery());`
	`333`	`+ getTerms(clause.query());`
`334`	`334`	`}`
`335`	`335`	`}`
`336`	`336`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ private void getRegexp(RegexpQuery query) {`
`105`	`105`	`private void getBooleans(BooleanQuery query) {`
`106`	`106`	`for (BooleanClause clause : query) {`
`107`	`107`	`if (!clause.isProhibited()) {`
`108`		`- getTerms(clause.getQuery());`
	`108`	`+ getTerms(clause.query());`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ public SearchHelper executeQuery() {`
`476`	`476`	`}`
`477`	`477`	`try {`
`478`	`478`	`TopFieldDocs fdocs = searcher.search(query, start + maxItems, sort);`
`479`		`- totalHits = fdocs.totalHits.value;`
	`479`	`+ totalHits = fdocs.totalHits.value();`
`480`	`480`	`hits = fdocs.scoreDocs;`
`481`	`481`
`482`	`482`	`/*`
`@@ -743,7 +743,7 @@ public int searchSingle(File file) throws IOException,`
`743`	`743`	`query = singleBuilder.setPath(path).build();`
`744`	`744`
`745`	`745`	`TopDocs top = searcher.search(query, 1);`
`746`		`- if (top.totalHits.value == 0) {`
	`746`	`+ if (top.totalHits.value() == 0) {`
`747`	`747`	`return -1;`
`748`	`748`	`}`
`749`	`749`