You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2013/02/19 23:45:31 UTC
svn commit: r1447949 - in /lucene/dev/branches/LUCENE-2878/lucene:
core/src/java/org/apache/lucene/search/
core/src/java/org/apache/lucene/search/intervals/
core/src/java/org/apache/lucene/search/posfilter/
core/src/test/org/apache/lucene/search/ core/...
Author: romseygeek
Date: Tue Feb 19 22:45:28 2013
New Revision: 1447949
URL: http://svn.apache.org/r1447949
Log:
Re-organise a bit; move position filtered scorers/queries into posfilter package
Added:
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionQueue.java
- copied, changed from r1446112, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionQueue.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/Interval.java
- copied, changed from r1446112, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/Interval.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/NonOverlappingQuery.java
- copied, changed from r1447424, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/NonOverlappingQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/OrderedNearQuery.java
- copied, changed from r1446112, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/OrderedNearQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilterQuery.java
- copied, changed from r1447424, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScorerFilterQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilteredScorer.java
- copied, changed from r1447044, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionFilteredScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/RangeFilterQuery.java
- copied, changed from r1447086, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/RangeFilterQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/UnorderedNearQuery.java
- copied, changed from r1447060, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/UnorderedNearQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/WithinFilteredScorer.java
- copied, changed from r1446112, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/WithinFilteredScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/IntervalTestBase.java
- copied, changed from r1447060, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/IntervalTestBase.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBasicIntervals.java
- copied, changed from r1447086, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestBasicIntervals.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBlockIntervalIterator.java
- copied, changed from r1435264, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestBlockIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBrouwerianQuery.java
- copied, changed from r1446112, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestBrouwerianQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestDisjunctionIntervalIterator.java
- copied, changed from r1447060, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestDisjunctionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestExoticQueries.java
- copied, changed from r1435264, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestExoticQueries.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestIntervalScoring.java
- copied, changed from r1435264, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestIntervalScoring.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestNestedIntervalFilterQueries.java
- copied, changed from r1447938, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestNestedIntervalFilterQueries.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestPositionFilteredIntervals.java
- copied, changed from r1447086, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestPositionFilteredIntervals.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestPositionsAndOffsets.java
- copied, changed from r1447060, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestPositionsAndOffsets.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestRangeFilterQuery.java
- copied, changed from r1447086, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestRangeFilterQuery.java
Removed:
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionFilteredScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScorerFilterQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/WithinFilteredScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/Interval.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/NonOverlappingQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/OrderedNearQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/RangeFilterQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/UnorderedNearQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/
Modified:
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactIntervalPhraseScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionsCollector.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/intervals/BlockIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/BrouwerianIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/ConjunctionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/DisjunctionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalCollector.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalFilterQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueue.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueueAnd.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueueOr.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/OrderedConjunctionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/RangeIntervalFilter.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/SloppyIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/SnapshotPositionCollector.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/TermIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/WithinIntervalFilter.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/WrappedIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ArrayIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/DocAndPositions.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/HighlightingIntervalCollector.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/IntervalTokenStream.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/IntervalHighlighterTest.java
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactIntervalPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactIntervalPhraseScorer.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactIntervalPhraseScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactIntervalPhraseScorer.java Tue Feb 19 22:45:28 2013
@@ -1,6 +1,6 @@
package org.apache.lucene.search;
-import org.apache.lucene.search.intervals.Interval;
+import org.apache.lucene.search.posfilter.Interval;
import org.apache.lucene.search.intervals.IntervalIterator;
import org.apache.lucene.search.similarities.Similarity;
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionQueue.java (from r1446112, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionQueue.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionQueue.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionQueue.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionQueue.java&r1=1446112&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionQueue.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionQueue.java Tue Feb 19 22:45:28 2013
@@ -1,7 +1,7 @@
package org.apache.lucene.search;
import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.search.intervals.Interval;
+import org.apache.lucene.search.posfilter.Interval;
import org.apache.lucene.util.PriorityQueue;
import java.io.IOException;
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionsCollector.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionsCollector.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionsCollector.java Tue Feb 19 22:45:28 2013
@@ -2,7 +2,7 @@ package org.apache.lucene.search;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.search.intervals.Interval;
+import org.apache.lucene.search.posfilter.Interval;
import java.io.IOException;
import java.util.ArrayList;
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=1447949&r1=1447948&r2=1447949&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 Tue Feb 19 22:45:28 2013
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.intervals.Interval;
+import org.apache.lucene.search.posfilter.Interval;
import org.apache.lucene.search.intervals.IntervalCollector;
import org.apache.lucene.search.intervals.IntervalIterator;
import org.apache.lucene.search.intervals.SloppyIntervalIterator;
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/BlockIntervalIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/BlockIntervalIterator.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/BlockIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/BlockIntervalIterator.java Tue Feb 19 22:45:28 2013
@@ -17,6 +17,7 @@ package org.apache.lucene.search.interva
* limitations under the License.
*/
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.posfilter.Interval;
import java.io.IOException;
import java.util.Arrays;
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/BrouwerianIntervalIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/BrouwerianIntervalIterator.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/BrouwerianIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/BrouwerianIntervalIterator.java Tue Feb 19 22:45:28 2013
@@ -1,6 +1,7 @@
package org.apache.lucene.search.intervals;
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.posfilter.Interval;
import java.io.IOException;
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/ConjunctionIntervalIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/ConjunctionIntervalIterator.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/ConjunctionIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/ConjunctionIntervalIterator.java Tue Feb 19 22:45:28 2013
@@ -18,6 +18,7 @@ package org.apache.lucene.search.interva
*/
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.intervals.IntervalQueue.IntervalRef;
+import org.apache.lucene.search.posfilter.Interval;
import java.io.IOException;
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/DisjunctionIntervalIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/DisjunctionIntervalIterator.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/DisjunctionIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/DisjunctionIntervalIterator.java Tue Feb 19 22:45:28 2013
@@ -18,6 +18,7 @@ package org.apache.lucene.search.interva
*/
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.intervals.IntervalQueue.IntervalRef;
+import org.apache.lucene.search.posfilter.Interval;
import java.io.IOException;
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalCollector.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalCollector.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalCollector.java Tue Feb 19 22:45:28 2013
@@ -18,9 +18,10 @@ package org.apache.lucene.search.interva
*/
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.posfilter.Interval;
/**
- * Used for collecting matching {@link Interval}s from a search
+ * Used for collecting matching {@link org.apache.lucene.search.posfilter.Interval}s from a search
*/
public interface IntervalCollector {
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalFilterQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalFilterQuery.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalFilterQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalFilterQuery.java Tue Feb 19 22:45:28 2013
@@ -29,6 +29,7 @@ import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.TermStatistics;
import org.apache.lucene.search.Weight;
import org.apache.lucene.search.Weight.PostingFeatures;
+import org.apache.lucene.search.posfilter.Interval;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.Bits;
@@ -40,9 +41,9 @@ import java.util.TreeSet;
* A Query that filters the results of an inner {@link Query} using an
* {@link IntervalFilter}.
*
- * @see OrderedNearQuery
- * @see UnorderedNearQuery
- * @see NonOverlappingQuery
+ * @see org.apache.lucene.search.posfilter.OrderedNearQuery
+ * @see org.apache.lucene.search.posfilter.UnorderedNearQuery
+ * @see org.apache.lucene.search.posfilter.NonOverlappingQuery
*
* @lucene.experimental
*/
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalIterator.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalIterator.java Tue Feb 19 22:45:28 2013
@@ -17,11 +17,12 @@ package org.apache.lucene.search.interva
* limitations under the License.
*/
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.posfilter.Interval;
import java.io.IOException;
/**
- * Iterator over the matching {@link Interval}s of a {@link Scorer}
+ * Iterator over the matching {@link org.apache.lucene.search.posfilter.Interval}s of a {@link Scorer}
*
* @lucene.experimental
*/
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueue.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueue.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueue.java Tue Feb 19 22:45:28 2013
@@ -17,6 +17,7 @@ package org.apache.lucene.search.interva
* limitations under the License.
*/
import org.apache.lucene.search.intervals.IntervalQueue.IntervalRef;
+import org.apache.lucene.search.posfilter.Interval;
import org.apache.lucene.util.PriorityQueue;
/**
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueueAnd.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueueAnd.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueueAnd.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueueAnd.java Tue Feb 19 22:45:28 2013
@@ -16,6 +16,8 @@ package org.apache.lucene.search.interva
* limitations under the License.
*/
+import org.apache.lucene.search.posfilter.Interval;
+
/**
* Queue class for calculating minimal spanning conjunction intervals
* @lucene.experimental
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueueOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueueOr.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueueOr.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalQueueOr.java Tue Feb 19 22:45:28 2013
@@ -15,6 +15,9 @@ package org.apache.lucene.search.interva
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import org.apache.lucene.search.posfilter.Interval;
+
/**
* Queue class for calculating minimal spanning disjunct intervals
* @lucene.experimental
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/OrderedConjunctionIntervalIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/OrderedConjunctionIntervalIterator.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/OrderedConjunctionIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/OrderedConjunctionIntervalIterator.java Tue Feb 19 22:45:28 2013
@@ -17,6 +17,7 @@ package org.apache.lucene.search.interva
* limitations under the License.
*/
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.posfilter.Interval;
import java.io.IOException;
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/RangeIntervalFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/RangeIntervalFilter.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/RangeIntervalFilter.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/RangeIntervalFilter.java Tue Feb 19 22:45:28 2013
@@ -16,6 +16,8 @@ package org.apache.lucene.search.interva
* limitations under the License.
*/
+import org.apache.lucene.search.posfilter.Interval;
+
import java.io.IOException;
/**
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/SloppyIntervalIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/SloppyIntervalIterator.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/SloppyIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/SloppyIntervalIterator.java Tue Feb 19 22:45:28 2013
@@ -17,6 +17,7 @@ package org.apache.lucene.search.interva
* limitations under the License.
*/
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.posfilter.Interval;
import java.io.IOException;
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/SnapshotPositionCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/SnapshotPositionCollector.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/SnapshotPositionCollector.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/SnapshotPositionCollector.java Tue Feb 19 22:45:28 2013
@@ -18,6 +18,7 @@ package org.apache.lucene.search.interva
*/
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.posfilter.Interval;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.RamUsageEstimator;
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/TermIntervalIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/TermIntervalIterator.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/TermIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/TermIntervalIterator.java Tue Feb 19 22:45:28 2013
@@ -18,6 +18,7 @@ package org.apache.lucene.search.interva
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.posfilter.Interval;
import java.io.IOException;
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/WithinIntervalFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/WithinIntervalFilter.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/WithinIntervalFilter.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/WithinIntervalFilter.java Tue Feb 19 22:45:28 2013
@@ -15,6 +15,8 @@ package org.apache.lucene.search.interva
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+import org.apache.lucene.search.posfilter.Interval;
+
import java.io.IOException;
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/WrappedIntervalIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/WrappedIntervalIterator.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/WrappedIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/WrappedIntervalIterator.java Tue Feb 19 22:45:28 2013
@@ -1,5 +1,7 @@
package org.apache.lucene.search.intervals;
+import org.apache.lucene.search.posfilter.Interval;
+
import java.io.IOException;
/*
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/Interval.java (from r1446112, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/Interval.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/Interval.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/Interval.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/Interval.java&r1=1446112&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/Interval.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/Interval.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/NonOverlappingQuery.java (from r1447424, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/NonOverlappingQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/NonOverlappingQuery.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/NonOverlappingQuery.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/NonOverlappingQuery.java&r1=1447424&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/NonOverlappingQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/NonOverlappingQuery.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,10 +21,8 @@ import org.apache.lucene.index.AtomicRea
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.PositionFilteredScorer;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.ScorerFilterQuery;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.Bits;
@@ -60,9 +58,9 @@ import java.util.Set;
* >"Efficient Optimally Lazy Algorithms for Minimal-Interval Semantics"</a>
*
* @lucene.experimental
- * @see BrouwerianIntervalIterator
+ * @see org.apache.lucene.search.intervals.BrouwerianIntervalIterator
*/
-public final class NonOverlappingQuery extends ScorerFilterQuery {
+public final class NonOverlappingQuery extends PositionFilterQuery {
private Query subtrahend;
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/OrderedNearQuery.java (from r1446112, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/OrderedNearQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/OrderedNearQuery.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/OrderedNearQuery.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/OrderedNearQuery.java&r1=1446112&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/OrderedNearQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/OrderedNearQuery.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,11 +17,8 @@ package org.apache.lucene.search.interva
* limitations under the License.
*/
-import org.apache.lucene.search.PositionFilteredScorer;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.ScorerFilterQuery;
-import org.apache.lucene.search.WithinFilteredScorer;
import java.io.IOException;
@@ -39,7 +36,7 @@ import java.io.IOException;
* @lucene.experimental
*/
-public class OrderedNearQuery extends ScorerFilterQuery {
+public class OrderedNearQuery extends PositionFilterQuery {
/**
* Constructs an OrderedNearQuery
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilterQuery.java (from r1447424, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScorerFilterQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilterQuery.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilterQuery.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScorerFilterQuery.java&r1=1447424&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScorerFilterQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilterQuery.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search;
+package org.apache.lucene.search.posfilter;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,6 +21,15 @@ import org.apache.lucene.index.AtomicRea
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermContext;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.ComplexExplanation;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.TermStatistics;
+import org.apache.lucene.search.Weight;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.Bits;
@@ -28,12 +37,12 @@ import java.io.IOException;
import java.util.Set;
import java.util.TreeSet;
-public class ScorerFilterQuery extends Query {
+public class PositionFilterQuery extends Query {
protected final Query innerQuery;
protected final ScorerFilterFactory scorerFilterFactory;
- public ScorerFilterQuery(Query innerQuery, ScorerFilterFactory scorerFilterFactory) {
+ public PositionFilterQuery(Query innerQuery, ScorerFilterFactory scorerFilterFactory) {
this.innerQuery = innerQuery;
this.scorerFilterFactory = scorerFilterFactory;
}
@@ -55,7 +64,7 @@ public class ScorerFilterQuery extends Q
public Query rewrite(IndexReader reader) throws IOException {
Query rewritten = innerQuery.rewrite(reader);
if (rewritten != innerQuery) {
- return new ScorerFilterQuery(rewritten, scorerFilterFactory);
+ return new PositionFilterQuery(rewritten, scorerFilterFactory);
}
return this;
}
@@ -123,7 +132,7 @@ public class ScorerFilterQuery extends Q
@Override
public Query getQuery() {
- return ScorerFilterQuery.this;
+ return PositionFilterQuery.this;
}
@Override
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilteredScorer.java (from r1447044, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionFilteredScorer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilteredScorer.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilteredScorer.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionFilteredScorer.java&r1=1447044&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PositionFilteredScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilteredScorer.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search;
+package org.apache.lucene.search.posfilter;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,7 +17,8 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.search.intervals.Interval;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.posfilter.Interval;
import java.io.IOException;
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/RangeFilterQuery.java (from r1447086, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/RangeFilterQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/RangeFilterQuery.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/RangeFilterQuery.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/RangeFilterQuery.java&r1=1447086&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/RangeFilterQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/RangeFilterQuery.java Tue Feb 19 22:45:28 2013
@@ -1,9 +1,7 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
-import org.apache.lucene.search.PositionFilteredScorer;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.ScorerFilterQuery;
import java.io.IOException;
@@ -23,7 +21,7 @@ import java.io.IOException;
* limitations under the License.
*/
-public class RangeFilterQuery extends ScorerFilterQuery {
+public class RangeFilterQuery extends PositionFilterQuery {
public RangeFilterQuery(int start, int end, Query innerQuery) {
super(innerQuery, new RangeFilterScorerFactory(start, end));
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/UnorderedNearQuery.java (from r1447060, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/UnorderedNearQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/UnorderedNearQuery.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/UnorderedNearQuery.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/UnorderedNearQuery.java&r1=1447060&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/UnorderedNearQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/UnorderedNearQuery.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/**
* Copyright (c) 2012 Lemur Consulting Ltd.
@@ -17,12 +17,9 @@ package org.apache.lucene.search.interva
*/
import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.search.PositionFilteredScorer;
import org.apache.lucene.search.PositionQueue;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.ScorerFilterQuery;
-import org.apache.lucene.search.WithinFilteredScorer;
import java.io.IOException;
@@ -40,7 +37,7 @@ import java.io.IOException;
* @lucene.experimental
*/
-public class UnorderedNearQuery extends ScorerFilterQuery {
+public class UnorderedNearQuery extends PositionFilterQuery {
/**
* Constructs an OrderedNearQuery
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/WithinFilteredScorer.java (from r1446112, lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/WithinFilteredScorer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/WithinFilteredScorer.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/WithinFilteredScorer.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/WithinFilteredScorer.java&r1=1446112&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/WithinFilteredScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/posfilter/WithinFilteredScorer.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search;
+package org.apache.lucene.search.posfilter;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java Tue Feb 19 22:45:28 2013
@@ -32,7 +32,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.Weight.PostingFeatures;
-import org.apache.lucene.search.intervals.Interval;
+import org.apache.lucene.search.posfilter.Interval;
import org.apache.lucene.search.intervals.IntervalIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/IntervalTestBase.java (from r1447060, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/IntervalTestBase.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/IntervalTestBase.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/IntervalTestBase.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/IntervalTestBase.java&r1=1447060&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/IntervalTestBase.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/IntervalTestBase.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
@@ -14,6 +14,7 @@ import org.apache.lucene.search.Position
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.posfilter.Interval;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.junit.After;
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBasicIntervals.java (from r1447086, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestBasicIntervals.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBasicIntervals.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBasicIntervals.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestBasicIntervals.java&r1=1447086&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestBasicIntervals.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBasicIntervals.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBlockIntervalIterator.java (from r1435264, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestBlockIntervalIterator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBlockIntervalIterator.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBlockIntervalIterator.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestBlockIntervalIterator.java&r1=1435264&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestBlockIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBlockIntervalIterator.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -23,6 +23,8 @@ import org.apache.lucene.search.BooleanC
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.intervals.BlockIntervalFilter;
+import org.apache.lucene.search.intervals.IntervalFilterQuery;
import java.io.IOException;
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBrouwerianQuery.java (from r1446112, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestBrouwerianQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBrouwerianQuery.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBrouwerianQuery.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestBrouwerianQuery.java&r1=1446112&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestBrouwerianQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBrouwerianQuery.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -20,6 +20,9 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.posfilter.NonOverlappingQuery;
+import org.apache.lucene.search.posfilter.OrderedNearQuery;
+import org.apache.lucene.search.posfilter.UnorderedNearQuery;
import java.io.IOException;
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestDisjunctionIntervalIterator.java (from r1447060, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestDisjunctionIntervalIterator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestDisjunctionIntervalIterator.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestDisjunctionIntervalIterator.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestDisjunctionIntervalIterator.java&r1=1447060&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestDisjunctionIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestDisjunctionIntervalIterator.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,43 +58,6 @@ public class TestDisjunctionIntervalIter
}
}
- public void testDisjunctionOverConjunctions() throws IOException {
-
- BooleanQuery conj1 = new BooleanQuery();
- conj1.add(makeTermQuery("hot!"), Occur.MUST);
- conj1.add(makeTermQuery("porridge"), Occur.MUST);
-
- BooleanQuery conj2 = new BooleanQuery();
- conj2.add(makeTermQuery("fox"), Occur.MUST);
- conj2.add(makeTermQuery("porridge"), Occur.MUST);
-
- BooleanQuery disj = new BooleanQuery();
- disj.add(conj1, Occur.SHOULD);
- disj.add(conj2, Occur.SHOULD);
-
- checkIntervals(disj, searcher, new int[][]{
- { 0, 1, 1, 2, 2, 4, 4, 32, 32, 33, 33, 35, 35 },
- { 1, 4, 4, 5, 5, 7, 7, 35, 35, 36, 36 },
- { 2, 3, 3, 8, 8 },
- });
-
- }
-
- public void testDisjunctionRangePositionsBooleanQuery() throws IOException {
-
- BooleanQuery query = new BooleanQuery();
- query.add(new BooleanClause(new TermQuery(new Term("field", "porridge")), Occur.SHOULD));
- query.add(new BooleanClause(new TermQuery(new Term("field", "pease")), Occur.SHOULD));
- query.add(new BooleanClause(new TermQuery(new Term("field", "hot!")), Occur.SHOULD));
-
- IntervalFilterQuery rangeFilter = new IntervalFilterQuery(query, new RangeIntervalFilter(0, 2));
- checkIntervals(rangeFilter, searcher, new int[][]{
- { 0, 0, 0, 1, 1, 2, 2 },
- { 1, 0, 0, 1, 1 }
- });
-
- }
-
public void testDisjunctionPartialMatchQuery() throws IOException {
BooleanQuery query = new BooleanQuery();
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestExoticQueries.java (from r1435264, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestExoticQueries.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestExoticQueries.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestExoticQueries.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestExoticQueries.java&r1=1435264&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestExoticQueries.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestExoticQueries.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestIntervalScoring.java (from r1435264, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestIntervalScoring.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestIntervalScoring.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestIntervalScoring.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestIntervalScoring.java&r1=1435264&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestIntervalScoring.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestIntervalScoring.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,6 +23,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.search.RegexpQuery;
import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.posfilter.OrderedNearQuery;
import org.junit.Assert;
import java.io.IOException;
@@ -55,7 +56,7 @@ public class TestIntervalScoring extends
OrderedNearQuery q = new OrderedNearQuery(10, new RegexpQuery(new Term("field", "bar.*")),
new RegexpQuery(new Term("field", "foo.*")));
TopDocs docs = searcher.search(q, 10);
- Assert.assertEquals(docs.totalHits, 0);
+ assertEquals(docs.totalHits, 0);
}
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestNestedIntervalFilterQueries.java (from r1447938, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestNestedIntervalFilterQueries.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestNestedIntervalFilterQueries.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestNestedIntervalFilterQueries.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestNestedIntervalFilterQueries.java&r1=1447938&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestNestedIntervalFilterQueries.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestNestedIntervalFilterQueries.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,6 +23,8 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.posfilter.OrderedNearQuery;
+import org.apache.lucene.search.posfilter.UnorderedNearQuery;
import java.io.IOException;
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestPositionFilteredIntervals.java (from r1447086, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestPositionFilteredIntervals.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestPositionFilteredIntervals.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestPositionFilteredIntervals.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestPositionFilteredIntervals.java&r1=1447086&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestPositionFilteredIntervals.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestPositionFilteredIntervals.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,6 +23,8 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.posfilter.OrderedNearQuery;
+import org.apache.lucene.search.posfilter.UnorderedNearQuery;
import java.io.IOException;
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestPositionsAndOffsets.java (from r1447060, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestPositionsAndOffsets.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestPositionsAndOffsets.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestPositionsAndOffsets.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestPositionsAndOffsets.java&r1=1447060&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestPositionsAndOffsets.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestPositionsAndOffsets.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Copied: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestRangeFilterQuery.java (from r1447086, lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestRangeFilterQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestRangeFilterQuery.java?p2=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestRangeFilterQuery.java&p1=lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestRangeFilterQuery.java&r1=1447086&r2=1447949&rev=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/intervals/TestRangeFilterQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestRangeFilterQuery.java Tue Feb 19 22:45:28 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.intervals;
+package org.apache.lucene.search.posfilter;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,6 +21,8 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.posfilter.OrderedNearQuery;
+import org.apache.lucene.search.posfilter.RangeFilterQuery;
import org.junit.Test;
import java.io.IOException;
Modified: lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ArrayIntervalIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ArrayIntervalIterator.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ArrayIntervalIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ArrayIntervalIterator.java Tue Feb 19 22:45:28 2013
@@ -19,7 +19,7 @@ package org.apache.lucene.search.highlig
import java.io.IOException;
-import org.apache.lucene.search.intervals.Interval;
+import org.apache.lucene.search.posfilter.Interval;
import org.apache.lucene.search.intervals.IntervalCollector;
import org.apache.lucene.search.intervals.IntervalIterator;
Modified: lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/DocAndPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/DocAndPositions.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/DocAndPositions.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/DocAndPositions.java Tue Feb 19 22:45:28 2013
@@ -20,7 +20,7 @@ package org.apache.lucene.search.highlig
import java.util.Comparator;
import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.intervals.Interval;
+import org.apache.lucene.search.posfilter.Interval;
import org.apache.lucene.util.ArrayUtil;
/** Used to accumulate position intervals while scoring
Modified: lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/HighlightingIntervalCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/HighlightingIntervalCollector.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/HighlightingIntervalCollector.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/HighlightingIntervalCollector.java Tue Feb 19 22:45:28 2013
@@ -22,7 +22,7 @@ import org.apache.lucene.index.AtomicRea
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight.PostingFeatures;
-import org.apache.lucene.search.intervals.Interval;
+import org.apache.lucene.search.posfilter.Interval;
import org.apache.lucene.search.intervals.IntervalCollector;
import org.apache.lucene.search.intervals.IntervalIterator;
Modified: lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/IntervalTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/IntervalTokenStream.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/IntervalTokenStream.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/IntervalTokenStream.java Tue Feb 19 22:45:28 2013
@@ -23,7 +23,7 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.search.intervals.Interval;
+import org.apache.lucene.search.posfilter.Interval;
import org.apache.lucene.search.intervals.IntervalIterator;
/**
Modified: lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/IntervalHighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/IntervalHighlighterTest.java?rev=1447949&r1=1447948&r2=1447949&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/IntervalHighlighterTest.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/IntervalHighlighterTest.java Tue Feb 19 22:45:28 2013
@@ -51,8 +51,8 @@ import org.apache.lucene.search.interval
import org.apache.lucene.search.intervals.IntervalFilter;
import org.apache.lucene.search.intervals.IntervalFilterQuery;
import org.apache.lucene.search.intervals.IntervalIterator;
-import org.apache.lucene.search.intervals.NonOverlappingQuery;
-import org.apache.lucene.search.intervals.OrderedNearQuery;
+import org.apache.lucene.search.posfilter.NonOverlappingQuery;
+import org.apache.lucene.search.posfilter.OrderedNearQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;