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:51:18 UTC
svn commit: r1237340 - in /lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries: DuplicateFilter.java SlowCollatedStringComparator.java

Author: rmuir
Date: Sun Jan 29 16:51:18 2012
New Revision: 1237340

URL: http://svn.apache.org/viewvc?rev=1237340&view=rev
Log:
LUCENE-2858: fix contrib/sandbox

Modified:
    lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
    lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java

Modified: lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java?rev=1237340&r1=1237339&r2=1237340&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java Sun Jan 29 16:51:18 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.sandbox.querie
  */
 
 import org.apache.lucene.index.*;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
 import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.util.Bits;
@@ -72,13 +72,13 @@ public class DuplicateFilter extends Fil
   @Override
   public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
     if (processingMode == ProcessingMode.PM_FAST_INVALIDATION) {
-      return fastBits(context.reader, acceptDocs);
+      return fastBits(context.reader(), acceptDocs);
     } else {
-      return correctBits(context.reader, acceptDocs);
+      return correctBits(context.reader(), acceptDocs);
     }
   }
 
-  private FixedBitSet correctBits(IndexReader reader, Bits acceptDocs) throws IOException {
+  private FixedBitSet correctBits(AtomicIndexReader reader, Bits acceptDocs) throws IOException {
     FixedBitSet bits = new FixedBitSet(reader.maxDoc()); //assume all are INvalid
     Terms terms = reader.fields().terms(fieldName);
 
@@ -115,7 +115,7 @@ public class DuplicateFilter extends Fil
     return bits;
   }
 
-  private FixedBitSet fastBits(IndexReader reader, Bits acceptDocs) throws IOException {
+  private FixedBitSet fastBits(AtomicIndexReader reader, Bits acceptDocs) throws IOException {
     FixedBitSet bits = new FixedBitSet(reader.maxDoc());
     bits.set(0, reader.maxDoc()); //assume all are valid
     Terms terms = reader.fields().terms(fieldName);

Modified: lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java?rev=1237340&r1=1237339&r2=1237340&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java (original)
+++ lucene/dev/branches/lucene2858/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java Sun Jan 29 16:51:18 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.sandbox.querie
 import java.io.IOException;
 import java.text.Collator;
 
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
 import org.apache.lucene.search.FieldCache;
 import org.apache.lucene.search.FieldCache.DocTerms;
 import org.apache.lucene.search.FieldComparator;
@@ -91,7 +91,7 @@ public final class SlowCollatedStringCom
 
   @Override
   public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
-    currentDocTerms = FieldCache.DEFAULT.getTerms(context.reader, field);
+    currentDocTerms = FieldCache.DEFAULT.getTerms(context.reader(), field);
     return this;
   }