lucene 9.5.0

tarzanek · vladak · commit dd0b245897af · 2023-02-24T13:41:16.000+01:00
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/DirectoryHistoryReader.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/DirectoryHistoryReader.java
@@ -38,6 +38,7 @@
 
 import org.apache.lucene.document.DateTools;
 import org.apache.lucene.document.Document;
+import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.apache.lucene.search.Query;
@@ -113,9 +114,10 @@ public DirectoryHistoryReader(String path) throws IOException {
             }
             if (hits != null) {
                 // Get maximum MAX_RESULTS (why ? XXX) files which were changed recently.
+                StoredFields storedFields = searcher.storedFields();
                 for (int i = 0; i < MAX_RESULTS && i < hits.length; i++) {
                     int docId = hits[i].doc;
-                    Document doc = searcher.doc(docId);
+                    Document doc = storedFields.document(docId);
                     String rpath = doc.get(QueryBuilder.PATH);
                     if (!rpath.startsWith(path)) {
                         continue;
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
@@ -31,6 +31,7 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.queryparser.classic.QueryParser;
@@ -92,8 +93,9 @@ public IndexAnalysisSettings3[] read(IndexReader reader, int n) throws IOExcepti
         IndexAnalysisSettings3[] res = new IndexAnalysisSettings3[nres];
 
         IndexAnalysisSettingsUpgrader upgrader = new IndexAnalysisSettingsUpgrader();
+        StoredFields storedFields = searcher.storedFields();
         for (int i = 0; i < nres; ++i) {
-            Document doc = searcher.doc(top.scoreDocs[i].doc);
+            Document doc = storedFields.document(top.scoreDocs[i].doc);
             IndexableField objser = doc.getField(QueryBuilder.OBJSER);
             int objver = readObjectVersion(doc);
             try {
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
@@ -71,6 +71,7 @@
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.MultiTerms;
 import org.apache.lucene.index.PostingsEnum;
+import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.index.TermsEnum;
@@ -1003,9 +1004,10 @@ private void removeFileDocUid(String path) throws IOException {
         // Determine if a reversal of counts is necessary, and execute if so.
         if (isCountingDeltas) {
             postsIter = uidIter.postings(postsIter);
+            StoredFields storedFields = reader.storedFields();
             while (postsIter.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
                 // Read a limited-fields version of the document.
-                Document doc = reader.document(postsIter.docID(), REVERT_COUNTS_FIELDS);
+                Document doc = storedFields.document(postsIter.docID(), REVERT_COUNTS_FIELDS);
                 if (doc != null) {
                     decrementLOCforDoc(path, doc);
                     break;
@@ -1926,7 +1928,7 @@ public static Document getDocument(File file) throws ParseException, IOException
                 // No hits, no document...
                 return null;
             }
-            doc = searcher.doc(top.scoreDocs[0].doc);
+            doc = searcher.storedFields().document(top.scoreDocs[0].doc);
             String foundPath = doc.get(QueryBuilder.PATH);
 
             // Only use the document if we found an exact match.
@@ -2078,10 +2080,11 @@ boolean checkSettings(File file, String path) throws IOException {
 
         int n = 0;
         postsIter = uidIter.postings(postsIter);
+        StoredFields storedFields = reader.storedFields();
         while (postsIter.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
             ++n;
             // Read a limited-fields version of the document.
-            Document doc = reader.document(postsIter.docID(), CHECK_FIELDS);
+            Document doc = storedFields.document(postsIter.docID(), CHECK_FIELDS);
             if (doc == null) {
                 LOGGER.log(Level.FINER, "No Document: {0}", path);
                 continue;
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
@@ -30,6 +30,7 @@
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.queryparser.classic.QueryParser;
@@ -122,9 +123,10 @@ private void storeBulk(IndexWriter writer, IndexReader reader,
         HashMap<String, Integer> byDir = new HashMap<>();
         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;
-            Document doc = searchResult.searcher.doc(docID);
+            Document doc = storedFields.document(docID);
             String dirPath = doc.get(QueryBuilder.D);
             byDir.put(dirPath, docID);
         }
@@ -168,7 +170,7 @@ private void updateDocumentData(IndexWriter writer, IndexSearcher searcher,
         long extantLines = 0;
 
         if (docID != null) {
-            Document doc = searcher.doc(docID);
+            Document doc = searcher.storedFields().document(docID);
             if (isAggregatingDeltas) {
                 extantLines = NumberUtils.toLong(doc.get(QueryBuilder.NUML));
                 extantLOC = NumberUtils.toLong(doc.get(QueryBuilder.LOC));
@@ -191,8 +193,9 @@ private boolean processFileCounts(NumLinesLOCAggregator countsAggregator,
             IndexSearcher searcher, TopDocs hits) throws IOException {
 
         boolean hasDefinedNumLines = false;
+        StoredFields storedFields = searcher.storedFields();
         for (ScoreDoc sd : hits.scoreDocs) {
-            Document d = searcher.doc(sd.doc);
+            Document d = storedFields.document(sd.doc);
             NullableNumLinesLOC counts = NumLinesLOCUtil.read(d);
             if (counts.getNumLines() != null && counts.getLOC() != null) {
                 NumLinesLOC defCounts = new NumLinesLOC(counts.getPath(),
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/DirectoryExtraReader.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/DirectoryExtraReader.java
@@ -29,6 +29,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.lucene.document.Document;
+import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
@@ -96,8 +97,9 @@ private List<NullableNumLinesLOC> processHits(IndexSearcher searcher, TopDocs hi
 
         List<NullableNumLinesLOC> results = new ArrayList<>();
 
+        StoredFields storedFields = searcher.storedFields();
         for (ScoreDoc sd : hits.scoreDocs) {
-            Document d = searcher.doc(sd.doc);
+            Document d = storedFields.document(sd.doc);
             NullableNumLinesLOC extra = NumLinesLOCUtil.read(d);
             results.add(extra);
         }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/Results.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/Results.java
@@ -46,6 +46,7 @@
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.ScoreDoc;
 import org.opengrok.indexer.analysis.AbstractAnalyzer;
@@ -91,9 +92,10 @@ private static Map<String, ArrayList<Integer>> createMap(
 
         LinkedHashMap<String, ArrayList<Integer>> dirHash =
                 new LinkedHashMap<>();
+        StoredFields storedFields = searcher.storedFields();
         for (int i = startIdx; i < stopIdx; i++) {
             int docId = hits[i].doc;
-            Document doc = searcher.doc(docId);
+            Document doc = storedFields.document(docId);
 
             String rpath = doc.get(QueryBuilder.PATH);
             if (rpath == null) {
@@ -202,8 +204,9 @@ public static void prettyPrint(Writer out, SearchHelper sh, int start,
                 xrefPrefix, tabSize, morePrefix);
 
             out.write("</td></tr>");
+            StoredFields storedFields = sh.getSearcher().storedFields();
             for (int docId : entry.getValue()) {
-                Document doc = sh.getSearcher().doc(docId);
+                Document doc = storedFields.document(docId);
                 String rpath = doc.get(QueryBuilder.PATH);
                 String rpathE = Util.uriEncodePath(rpath);
                 if (evenRow) {
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
@@ -43,6 +43,7 @@
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.MultiReader;
+import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
@@ -216,9 +217,10 @@ private void searchIndex(IndexSearcher searcher, boolean paging) throws IOExcept
             searcher.search(query, collector);
         }
         hits = collector.topDocs().scoreDocs;
+        StoredFields storedFields = searcher.storedFields();
         for (ScoreDoc hit : hits) {
             int docId = hit.doc;
-            Document d = searcher.doc(docId);
+            Document d = storedFields.document(docId);
             docs.add(d);
         }
     }
@@ -383,7 +385,7 @@ public Document doc(int docId) throws IOException {
         if (searcher == null) {
             throw new IllegalStateException("search(...) did not succeed");
         }
-        return searcher.doc(docId);
+        return searcher.storedFields().document(docId);
     }
 
     /**
@@ -419,15 +421,21 @@ public void results(int start, int end, List<Hit> ret) {
             }
             hits = collector.topDocs().scoreDocs;
             Document d = null;
-            for (int i = start; i < hits.length; i++) {
-                int docId = hits[i].doc;
+            StoredFields storedFields = null;
+            try {
+                storedFields = searcher.storedFields();
+            } catch (Exception e) {
+                LOGGER.log(
+                        Level.WARNING, SEARCH_EXCEPTION_MSG, e);
+            }
+            for (ScoreDoc hit : hits) {
                 try {
-                    d = searcher.doc(docId);
+                    d = storedFields.document(hit.doc);
+                    docs.add(d);
                 } catch (Exception e) {
                     LOGGER.log(
                             Level.SEVERE, SEARCH_EXCEPTION_MSG, e);
                 }
-                docs.add(d);
             }
             allCollected = true;
         }
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/Context.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/Context.java
@@ -140,7 +140,7 @@ public boolean getContext2(RuntimeEnvironment env, IndexSearcher searcher,
 
         Document doc;
         try {
-            doc = searcher.doc(docId);
+            doc = searcher.storedFields().document(docId);
         } catch (IOException e) {
             LOGGER.log(Level.WARNING, "ERROR getting searcher doc(int)", e);
             return false;
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
@@ -34,6 +34,7 @@
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.DateTools;
 import org.apache.lucene.document.Document;
+import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.uhighlight.UHComponents;
@@ -123,7 +124,7 @@ public String highlightFieldsUnion(String[] fields, Query query,
          * getIndexAnalyzer() (if it is called due to requiring ANALYSIS) can be
          * influenced by fileTypeName.
          */
-        Document doc = searcher.doc(docId);
+        Document doc = searcher.storedFields().document(docId);
         fileTypeName = doc == null ? null : doc.get(QueryBuilder.TYPE);
         try {
             return highlightFieldsUnionWork(fields, query, docId, lineLimit);
@@ -207,12 +208,13 @@ protected List<CharSequence[]> loadFieldValues(String[] fields,
             cacheCharsThreshold == 0 ? 1 : (int) Math.min(64, docIter.cost()));
 
         int sumChars = 0;
+        StoredFields storedFields = searcher.storedFields();
         do {
             int docId = docIter.nextDoc();
             if (docId == DocIdSetIterator.NO_MORE_DOCS) {
                 break;
             }
-            Document doc = searcher.doc(docId);
+            Document doc = storedFields.document(docId);
 
             String path = doc.get(QueryBuilder.PATH);
             String storedU = doc.get(QueryBuilder.U);
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
@@ -509,7 +509,7 @@ private void maybeRedirectToDefinition(int docID, TermQuery termQuery)
         // Attempt to create a direct link to the definition if we search for
         // one single definition term AND we have exactly one match AND there
         // is only one definition of that symbol in the document that matches.
-        Document doc = searcher.doc(docID);
+        Document doc = searcher.storedFields().document(docID);
         IndexableField tagsField = doc.getField(QueryBuilder.TAGS);
         if (tagsField != null) {
             byte[] rawTags = tagsField.binaryValue().bytes;
@@ -532,7 +532,7 @@ private void maybeRedirectToMatchOffset(int docID, List<String> contextFields)
          * must be subsequently converted to a line number and that is tractable
          * only from plain text.
          */
-        Document doc = searcher.doc(docID);
+        Document doc = searcher.storedFields().document(docID);
         String genre = doc.get(QueryBuilder.T);
         if (!AbstractAnalyzer.Genre.PLAIN.typeName().equals(genre)) {
             return;
@@ -569,7 +569,7 @@ private void maybeRedirectToMatchOffset(int docID, List<String> contextFields)
     }
 
     private void redirectToFile(int docID) throws IOException {
-        Document doc = searcher.doc(docID);
+        Document doc = searcher.storedFields().document(docID);
         redirect = contextPath + Prefix.XREF_P + Util.uriEncodePath(doc.get(QueryBuilder.PATH));
     }
 
@@ -746,7 +746,7 @@ public int searchSingle(File file) throws IOException,
         }
 
         int docID = top.scoreDocs[0].doc;
-        Document doc = searcher.doc(docID);
+        Document doc = searcher.storedFields().document(docID);
 
         String foundPath = doc.get(QueryBuilder.PATH);
         // Only use the result if PATH matches exactly.
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.4.2</lucene.version>
+        <lucene.version>9.5.0</lucene.version>
         <mavenjavadocplugin.version>3.2.0</mavenjavadocplugin.version>
         <!-- The following changed syntax from e.g. 1.8 to 11. -->
         <compileSource>11</compileSource>
