You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/07/19 04:01:50 UTC
svn commit: r1363203 [1/3] - in /lucene/dev/branches/LUCENE-2878:
lucene/core/src/java/org/apache/lucene/search/
lucene/core/src/java/org/apache/lucene/search/positions/
lucene/core/src/java/org/apache/lucene/search/spans/
lucene/core/src/test/org/apac...
Author: simonw
Date: Thu Jul 19 02:01:47 2012
New Revision: 1363203
URL: http://svn.apache.org/viewvc?rev=1363203&view=rev
Log:
LUCENE-2878: made class naming consistent and factored some inner classes out into their own files
Added:
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockIntervalIterator.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanIntervalIterator.java
- copied, changed from r1363191, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionIntervalIterator.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionIntervalIterator.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/Interval.java (with props)
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilterQuery.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionFilterQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalIterator.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedConjunctionIntervalIterator.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedConjunctionPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangeIntervalIterator.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangePositionsIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/SloppyIntervalIterator.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/MaxLengthPositionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinIntervalIterator.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBasicIntervals.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestSimplePositions.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockIntervalIterator.java
- copied, changed from r1363191, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockPositionsIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestConjunctionIntervalIterator.java
- copied, changed from r1363191, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestConjunctionPositionsIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestDisjunctionIntervalIterator.java
- copied, changed from r1363191, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestDisjunctionPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestIntervalFilterQueries.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestPositionFilterQueries.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionIntervalIterator.java
- copied, changed from r1363191, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionPositionsIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestPositionsAndOffsets.java
- copied, changed from r1363191, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestPositionOffsets.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/
- copied from r1363191, lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ArrayIntervalIterator.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PositionIntervalArrayIterator.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/DocAndPositions.java
- copied, changed from r1363191, lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/ScorePosDoc.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/HighlightingIntervalCollector.java
- copied, changed from r1363191, lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PosCollector.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/IntervalTokenStream.java
- copied, changed from r1363191, lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PosTokenStream.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/
- copied from r1363191, lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/poshighlight/
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/IntervalHighlighterTest.java
- copied, changed from r1363198, lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/poshighlight/PosHighlighterTest.java
Removed:
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/MaxLengthPositionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedConjunctionPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionFilterQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangePositionsIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockPositionsIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestConjunctionPositionsIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestDisjunctionPositionIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionPositionsIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestPositionFilterQueries.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestPositionOffsets.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestSimplePositions.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/PosCollector.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/PosTokenStream.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/PositionIntervalArrayIterator.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ScorePosDoc.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/PosHighlighterTest.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/poshighlight/
Modified:
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BrouwerianIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BrouwerianQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueue.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueueAnd.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueueOr.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedConjunctionQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/TermIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinOrderedFilter.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpansScorerWrapper.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBrouwerianQuery.java
lucene/dev/branches/LUCENE-2878/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java
lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/LatLonType.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java Thu Jul 19 02:01:47 2012
@@ -20,10 +20,10 @@ package org.apache.lucene.search;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery.BooleanWeight;
-import org.apache.lucene.search.positions.BooleanPositionIterator;
-import org.apache.lucene.search.positions.ConjunctionPositionIterator;
-import org.apache.lucene.search.positions.DisjunctionPositionIterator;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.BooleanIntervalIterator;
+import org.apache.lucene.search.positions.ConjunctionIntervalIterator;
+import org.apache.lucene.search.positions.DisjunctionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import java.io.IOException;
import java.util.ArrayList;
@@ -141,8 +141,8 @@ final class BooleanScorer extends Scorer
public float score() { return score; }
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
- return PositionIntervalIterator.NO_MORE_POSITIONS;
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ return IntervalIterator.NO_MORE_POSITIONS;
}
}
@@ -327,7 +327,7 @@ final class BooleanScorer extends Scorer
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
final List<Scorer> scorers = new ArrayList<Scorer>();
SubScorer sub = this.scorers;
while(sub != null) {
@@ -337,10 +337,10 @@ final class BooleanScorer extends Scorer
sub = sub.next;
}
if (this.minNrShouldMatch > 1) {
- return new ConjunctionPositionIterator(this,
- collectPositions, this.minNrShouldMatch, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, scorers));
+ return new ConjunctionIntervalIterator(this,
+ collectPositions, this.minNrShouldMatch, BooleanIntervalIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, scorers));
}
- return new DisjunctionPositionIterator(this, collectPositions, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, scorers));
+ return new DisjunctionIntervalIterator(this, collectPositions, BooleanIntervalIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, scorers));
}
@Override
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java Thu Jul 19 02:01:47 2012
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery.BooleanWeight;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.search.similarities.Similarity;
/* See the description in BooleanScorer.java, comparing
@@ -147,7 +147,7 @@ class BooleanScorer2 extends Scorer {
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
return scorer.positions(needsPayloads, needsOffsets, false);
}
}
@@ -326,7 +326,7 @@ class BooleanScorer2 extends Scorer {
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
return countingSumScorer.positions(needsPayloads, needsOffsets, collectPositions);
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java Thu Jul 19 02:01:47 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.util.RamUsageEstimator;
import java.io.IOException;
@@ -92,7 +92,7 @@ public abstract class CachingCollector e
public final int nextDoc() { throw new UnsupportedOperationException(); }
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException { throw new UnsupportedOperationException(); }
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException { throw new UnsupportedOperationException(); }
}
// A CachingCollector which caches scores
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java Thu Jul 19 02:01:47 2012
@@ -21,9 +21,9 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Comparator;
-import org.apache.lucene.search.positions.BooleanPositionIterator;
-import org.apache.lucene.search.positions.ConjunctionPositionIterator;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.BooleanIntervalIterator;
+import org.apache.lucene.search.positions.ConjunctionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.util.ArrayUtil;
/** Scorer for conjunctions, sets of queries, all of which are required. */
@@ -145,12 +145,12 @@ class ConjunctionScorer extends Scorer {
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
if (scorersOrdered == null) {
throw new IllegalStateException("no positions requested for this scorer");
}
// only created if needed for this scorer - no penalty for non-positional queries
- return new ConjunctionPositionIterator(this, collectPositions, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, scorersOrdered));
+ return new ConjunctionIntervalIterator(this, collectPositions, BooleanIntervalIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, scorersOrdered));
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java Thu Jul 19 02:01:47 2012
@@ -22,8 +22,8 @@ import java.util.Comparator;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.search.TermQuery.TermDocsEnumFactory;
-import org.apache.lucene.search.positions.ConjunctionPositionIterator;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.ConjunctionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.search.positions.TermIntervalIterator;
import org.apache.lucene.search.similarities.Similarity.ExactSimScorer;
import org.apache.lucene.util.ArrayUtil;
@@ -122,13 +122,13 @@ class ConjunctionTermScorer extends Scor
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
TermIntervalIterator[] positionIters = new TermIntervalIterator[origDocsAndFreqs.length];
for (int i = 0; i < positionIters.length; i++) {
DocsAndFreqs d = origDocsAndFreqs[i];
positionIters[i] = new TermIntervalIterator(this, d.factory.docsAndPositionsEnum(needsOffsets), needsPayloads, collectPositions);
}
- return new ConjunctionPositionIterator(this, collectPositions, positionIters);
+ return new ConjunctionIntervalIterator(this, collectPositions, positionIters);
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java Thu Jul 19 02:01:47 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.ToStringUtils;
@@ -256,7 +256,7 @@ public class ConstantScoreQuery extends
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
if (docIdSetIterator instanceof Scorer) {
return ((Scorer) docIdSetIterator).positions(needsPayloads, needsOffsets, false);
} else {
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java Thu Jul 19 02:01:47 2012
@@ -16,9 +16,9 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.search.positions.BooleanPositionIterator;
-import org.apache.lucene.search.positions.DisjunctionPositionIterator;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.BooleanIntervalIterator;
+import org.apache.lucene.search.positions.DisjunctionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import java.io.IOException;
import java.util.Arrays;
@@ -191,8 +191,8 @@ class DisjunctionMaxScorer extends Score
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
- return new DisjunctionPositionIterator(this, collectPositions, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, subScorers));
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ return new DisjunctionIntervalIterator(this, collectPositions, BooleanIntervalIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, subScorers));
}
@Override
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java Thu Jul 19 02:01:47 2012
@@ -20,10 +20,10 @@ package org.apache.lucene.search;
import java.util.List;
import java.io.IOException;
-import org.apache.lucene.search.positions.BooleanPositionIterator;
-import org.apache.lucene.search.positions.ConjunctionPositionIterator;
-import org.apache.lucene.search.positions.DisjunctionPositionIterator;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.BooleanIntervalIterator;
+import org.apache.lucene.search.positions.ConjunctionIntervalIterator;
+import org.apache.lucene.search.positions.DisjunctionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.util.ScorerDocQueue;
/** A Scorer for OR like queries, counterpart of <code>ConjunctionScorer</code>.
@@ -244,11 +244,11 @@ class DisjunctionSumScorer extends Score
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
if (minimumNrMatchers > 1) {
- return new ConjunctionPositionIterator(this,
- collectPositions, minimumNrMatchers, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, subScorers));
+ return new ConjunctionIntervalIterator(this,
+ collectPositions, minimumNrMatchers, BooleanIntervalIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, subScorers));
}
- return new DisjunctionPositionIterator(this, collectPositions, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, subScorers));
+ return new DisjunctionIntervalIterator(this, collectPositions, BooleanIntervalIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, subScorers));
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java Thu Jul 19 02:01:47 2012
@@ -18,8 +18,8 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.index.DocsAndPositionsEnum;
-import org.apache.lucene.search.positions.BlockPositionIterator;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.BlockIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.search.positions.TermIntervalIterator;
import org.apache.lucene.search.similarities.Similarity;
@@ -326,11 +326,11 @@ final class ExactPhraseScorer extends Sc
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
TermIntervalIterator[] posIters = new TermIntervalIterator[chunkStates.length];
for (int i = 0; i < chunkStates.length; i++) {
posIters[i] = new TermIntervalIterator(this, chunkStates[i].factory.docsAndPositionsEnum(needsOffsets), needsPayloads, collectPositions);
}
- return new BlockPositionIterator(this, collectPositions, posIters);
+ return new BlockIntervalIterator(this, collectPositions, posIters);
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java Thu Jul 19 02:01:47 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.ToStringUtils;
@@ -224,7 +224,7 @@ public class FilteredQuery extends Query
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
// nocommit what should we do in this case with positions?
throw new UnsupportedOperationException();
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Thu Jul 19 02:01:47 2012
@@ -43,7 +43,7 @@ import org.apache.lucene.index.StoredFie
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermContext;
import org.apache.lucene.index.Terms;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.NIOFSDirectory; // javadoc
@@ -756,7 +756,7 @@ public class IndexSearcher {
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads,
+ public IntervalIterator positions(boolean needsPayloads,
boolean needsOffsets, boolean collectPositions) throws IOException {
return null;
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java Thu Jul 19 02:01:47 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.util.ToStringUtils;
import org.apache.lucene.util.Bits;
@@ -75,7 +75,7 @@ public class MatchAllDocsQuery extends Q
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
// nocommit this is tricky - I think we can't really provide positions here?
throw new UnsupportedOperationException();
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java Thu Jul 19 02:01:47 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.search.similarities.Similarity;
import java.io.IOException;
@@ -94,7 +94,7 @@ final class MatchOnlyTermScorer extends
public String toString() { return "scorer(" + weight + ")"; }
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
// nocommit is this ok here?
throw new UnsupportedOperationException();
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java Thu Jul 19 02:01:47 2012
@@ -19,8 +19,8 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.search.positions.ConjunctionPositionIterator;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.ConjunctionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
/** A Scorer for queries with a required subscorer
@@ -122,7 +122,7 @@ class ReqExclScorer extends Scorer {
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
- return new ConjunctionPositionIterator(this, collectPositions, reqScorer.positions(needsPayloads, needsOffsets, collectPositions));
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ return new ConjunctionIntervalIterator(this, collectPositions, reqScorer.positions(needsPayloads, needsOffsets, collectPositions));
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java Thu Jul 19 02:01:47 2012
@@ -16,9 +16,9 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.search.positions.BooleanPositionIterator;
-import org.apache.lucene.search.positions.DisjunctionPositionIterator;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.BooleanIntervalIterator;
+import org.apache.lucene.search.positions.DisjunctionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import java.io.IOException;
@@ -85,8 +85,8 @@ class ReqOptSumScorer extends Scorer {
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
- return new DisjunctionPositionIterator(this, collectPositions, BooleanPositionIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, reqScorer, optScorer));
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ return new DisjunctionIntervalIterator(this, collectPositions, BooleanIntervalIterator.pullIterators(needsPayloads, needsOffsets, collectPositions, reqScorer, optScorer));
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java Thu Jul 19 02:01:47 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import java.io.IOException;
@@ -81,7 +81,7 @@ public class ScoreCachingWrappingScorer
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
return scorer.positions(needsPayloads, needsOffsets, false);
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java Thu Jul 19 02:01:47 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import java.io.IOException;
import java.util.Collection;
@@ -64,7 +64,7 @@ public abstract class Scorer extends Doc
}
//nocommit javadocs
- public abstract PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException;
+ public abstract IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException;
/**
* Expert: Collects matching documents in a range. Hook for optimization.
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java Thu Jul 19 02:01:47 2012
@@ -30,9 +30,9 @@ import java.util.Map;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.positions.ConjunctionPositionIterator;
-import org.apache.lucene.search.positions.MaxLengthPositionIntervalIterator;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.ConjunctionIntervalIterator;
+import org.apache.lucene.search.positions.SloppyIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.search.positions.TermIntervalIterator;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.OpenBitSet;
@@ -541,7 +541,7 @@ final class SloppyPhraseScorer extends P
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads,
+ public IntervalIterator positions(boolean needsPayloads,
boolean needsOffsets, boolean collectPositions) throws IOException {
// nocommit - payloads?
Map<Term, IterAndOffsets> map = new HashMap<Term, IterAndOffsets>();
@@ -570,18 +570,18 @@ final class SloppyPhraseScorer extends P
// System.out.println("POS: " + postings[i].position + " " + term);
}
Collection<IterAndOffsets> values = map.values();
- PositionIntervalIterator[] iters = new PositionIntervalIterator[values.size()];
+ IntervalIterator[] iters = new IntervalIterator[values.size()];
int i = 0;
for (IterAndOffsets iterAndOffsets : values) {
- iters[i++] = MaxLengthPositionIntervalIterator.create(this, collectPositions, iterAndOffsets.iter, iterAndOffsets.toIntArray());
+ iters[i++] = SloppyIntervalIterator.create(this, collectPositions, iterAndOffsets.iter, iterAndOffsets.toIntArray());
}
- return new MaxLengthPositionIntervalIterator(this, slop, collectPositions, new ConjunctionPositionIterator(this, collectPositions, iters));
+ return new SloppyIntervalIterator(this, slop, collectPositions, iters);
}
private static class IterAndOffsets {
final List<Integer> offsets = new ArrayList<Integer>();
- final PositionIntervalIterator iter;
- IterAndOffsets(PositionIntervalIterator iter) {
+ final IntervalIterator iter;
+ IterAndOffsets(IntervalIterator iter) {
this.iter = iter;
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermScorer.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermScorer.java Thu Jul 19 02:01:47 2012
@@ -22,9 +22,8 @@ import java.io.IOException;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.search.TermQuery.TermDocsEnumFactory;
-import org.apache.lucene.search.positions.PositionIntervalIterator;
+import org.apache.lucene.search.positions.IntervalIterator;
import org.apache.lucene.search.positions.TermIntervalIterator;
-import org.apache.lucene.search.positions.PositionIntervalIterator.PositionInterval;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.BytesRef;
@@ -98,7 +97,7 @@ final class TermScorer extends Scorer {
public String toString() { return "scorer(" + weight + ")"; }
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
return new TermIntervalIterator(this, factory.docsAndPositionsEnum(needsOffsets), needsPayloads, collectPositions);
}
}
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockIntervalIterator.java (from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockPositionIterator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockIntervalIterator.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockIntervalIterator.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockPositionIterator.java&r1=1363198&r2=1363203&rev=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockPositionIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockIntervalIterator.java Thu Jul 19 02:01:47 2012
@@ -26,33 +26,33 @@ import org.apache.lucene.search.Scorer;
* @lucene.experimental
*/
// nocommit - javadoc
-public final class BlockPositionIterator extends PositionIntervalIterator {
- private final PositionIntervalIterator[] iterators;
+public final class BlockIntervalIterator extends IntervalIterator {
+ private final IntervalIterator[] iterators;
- private static final PositionInterval INFINITE_INTERVAL = new PositionInterval(
+ private static final Interval INFINITE_INTERVAL = new Interval(
Integer.MIN_VALUE, Integer.MIN_VALUE, -1, -1);
- private final PositionInterval[] intervals;
- private final PositionInterval interval = new PositionInterval(
+ private final Interval[] intervals;
+ private final Interval interval = new Interval(
Integer.MIN_VALUE, Integer.MIN_VALUE, -1, -1);
private final int[] gaps;
private final int lastIter;
- public BlockPositionIterator(boolean collectPositions, PositionIntervalIterator other) {
+ public BlockIntervalIterator(boolean collectPositions, IntervalIterator other) {
this(other, collectPositions, defaultGaps(other.subs(true).length));
}
- public BlockPositionIterator(PositionIntervalIterator other, boolean collectPositions, int[] gaps) {
+ public BlockIntervalIterator(IntervalIterator other, boolean collectPositions, int[] gaps) {
super(other.getScorer(), collectPositions);
assert other.subs(true) != null;
iterators = other.subs(true);
assert iterators.length > 1;
- intervals = new PositionInterval[iterators.length];
+ intervals = new Interval[iterators.length];
lastIter = iterators.length - 1;
this.gaps = gaps;
}
- public BlockPositionIterator(Scorer scorer, boolean collectPositions, Scorer... subScorers)
+ public BlockIntervalIterator(Scorer scorer, boolean collectPositions, Scorer... subScorers)
throws IOException {
this(scorer, collectPositions, defaultGaps(subScorers.length), subScorers);
}
@@ -63,12 +63,12 @@ public final class BlockPositionIterator
return gaps;
}
- public BlockPositionIterator(Scorer scorer, boolean collectPositions, int[] gaps, Scorer... subScorers)
+ public BlockIntervalIterator(Scorer scorer, boolean collectPositions, int[] gaps, Scorer... subScorers)
throws IOException {
super(scorer, collectPositions);
assert subScorers.length > 1;
- iterators = new PositionIntervalIterator[subScorers.length];
- intervals = new PositionInterval[subScorers.length];
+ iterators = new IntervalIterator[subScorers.length];
+ intervals = new Interval[subScorers.length];
for (int i = 0; i < subScorers.length; i++) {
// nocommit - offsets and payloads?
iterators[i] = subScorers[i].positions(false, false, false);
@@ -78,21 +78,21 @@ public final class BlockPositionIterator
this.gaps = gaps;
}
- public BlockPositionIterator(Scorer scorer, int[] gaps, boolean collectPositions, PositionIntervalIterator... iterators) {
+ public BlockIntervalIterator(Scorer scorer, int[] gaps, boolean collectPositions, IntervalIterator... iterators) {
super(scorer, collectPositions);
assert iterators.length > 1;
this.iterators = iterators;
- intervals = new PositionInterval[iterators.length];
+ intervals = new Interval[iterators.length];
lastIter = iterators.length - 1;
this.gaps = gaps;
}
- public BlockPositionIterator(Scorer scorer, boolean collectPositions, PositionIntervalIterator... iterators) {
+ public BlockIntervalIterator(Scorer scorer, boolean collectPositions, IntervalIterator... iterators) {
this(scorer, defaultGaps(iterators.length), collectPositions, iterators);
}
@Override
- public PositionInterval next() throws IOException {
+ public Interval next() throws IOException {
if ((intervals[0] = iterators[0].next()) == null) {
return null;
}
@@ -130,15 +130,15 @@ public final class BlockPositionIterator
}
@Override
- public PositionIntervalIterator[] subs(boolean inOrder) {
+ public IntervalIterator[] subs(boolean inOrder) {
return iterators;
}
@Override
- public void collect(PositionCollector collector) {
+ public void collect(IntervalCollector collector) {
assert collectPositions;
collector.collectComposite(scorer, interval, currentDoc);
- for (PositionIntervalIterator iter : iterators) {
+ for (IntervalIterator iter : iterators) {
iter.collect(collector);
}
}
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanIntervalIterator.java (from r1363191, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanPositionIterator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanIntervalIterator.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanIntervalIterator.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanPositionIterator.java&r1=1363191&r2=1363203&rev=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanPositionIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanIntervalIterator.java Thu Jul 19 02:01:47 2012
@@ -26,12 +26,12 @@ import java.util.List;
* @lucene.experimental
*/
// nocommit - javadoc
-public abstract class BooleanPositionIterator extends PositionIntervalIterator {
+public abstract class BooleanIntervalIterator extends IntervalIterator {
- protected final PositionIntervalIterator[] iterators;
+ protected final IntervalIterator[] iterators;
protected final IntervalQueue queue;
- protected BooleanPositionIterator(Scorer scorer, PositionIntervalIterator[] iterators,
+ protected BooleanIntervalIterator(Scorer scorer, IntervalIterator[] iterators,
IntervalQueue queue, boolean collectPositions) throws IOException {
super(scorer, collectPositions);
this.queue = queue;
@@ -39,16 +39,16 @@ public abstract class BooleanPositionIte
}
@Override
- public PositionIntervalIterator[] subs(boolean inOrder) {
+ public IntervalIterator[] subs(boolean inOrder) {
return iterators;
}
abstract void advance() throws IOException;
- public static PositionIntervalIterator[] pullIterators(boolean needsPayloads,
+ public static IntervalIterator[] pullIterators(boolean needsPayloads,
boolean needsOffsets, boolean collectPositions, Scorer... scorers)
throws IOException {
- PositionIntervalIterator[] iterators = new PositionIntervalIterator[scorers.length];
+ IntervalIterator[] iterators = new IntervalIterator[scorers.length];
for (int i = 0; i < scorers.length; i++) {
iterators[i] = scorers[i].positions(needsPayloads, needsOffsets,
collectPositions);
@@ -56,10 +56,10 @@ public abstract class BooleanPositionIte
return iterators;
}
- public static PositionIntervalIterator[] pullIterators(boolean needsPayloads,
+ public static IntervalIterator[] pullIterators(boolean needsPayloads,
boolean needsOffsets, boolean collectPositions, List<Scorer> scorers)
throws IOException {
- PositionIntervalIterator[] iterators = new PositionIntervalIterator[scorers.size()];
+ IntervalIterator[] iterators = new IntervalIterator[scorers.size()];
for (int i = 0; i < iterators.length; i++) {
iterators[i] = scorers.get(i).positions(needsPayloads, needsOffsets,
collectPositions);
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BrouwerianIntervalIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BrouwerianIntervalIterator.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BrouwerianIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BrouwerianIntervalIterator.java Thu Jul 19 02:01:47 2012
@@ -21,15 +21,15 @@ import org.apache.lucene.search.Scorer;
* limitations under the License.
*/
-public class BrouwerianIntervalIterator extends PositionIntervalIterator {
+public class BrouwerianIntervalIterator extends IntervalIterator {
- private final PositionIntervalIterator minuted;
- private final PositionIntervalIterator subtracted;
- private PositionInterval subtractedInterval = new PositionInterval();
- private PositionInterval currentInterval = new PositionInterval();
+ private final IntervalIterator minuted;
+ private final IntervalIterator subtracted;
+ private Interval subtractedInterval = new Interval();
+ private Interval currentInterval = new Interval();
private int secondDoc = -1;
- public BrouwerianIntervalIterator(Scorer scorer, boolean collectPositions, PositionIntervalIterator minuted, PositionIntervalIterator subtracted) {
+ public BrouwerianIntervalIterator(Scorer scorer, boolean collectPositions, IntervalIterator minuted, IntervalIterator subtracted) {
super(scorer, collectPositions);
this.minuted = minuted;
this.subtracted = subtracted;
@@ -45,7 +45,7 @@ public class BrouwerianIntervalIterator
}
@Override
- public PositionInterval next() throws IOException {
+ public Interval next() throws IOException {
if (secondDoc != currentDoc) {
return currentInterval = minuted.next();
}
@@ -60,7 +60,7 @@ public class BrouwerianIntervalIterator
}
@Override
- public void collect(PositionCollector collector) {
+ public void collect(IntervalCollector collector) {
assert collectPositions;
collector.collectComposite(scorer, currentInterval, currentDoc);
minuted.collect(collector);
@@ -68,8 +68,8 @@ public class BrouwerianIntervalIterator
}
@Override
- public PositionIntervalIterator[] subs(boolean inOrder) {
- return new PositionIntervalIterator[] {minuted, subtracted};
+ public IntervalIterator[] subs(boolean inOrder) {
+ return new IntervalIterator[] {minuted, subtracted};
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BrouwerianQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BrouwerianQuery.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BrouwerianQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BrouwerianQuery.java Thu Jul 19 02:01:47 2012
@@ -121,7 +121,7 @@ public final class BrouwerianQuery exten
class PositionFilterScorer extends Scorer {
private final Scorer other;
- private PositionIntervalIterator filter;
+ private IntervalIterator filter;
private final Scorer substracted;
public PositionFilterScorer(Weight weight, Scorer other, Scorer substacted) throws IOException {
@@ -137,7 +137,7 @@ public final class BrouwerianQuery exten
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
return new BrouwerianIntervalIterator(other, collectPositions, other.positions(needsPayloads, needsOffsets, collectPositions), substracted.positions(needsPayloads, needsOffsets, collectPositions));
}
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionIntervalIterator.java (from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionPositionIterator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionIntervalIterator.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionIntervalIterator.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionPositionIterator.java&r1=1363198&r2=1363203&rev=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionPositionIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionIntervalIterator.java Thu Jul 19 02:01:47 2012
@@ -34,20 +34,20 @@ import org.apache.lucene.util.RamUsageEs
* @lucene.experimental
*/
// nocommit - javadoc
-public final class ConjunctionPositionIterator extends BooleanPositionIterator {
+public final class ConjunctionIntervalIterator extends BooleanIntervalIterator {
private final IntervalQueueAnd queue;
private final int nrMustMatch;
private SnapshotPositionCollector snapshot;
private int rightExtremeBegin;
- public ConjunctionPositionIterator(Scorer scorer, boolean collectPositions,
- PositionIntervalIterator... iterators) throws IOException {
+ public ConjunctionIntervalIterator(Scorer scorer, boolean collectPositions,
+ IntervalIterator... iterators) throws IOException {
this(scorer, collectPositions, iterators.length, iterators);
}
- public ConjunctionPositionIterator(Scorer scorer, boolean collectPositions,
- int minimuNumShouldMatch, PositionIntervalIterator... iterators)
+ public ConjunctionIntervalIterator(Scorer scorer, boolean collectPositions,
+ int minimuNumShouldMatch, IntervalIterator... iterators)
throws IOException {
super(scorer, iterators, new IntervalQueueAnd(iterators.length),
collectPositions);
@@ -57,7 +57,7 @@ public final class ConjunctionPositionIt
void advance() throws IOException {
final IntervalRef top = queue.top();
- PositionInterval interval = null;
+ Interval interval = null;
if ((interval = iterators[top.index].next()) != null) {
top.interval = interval;
queue.updateRightExtreme(top);
@@ -68,7 +68,7 @@ public final class ConjunctionPositionIt
}
@Override
- public PositionInterval next() throws IOException {
+ public Interval next() throws IOException {
while (queue.size() >= nrMustMatch
&& queue.top().interval.begin == queue.currentCandidate.begin) {
@@ -79,7 +79,7 @@ public final class ConjunctionPositionIt
}
do {
queue.updateCurrentCandidate();
- PositionInterval top = queue.top().interval;
+ Interval top = queue.top().interval;
if (collectPositions) {
snapShotSubPositions(); // this looks odd? -> see SnapShotCollector below for
// details!
@@ -114,7 +114,7 @@ public final class ConjunctionPositionIt
continue;
}
advancedTo = currentDoc;
- final PositionInterval interval = iterators[i].next();
+ final Interval interval = iterators[i].next();
if (interval != null) {
IntervalRef intervalRef = new IntervalRef(interval, i); // TODO maybe
// reuse?
@@ -135,17 +135,17 @@ public final class ConjunctionPositionIt
collectInternal(snapshot);
}
- private void collectInternal(PositionCollector collector) {
+ private void collectInternal(IntervalCollector collector) {
assert collectPositions;
collector.collectComposite(scorer, queue.currentCandidate, currentDoc);
- for (PositionIntervalIterator iter : iterators) {
+ for (IntervalIterator iter : iterators) {
iter.collect(collector);
}
}
@Override
- public void collect(PositionCollector collector) {
+ public void collect(IntervalCollector collector) {
assert collectPositions;
if (snapshot == null) {
// we might not be initialized if the first interval matches
@@ -164,7 +164,7 @@ public final class ConjunctionPositionIt
* are required.
*/
private static final class SnapshotPositionCollector implements
- PositionCollector {
+ IntervalCollector {
private SingleSnapshot[] snapshots;
private int index = 0;
@@ -173,13 +173,13 @@ public final class ConjunctionPositionIt
}
@Override
- public void collectLeafPosition(Scorer scorer, PositionInterval interval,
+ public void collectLeafPosition(Scorer scorer, Interval interval,
int docID) {
collect(scorer, interval, docID, true);
}
- private void collect(Scorer scorer, PositionInterval interval, int docID,
+ private void collect(Scorer scorer, Interval interval, int docID,
boolean isLeaf) {
if (snapshots.length <= index) {
grow(ArrayUtil.oversize(index + 1,
@@ -195,12 +195,12 @@ public final class ConjunctionPositionIt
}
@Override
- public void collectComposite(Scorer scorer, PositionInterval interval,
+ public void collectComposite(Scorer scorer, Interval interval,
int docID) {
collect(scorer, interval, docID, false);
}
- void replay(PositionCollector collector) {
+ void replay(IntervalCollector collector) {
for (int i = 0; i < index; i++) {
SingleSnapshot singleSnapshot = snapshots[i];
if (singleSnapshot.isLeaf) {
@@ -225,11 +225,11 @@ public final class ConjunctionPositionIt
private static final class SingleSnapshot {
Scorer scorer;
- final PositionInterval interval = new PositionInterval();
+ final Interval interval = new Interval();
boolean isLeaf;
int docID;
- void set(Scorer scorer, PositionInterval interval, boolean isLeaf,
+ void set(Scorer scorer, Interval interval, boolean isLeaf,
int docID) {
this.scorer = scorer;
this.interval.copy(interval);
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionIntervalIterator.java (from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionPositionIterator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionIntervalIterator.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionIntervalIterator.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionPositionIterator.java&r1=1363198&r2=1363203&rev=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionPositionIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionIntervalIterator.java Thu Jul 19 02:01:47 2012
@@ -32,16 +32,16 @@ import org.apache.lucene.search.position
* @lucene.experimental
*/
// nocommit - javadoc
-public final class DisjunctionPositionIterator extends BooleanPositionIterator {
+public final class DisjunctionIntervalIterator extends BooleanIntervalIterator {
- public DisjunctionPositionIterator(Scorer scorer, boolean collectPositions, PositionIntervalIterator... intervals)
+ public DisjunctionIntervalIterator(Scorer scorer, boolean collectPositions, IntervalIterator... intervals)
throws IOException {
super(scorer, intervals, new IntervalQueueOr(intervals.length), collectPositions);
}
void advance() throws IOException {
final IntervalRef top = queue.top();
- PositionInterval interval = null;
+ Interval interval = null;
if ((interval = iterators[top.index].next()) != null) {
top.interval = interval;
queue.updateTop();
@@ -51,7 +51,7 @@ public final class DisjunctionPositionIt
}
@Override
- public PositionInterval next() throws IOException {
+ public Interval next() throws IOException {
while (queue.size() > 0 && queue.top().interval.begin <= queue.currentCandidate.begin) {
advance();
}
@@ -63,12 +63,12 @@ public final class DisjunctionPositionIt
}
@Override
- public PositionIntervalIterator[] subs(boolean inOrder) {
+ public IntervalIterator[] subs(boolean inOrder) {
return iterators;
}
@Override
- public void collect(PositionCollector collector) {
+ public void collect(IntervalCollector collector) {
assert collectPositions;
collector.collectComposite(scorer, queue.currentCandidate, currentDoc);
iterators[queue.top().index].collect(collector);
Added: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/Interval.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/Interval.java?rev=1363203&view=auto
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/Interval.java (added)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/Interval.java Thu Jul 19 02:01:47 2012
@@ -0,0 +1,97 @@
+package org.apache.lucene.search.positions;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.IOException;
+
+import org.apache.lucene.util.BytesRef;
+
+
+public class Interval implements Cloneable {
+
+ public int begin;
+ public int end;
+ public int offsetBegin;
+ public int offsetEnd;
+
+ public Interval(int begin, int end, int offsetBegin, int offsetEnd) {
+ this.begin = begin;
+ this.end = end;
+ this.offsetBegin = offsetBegin;
+ this.offsetEnd = offsetEnd;
+ }
+
+ public Interval() {
+ this(Integer.MIN_VALUE, Integer.MIN_VALUE, -1, -1);
+ }
+
+ public boolean lessThanExclusive(Interval other) {
+ return begin < other.begin && end < other.end;
+ }
+
+ public boolean lessThan(Interval other) {
+ return begin <= other.begin && end <= other.end;
+ }
+
+ public boolean greaterThanExclusive(Interval other) {
+ return begin > other.begin && end > other.end;
+ }
+
+ public boolean greaterThan(Interval other) {
+ return begin >= other.begin && end >= other.end;
+ }
+
+ public boolean contains(Interval other) {
+ return begin <= other.begin && other.end <= end;
+ }
+
+ public void copy(Interval other) {
+ begin = other.begin;
+ end = other.end;
+ offsetBegin = other.offsetBegin;
+ offsetEnd = other.offsetEnd;
+ }
+
+ public boolean nextPayload(BytesRef ref) throws IOException {
+ return false;
+ }
+
+ public boolean payloadAvailable() {
+ return false;
+ }
+
+ public void reset() {
+ offsetBegin = offsetEnd = -1;
+ begin = end = Integer.MIN_VALUE;
+ }
+
+ @Override
+ public Object clone() {
+ try {
+ return super.clone();
+ } catch (CloneNotSupportedException e) {
+ throw new RuntimeException(); // should not happen
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "Interval [begin=" + begin + "(" + offsetBegin + "), end="
+ + end + "(" + offsetEnd + ")]";
+ }
+
+}
\ No newline at end of file
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilterQuery.java (from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionFilterQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilterQuery.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilterQuery.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionFilterQuery.java&r1=1363198&r2=1363203&rev=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionFilterQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilterQuery.java Thu Jul 19 02:01:47 2012
@@ -21,7 +21,7 @@ import org.apache.lucene.index.AtomicRea
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
-import org.apache.lucene.search.positions.PositionIntervalIterator.PositionIntervalFilter;
+import org.apache.lucene.search.positions.IntervalIterator.IntervalFilter;
import org.apache.lucene.util.Bits;
import java.io.IOException;
@@ -31,13 +31,13 @@ import java.util.Set;
*
* @lucene.experimental
*/ // nocommit - javadoc
-public class PositionFilterQuery extends Query implements Cloneable {
+public class IntervalFilterQuery extends Query implements Cloneable {
private Query inner;
- private PositionIntervalFilter filter;
+ private IntervalFilter filter;
- public PositionFilterQuery(Query inner, PositionIntervalFilter filter) {
+ public IntervalFilterQuery(Query inner, IntervalFilter filter) {
this.inner = inner;
this.filter = filter;
}
@@ -49,11 +49,11 @@ public class PositionFilterQuery extends
@Override
public Query rewrite(IndexReader reader) throws IOException {
- PositionFilterQuery clone = null;
+ IntervalFilterQuery clone = null;
Query rewritten = inner.rewrite(reader);
if (rewritten != inner) {
- clone = (PositionFilterQuery) this.clone();
+ clone = (IntervalFilterQuery) this.clone();
clone.inner = rewritten;
}
@@ -101,7 +101,7 @@ public class PositionFilterQuery extends
@Override
public Query getQuery() {
- return PositionFilterQuery.this;
+ return IntervalFilterQuery.this;
}
@Override
@@ -118,14 +118,14 @@ public class PositionFilterQuery extends
class PositionFilterScorer extends Scorer {
private final Scorer other;
- private PositionIntervalIterator filter;
+ private IntervalIterator filter;
public PositionFilterScorer(Weight weight, Scorer other) throws IOException {
super(weight);
this.other = other;
// nocommit - offsets and payloads?
- this.filter = PositionFilterQuery.this.filter != null
- ? PositionFilterQuery.this.filter.filter(other.positions(false, false, false))
+ this.filter = IntervalFilterQuery.this.filter != null
+ ? IntervalFilterQuery.this.filter.filter(other.positions(false, false, false))
: other.positions(false, false, false);
}
@@ -135,8 +135,8 @@ public class PositionFilterQuery extends
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
- return PositionFilterQuery.this.filter != null ? PositionFilterQuery.this.filter
+ public IntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ return IntervalFilterQuery.this.filter != null ? IntervalFilterQuery.this.filter
.filter(other.positions(needsPayloads, needsOffsets, false)) : other.positions(needsPayloads, needsOffsets, false);
}
@@ -193,7 +193,7 @@ public class PositionFilterQuery extends
if (this == obj) return true;
if (!super.equals(obj)) return false;
if (getClass() != obj.getClass()) return false;
- PositionFilterQuery other = (PositionFilterQuery) obj;
+ IntervalFilterQuery other = (IntervalFilterQuery) obj;
if (filter == null) {
if (other.filter != null) return false;
} else if (!filter.equals(other.filter)) return false;
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalIterator.java (from r1363198, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionIntervalIterator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalIterator.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalIterator.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionIntervalIterator.java&r1=1363198&r2=1363203&rev=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/PositionIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalIterator.java Thu Jul 19 02:01:47 2012
@@ -17,7 +17,6 @@ package org.apache.lucene.search.positio
* limitations under the License.
*/
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.util.BytesRef;
import java.io.IOException;
@@ -26,29 +25,28 @@ import java.io.IOException;
* @lucene.experimental
*/
// nocommit - javadoc
-public abstract class PositionIntervalIterator {
+public abstract class IntervalIterator {
- public static final PositionIntervalIterator[] EMPTY = new PositionIntervalIterator[0];
- public static final PositionIntervalIterator NO_MORE_POSITIONS = new NoPositionsIntervalIterator();
+ public static final IntervalIterator[] EMPTY = new IntervalIterator[0];
+ public static final IntervalIterator NO_MORE_POSITIONS = new EmptyIntervalIterator();
public static final int NO_MORE_DOCS = Integer.MAX_VALUE;
protected int currentDoc = -1;
protected final Scorer scorer;
protected final boolean collectPositions;
- public PositionIntervalIterator(Scorer scorer, boolean collectPositions) {
+ public IntervalIterator(Scorer scorer, boolean collectPositions) {
this.scorer = scorer;
this.collectPositions = collectPositions;
}
public abstract int advanceTo(int docId) throws IOException;
- public abstract PositionInterval next() throws IOException;
+ public abstract Interval next() throws IOException;
- public abstract void collect(PositionCollector collector);
-
- public abstract PositionIntervalIterator[] subs(boolean inOrder);
+ public abstract void collect(IntervalCollector collector);
+ public abstract IntervalIterator[] subs(boolean inOrder);
public abstract int matchDistance();
@@ -60,117 +58,42 @@ public abstract class PositionIntervalIt
return scorer;
}
- public static interface PositionIntervalFilter {
- public abstract PositionIntervalIterator filter(
- PositionIntervalIterator iter);
- }
-
- public static class PositionInterval implements Cloneable {
-
- public int begin;
- public int end;
- public int offsetBegin;
- public int offsetEnd;
-
- public PositionInterval(int begin, int end, int offsetBegin, int offsetEnd) {
- this.begin = begin;
- this.end = end;
- this.offsetBegin = offsetBegin;
- this.offsetEnd = offsetEnd;
- }
-
- public PositionInterval() {
- this(Integer.MIN_VALUE, Integer.MIN_VALUE, -1, -1);
- }
-
- public boolean lessThanExclusive(PositionInterval other) {
- return begin < other.begin && end < other.end;
- }
-
- public boolean lessThan(PositionInterval other) {
- return begin <= other.begin && end <= other.end;
- }
-
- public boolean greaterThanExclusive(PositionInterval other) {
- return begin > other.begin && end > other.end;
- }
-
- public boolean greaterThan(PositionInterval other) {
- return begin >= other.begin && end >= other.end;
- }
-
- public boolean contains(PositionInterval other) {
- return begin <= other.begin && other.end <= end;
- }
-
- public void copy(PositionInterval other) {
- begin = other.begin;
- end = other.end;
- offsetBegin = other.offsetBegin;
- offsetEnd = other.offsetEnd;
- }
-
- public boolean nextPayload(BytesRef ref) throws IOException {
- return false;
- }
-
- public boolean payloadAvailable() {
- return false;
- }
-
- public void reset() {
- offsetBegin = offsetEnd = -1;
- begin = end = Integer.MIN_VALUE;
- }
-
- @Override
- public Object clone() {
- try {
- return super.clone();
- } catch (CloneNotSupportedException e) {
- throw new RuntimeException(); // should not happen
- }
- }
-
- @Override
- public String toString() {
- return "PositionInterval [begin=" + begin + "(" + offsetBegin + "), end="
- + end + "(" + offsetEnd + ")]";
- }
-
+ public static interface IntervalFilter {
+ public abstract IntervalIterator filter(
+ IntervalIterator iter);
}
- public static interface PositionCollector {
- public void collectLeafPosition(Scorer scorer, PositionInterval interval,
+ public static interface IntervalCollector {
+ public void collectLeafPosition(Scorer scorer, Interval interval,
int docID);
- public void collectComposite(Scorer scorer, PositionInterval interval,
+ public void collectComposite(Scorer scorer, Interval interval,
int docID);
}
- private static final class NoPositionsIntervalIterator extends
- PositionIntervalIterator {
+ private static final class EmptyIntervalIterator extends
+ IntervalIterator {
- public NoPositionsIntervalIterator() {
+ public EmptyIntervalIterator() {
super(null, false);
}
@Override
public int advanceTo(int docId) throws IOException {
- return PositionIntervalIterator.NO_MORE_DOCS;
+ return IntervalIterator.NO_MORE_DOCS;
}
@Override
- public PositionInterval next() throws IOException {
+ public Interval next() throws IOException {
return null;
}
@Override
- public void collect(PositionCollector collectoc) {}
+ public void collect(IntervalCollector collectoc) {}
@Override
- public PositionIntervalIterator[] subs(boolean inOrder) {
+ public IntervalIterator[] subs(boolean inOrder) {
return EMPTY;
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueue.java?rev=1363203&r1=1363202&r2=1363203&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueue.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalQueue.java Thu Jul 19 02:01:47 2012
@@ -17,7 +17,6 @@ package org.apache.lucene.search.positio
* limitations under the License.
*/
import org.apache.lucene.search.positions.IntervalQueue.IntervalRef;
-import org.apache.lucene.search.positions.PositionIntervalIterator.PositionInterval;
import org.apache.lucene.util.PriorityQueue;
/**
@@ -26,7 +25,7 @@ import org.apache.lucene.util.PriorityQu
*/
// nocommit - javadoc
abstract class IntervalQueue extends PriorityQueue<IntervalRef> {
- final PositionInterval currentCandidate = new PositionInterval(
+ final Interval currentCandidate = new Interval(
Integer.MIN_VALUE, Integer.MIN_VALUE, -1, -1);
public void reset() {
@@ -46,10 +45,10 @@ abstract class IntervalQueue extends Pri
}
final static class IntervalRef {
- PositionInterval interval;
+ Interval interval;
int index;
- IntervalRef(PositionInterval interval, int index) {
+ IntervalRef(Interval interval, int index) {
super();
this.interval = interval;
this.index = index;