You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/02/07 16:49:32 UTC
svn commit: r1241500 - in /lucene/dev/trunk:
lucene/src/java/org/apache/lucene/index/
lucene/src/test/org/apache/lucene/index/
modules/facet/src/test/org/apache/lucene/facet/search/
Author: mikemccand
Date: Tue Feb 7 15:49:31 2012
New Revision: 1241500
URL: http://svn.apache.org/viewvc?rev=1241500&view=rev
Log:
LUCENE-3736: revert per discussion on IRC until we can reach agreement on the chaining
Added:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelReader.java
- copied unchanged from r1241469, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java
- copied unchanged from r1241469, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java
Removed:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelAtomicReader.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelCompositeReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelAtomicReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelCompositeReader.java
Modified:
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java
lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestFacetsAccumulatorWithComplement.java
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java?rev=1241500&r1=1241499&r2=1241500&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java Tue Feb 7 15:49:31 2012
@@ -30,7 +30,7 @@ import org.apache.lucene.document.TextFi
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
/**
- * Some tests for {@link ParallelAtomicReader}s with empty indexes
+ * Some tests for {@link ParallelReader}s with empty indexes
*
* @author Christian Kohlschuetter
*/
@@ -52,10 +52,9 @@ public class TestParallelReaderEmptyInde
Directory rdOut = newDirectory();
IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
- ParallelAtomicReader pr = new ParallelAtomicReader.Builder()
- .add(SlowCompositeReaderWrapper.wrap(DirectoryReader.open(rd1)))
- .add(SlowCompositeReaderWrapper.wrap(DirectoryReader.open(rd2)))
- .build();
+ ParallelReader pr = new ParallelReader();
+ pr.add(SlowCompositeReaderWrapper.wrap(DirectoryReader.open(rd1)));
+ pr.add(SlowCompositeReaderWrapper.wrap(DirectoryReader.open(rd2)));
// When unpatched, Lucene crashes here with a NoSuchElementException (caused by ParallelTermEnum)
iwOut.addIndexes(pr);
@@ -116,21 +115,15 @@ public class TestParallelReaderEmptyInde
Directory rdOut = newDirectory();
IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
- final DirectoryReader reader1, reader2;
- ParallelAtomicReader pr = new ParallelAtomicReader.Builder()
- .add(SlowCompositeReaderWrapper.wrap(reader1 = DirectoryReader.open(rd1)))
- .add(SlowCompositeReaderWrapper.wrap(reader2 = DirectoryReader.open(rd2)))
- .build();
+ ParallelReader pr = new ParallelReader();
+ pr.add(SlowCompositeReaderWrapper.wrap(DirectoryReader.open(rd1)));
+ pr.add(SlowCompositeReaderWrapper.wrap(DirectoryReader.open(rd2)));
// When unpatched, Lucene crashes here with an ArrayIndexOutOfBoundsException (caused by TermVectorsWriter)
iwOut.addIndexes(pr);
// ParallelReader closes any IndexReader you added to it:
pr.close();
-
- // assert subreaders were closed
- assertEquals(0, reader1.getRefCount());
- assertEquals(0, reader2.getRefCount());
rd1.close();
rd2.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java?rev=1241500&r1=1241499&r2=1241500&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java Tue Feb 7 15:49:31 2012
@@ -72,7 +72,9 @@ public class TestParallelTermEnum extend
}
public void test1() throws IOException {
- ParallelAtomicReader pr = new ParallelAtomicReader.Builder().add(ir1).add(ir2).build();
+ ParallelReader pr = new ParallelReader();
+ pr.add(ir1);
+ pr.add(ir2);
Bits liveDocs = pr.getLiveDocs();
Modified: lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestFacetsAccumulatorWithComplement.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestFacetsAccumulatorWithComplement.java?rev=1241500&r1=1241499&r2=1241500&view=diff
==============================================================================
--- lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestFacetsAccumulatorWithComplement.java (original)
+++ lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestFacetsAccumulatorWithComplement.java Tue Feb 7 15:49:31 2012
@@ -5,7 +5,7 @@ import java.util.List;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
-import org.apache.lucene.index.ParallelAtomicReader;
+import org.apache.lucene.index.ParallelReader;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
@@ -68,8 +68,8 @@ public class TestFacetsAccumulatorWithCo
@Test
public void testComplementsWithParallerReader() throws Exception {
IndexReader origReader = indexReader;
- ParallelAtomicReader pr = new ParallelAtomicReader.Builder(true)
- .add(SlowCompositeReaderWrapper.wrap(origReader)).build();
+ ParallelReader pr = new ParallelReader(true);
+ pr.add(SlowCompositeReaderWrapper.wrap(origReader));
indexReader = pr;
try {
doTestComplements();