You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2020/07/29 22:02:52 UTC

[lucene-solr] branch branch_8_6 updated: LUCENE-9443: UnifiedHighlighter shouldn't close reader (#1706)

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch branch_8_6
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8_6 by this push:
     new 4c6032e  LUCENE-9443: UnifiedHighlighter shouldn't close reader (#1706)
4c6032e is described below

commit 4c6032ebe85f792a221f9e313293c17b90382c51
Author: David Smiley <ds...@salesforce.com>
AuthorDate: Wed Jul 29 17:56:24 2020 -0400

    LUCENE-9443: UnifiedHighlighter shouldn't close reader (#1706)
    
    A regression from 8.6.  Don't close the underlying IndexReader.
    
    (cherry picked from commit 7d5b61797397fd785c8cc33b2367038d89ace5a9)
---
 lucene/CHANGES.txt                                                   | 3 ++-
 .../java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.java | 5 ++---
 .../lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java      | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 264640f..bd0eb90 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -7,7 +7,8 @@ http://s.apache.org/luceneversions
 
 Bug Fixes
 ---------------------
-(No changes)
+* LUCENE-9443: The UnifiedHighlighter was closing the underlying reader when there were multiple term-vector fields.
+  This was a regression in 8.6.0.  (David Smiley, Chris Beer)
 
 ======================= Lucene 8.6.0 =======================
 
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.java b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.java
index abf8bc6..2e6393c 100644
--- a/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.java
+++ b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.java
@@ -645,7 +645,7 @@ public class UnifiedHighlighter {
 
       batchDocIdx += fieldValsByDoc.size();
     }
-    IOUtils.close(indexReaderWithTermVecCache);
+    IOUtils.close(indexReaderWithTermVecCache); // FYI won't close underlying reader
     assert docIdIter.docID() == DocIdSetIterator.NO_MORE_DOCS
         || docIdIter.nextDoc() == DocIdSetIterator.NO_MORE_DOCS;
 
@@ -1088,8 +1088,7 @@ public class UnifiedHighlighter {
           .toArray(LeafReader[]::new);
       return new BaseCompositeReader<IndexReader>(leafReaders) {
         @Override
-        protected void doClose() throws IOException {
-          reader.close();
+        protected void doClose() { // don't close the underlying reader
         }
 
         @Override
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java
index b2319d1..f929f20 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java
@@ -120,6 +120,7 @@ public class TestUnifiedHighlighterTermVec extends LuceneTestCase {
       assertArrayEquals(expectedSnippetsByDoc, fieldToSnippets.get(field));
     }
 
+    ir.document(0); // ensure this works because the ir hasn't been closed
     ir.close();
   }