You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/01/29 17:03:41 UTC
svn commit: r1237321 - in /lucene/dev/branches/lucene2858/modules/join/src:
java/org/apache/lucene/search/join/ test/org/apache/lucene/search/join/
Author: rmuir
Date: Sun Jan 29 16:03:40 2012
New Revision: 1237321
URL: http://svn.apache.org/viewvc?rev=1237321&view=rev
Log:
LUCENE-2858: fix join module
Modified:
lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/TermsCollector.java
lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
Modified: lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/TermsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/TermsCollector.java?rev=1237321&r1=1237320&r2=1237321&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/TermsCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/TermsCollector.java Sun Jan 29 16:03:40 2012
@@ -17,8 +17,8 @@ package org.apache.lucene.search.join;
* limitations under the License.
*/
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.DocTermOrds;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.FieldCache;
@@ -94,9 +94,9 @@ abstract class TermsCollector extends Co
} while (chunk >= buffer.length);
}
- public void setNextReader(IndexReader.AtomicReaderContext context) throws IOException {
- docTermOrds = FieldCache.DEFAULT.getDocTermOrds(context.reader, field);
- docTermsEnum = docTermOrds.getOrdTermsEnum(context.reader);
+ public void setNextReader(AtomicReaderContext context) throws IOException {
+ docTermOrds = FieldCache.DEFAULT.getDocTermOrds(context.reader(), field);
+ docTermsEnum = docTermOrds.getOrdTermsEnum(context.reader());
reuse = null; // LUCENE-3377 needs to be fixed first then this statement can be removed...
}
}
@@ -115,8 +115,8 @@ abstract class TermsCollector extends Co
collectorTerms.add(fromDocTerms.getTerm(doc, spare));
}
- public void setNextReader(IndexReader.AtomicReaderContext context) throws IOException {
- fromDocTerms = FieldCache.DEFAULT.getTerms(context.reader, field);
+ public void setNextReader(AtomicReaderContext context) throws IOException {
+ fromDocTerms = FieldCache.DEFAULT.getTerms(context.reader(), field);
}
}
Modified: lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java?rev=1237321&r1=1237320&r2=1237321&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java (original)
+++ lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java Sun Jan 29 16:03:40 2012
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Set;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter; // javadocs
import org.apache.lucene.index.Term;
@@ -120,7 +120,7 @@ public class ToChildBlockJoinQuery exten
return null;
}
- final DocIdSet parents = parentsFilter.getDocIdSet(readerContext, readerContext.reader.getLiveDocs());
+ final DocIdSet parents = parentsFilter.getDocIdSet(readerContext, readerContext.reader().getLiveDocs());
// TODO: once we do random-access filters we can
// generalize this:
if (parents == null) {
Modified: lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java?rev=1237321&r1=1237320&r2=1237321&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java (original)
+++ lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java Sun Jan 29 16:03:40 2012
@@ -24,7 +24,7 @@ import java.util.LinkedList;
import java.util.Map;
import java.util.Queue;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter; // javadocs
import org.apache.lucene.search.Collector;
@@ -107,7 +107,7 @@ public class ToParentBlockJoinCollector
private int docBase;
private ToParentBlockJoinQuery.BlockJoinScorer[] joinScorers = new ToParentBlockJoinQuery.BlockJoinScorer[0];
- private IndexReader.AtomicReaderContext currentReaderContext;
+ private AtomicReaderContext currentReaderContext;
private Scorer scorer;
private boolean queueFull;
Modified: lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java?rev=1237321&r1=1237320&r2=1237321&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java (original)
+++ lucene/dev/branches/lucene2858/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java Sun Jan 29 16:03:40 2012
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Set;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter; // javadocs
import org.apache.lucene.index.Term;
@@ -186,7 +186,7 @@ public class ToParentBlockJoinQuery exte
return null;
}
- final DocIdSet parents = parentsFilter.getDocIdSet(readerContext, readerContext.reader.getLiveDocs());
+ final DocIdSet parents = parentsFilter.getDocIdSet(readerContext, readerContext.reader().getLiveDocs());
// TODO: once we do random-access filters we can
// generalize this:
if (parents == null) {
Modified: lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1237321&r1=1237320&r2=1237321&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Sun Jan 29 16:03:40 2012
@@ -28,7 +28,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericField;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LogDocMergePolicy;
import org.apache.lucene.index.RandomIndexWriter;
@@ -160,7 +160,7 @@ public class TestBlockJoin extends Lucen
final int subIndex = ReaderUtil.subIndex(childDocID, leaves);
final AtomicReaderContext leaf = leaves[subIndex];
final FixedBitSet bits = (FixedBitSet) parents.getDocIdSet(leaf, null);
- return leaf.reader.document(bits.nextSetBit(childDocID - leaf.docBase));
+ return leaf.reader().document(bits.nextSetBit(childDocID - leaf.docBase));
}
public void testBoostBug() throws Exception {
Modified: lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java?rev=1237321&r1=1237320&r2=1237321&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (original)
+++ lucene/dev/branches/lucene2858/modules/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java Sun Jan 29 16:03:40 2012
@@ -23,6 +23,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.*;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.search.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -184,7 +185,7 @@ public class TestJoinUtil extends Lucene
actualResult.set(doc + docBase);
}
- public void setNextReader(IndexReader.AtomicReaderContext context) throws IOException {
+ public void setNextReader(AtomicReaderContext context) throws IOException {
docBase = context.docBase;
}