svn commit: r1684625 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/core/ lucene/core/src/java/org/apache/lucene/index/ lucene/test-framework/ lucene/test-framework/src/test/org/apache/lucene/index/

[mi...@apache.org]

Author: mikemccand
Date: Wed Jun 10 09:54:22 2015
New Revision: 1684625

URL: http://svn.apache.org/r1684625
Log:
LUCENE-6533: don't cache live docs in SlowCompositeReaderWrapper

Added:
    lucene/dev/branches/branch_5x/lucene/test-framework/src/test/org/apache/lucene/index/
      - copied from r1684615, lucene/dev/trunk/lucene/test-framework/src/test/org/apache/lucene/index/
Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/lucene/core/   (props changed)
    lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
    lucene/dev/branches/branch_5x/lucene/test-framework/   (props changed)

Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1684625&r1=1684624&r2=1684625&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Wed Jun 10 09:54:22 2015
@@ -66,6 +66,10 @@ Bug fixes
 * LUCENE-6527: Queries now get a dummy Similarity when scores are not needed
   in order to not load unnecessary information like norms. (Adrien Grand)
 
+* LUCENE-6533: SlowCompositeReaderWrapper no longer caches its live docs
+  instance since this can prevent future improvements like a
+  disk-backed live docs (Adrien Grand, Mike McCandless)
+
 Changes in Runtime Behavior
 
 * LUCENE-6501: The subreader structure in ParallelCompositeReader

Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java?rev=1684625&r1=1684624&r2=1684625&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java Wed Jun 10 09:54:22 2015
@@ -46,7 +46,6 @@ public final class SlowCompositeReaderWr
 
   private final CompositeReader in;
   private final Fields fields;
-  private final Bits liveDocs;
   private final boolean merging;
   
   /** This method is sugar for getting an {@link LeafReader} from
@@ -66,7 +65,6 @@ public final class SlowCompositeReaderWr
     super();
     in = reader;
     fields = MultiFields.getFields(in);
-    liveDocs = MultiFields.getLiveDocs(in);
     in.registerParentReader(this);
     this.merging = merging;
   }
@@ -230,7 +228,7 @@ public final class SlowCompositeReaderWr
   @Override
   public Bits getLiveDocs() {
     ensureOpen();
-    return liveDocs;
+    return MultiFields.getLiveDocs(in);
   }
 
   @Override