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/14 15:22:06 UTC
svn commit: r1361540 [2/2] - 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...
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestPositionOffsets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestPositionOffsets.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestPositionOffsets.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestPositionOffsets.java Sat Jul 14 13:22:04 2012
@@ -112,7 +112,7 @@ public class TestPositionOffsets extends
int nextDoc = scorer.nextDoc();
assertEquals(0, nextDoc);
- PositionIntervalIterator positions = scorer.positions(false, true);
+ PositionIntervalIterator positions = scorer.positions(false, true, false);
int[] startOffsets = new int[] { 6, 26, 47, 164, 184 };
int[] endOffsets = new int[] { 14, 34, 55, 172, 192 };
@@ -148,7 +148,7 @@ public class TestPositionOffsets extends
int nextDoc = scorer.nextDoc();
assertEquals(0, nextDoc);
- PositionIntervalIterator positions = scorer.positions(false, false);
+ PositionIntervalIterator positions = scorer.positions(false, false, false);
int[] startOffsets = new int[] { -1, -1, -1, -1, -1 };
int[] endOffsets = new int[] { -1, -1, -1, -1, -1 };
@@ -186,7 +186,7 @@ public class TestPositionOffsets extends
int nextDoc = scorer.nextDoc();
assertEquals(0, nextDoc);
- PositionIntervalIterator positions = scorer.positions(false, true);
+ PositionIntervalIterator positions = scorer.positions(false, true, false);
int[] startOffsetsConj = new int[] { 6, 26, 47, 67, 143};
int[] endOffsetsConj = new int[] { 71, 71, 71, 172, 172};
assertEquals(0, positions.advanceTo(nextDoc));
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestSimplePositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestSimplePositions.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestSimplePositions.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestSimplePositions.java Sat Jul 14 13:22:04 2012
@@ -194,7 +194,7 @@ public class TestSimplePositions extends
Scorer scorer = createWeight.scorer(r.getTopReaderContext(), random()
.nextBoolean(), true, r.getLiveDocs());
- PositionIntervalIterator positions = scorer.positions(false, false);
+ PositionIntervalIterator positions = scorer.positions(false, false, false);
positions.advanceTo(11);
PositionInterval interval = positions.next();
assertNotNull("first range", interval);
@@ -222,7 +222,7 @@ public class TestSimplePositions extends
@Override
public PositionIntervalIterator filter(PositionIntervalIterator iter) {
return new WithinPositionIterator(slop,
- new OrderedConjunctionPositionIterator(iter));
+ new OrderedConjunctionPositionIterator(false, iter));
}
}
@@ -231,7 +231,7 @@ public class TestSimplePositions extends
@Override
public PositionIntervalIterator filter(PositionIntervalIterator iter) {
- return new BlockPositionIterator(iter);
+ return new BlockPositionIterator(false, iter);
}
}
@@ -248,7 +248,7 @@ public class TestSimplePositions extends
Scorer scorer = createWeight.scorer(r.getTopReaderContext(), random()
.nextBoolean(), true, r.getLiveDocs());
- PositionIntervalIterator positions = scorer.positions(false, false);
+ PositionIntervalIterator positions = scorer.positions(false, false, false);
positions.advanceTo(4);
PositionInterval interval = positions.next();
assertNotNull("Does not have next and it should", interval);
@@ -306,7 +306,7 @@ public class TestSimplePositions extends
Scorer scorer = createWeight.scorer(r.getTopReaderContext(), random()
.nextBoolean(), true, r.getLiveDocs());
- PositionIntervalIterator iterator = scorer.positions(false, false);
+ PositionIntervalIterator iterator = scorer.positions(false, false, false);
iterator.advanceTo(4);
PositionInterval interval = iterator.next();
assertNotNull("Does not have next and it should", interval);
@@ -380,7 +380,7 @@ public class TestSimplePositions extends
Scorer scorer = createWeight.scorer(r.getTopReaderContext(), random()
.nextBoolean(), true, r.getLiveDocs());
- return scorer.positions(false, false);
+ return scorer.positions(false, false, false);
}
private PositionIntervalIterator tstNextPosition(
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java Sat Jul 14 13:22:04 2012
@@ -105,7 +105,7 @@ public class TestNearSpansOrdered extend
@Override
public PositionIntervalIterator filter(PositionIntervalIterator iter) {
return new WithinPositionIterator(slop,
- new OrderedConjunctionPositionIterator(iter));
+ new OrderedConjunctionPositionIterator(false, iter));
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java Sat Jul 14 13:22:04 2012
@@ -234,7 +234,7 @@ public class TestSpans extends LuceneTes
}
@Override
public PositionIntervalIterator filter(PositionIntervalIterator iter) {
- return new WithinPositionIterator(slop, new OrderedConjunctionPositionIterator(iter));
+ return new WithinPositionIterator(slop, new OrderedConjunctionPositionIterator(false, iter));
// return new OrderedConjunctionPositionIterator(iter);
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java Sat Jul 14 13:22:04 2012
@@ -126,7 +126,7 @@ public class BlockGroupingCollector exte
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+ public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
throw new UnsupportedOperationException();
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PosCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PosCollector.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PosCollector.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PosCollector.java Sat Jul 14 13:22:04 2012
@@ -1,5 +1,5 @@
package org.apache.lucene.search.poshighlight;
-/**
+/*
* 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.
@@ -52,7 +52,7 @@ public class PosCollector extends Collec
docs[count-1].score=scorer.score();
positions.advanceTo(doc);
while(positions.next() != null) {
- positions.collect();
+ positions.collect(this);
}
}
@@ -71,8 +71,7 @@ public class PosCollector extends Collec
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
- positions = scorer.positions(false, true);
- positions.setPositionCollector(this);
+ positions = scorer.positions(false, true, true);
// If we want to visit the other scorers, we can, here...
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PosTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PosTokenStream.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PosTokenStream.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PosTokenStream.java Sat Jul 14 13:22:04 2012
@@ -1,6 +1,6 @@
package org.apache.lucene.search.poshighlight;
-/**
+/*
* 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.
Modified: lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PositionIntervalArrayIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PositionIntervalArrayIterator.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PositionIntervalArrayIterator.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/PositionIntervalArrayIterator.java Sat Jul 14 13:22:04 2012
@@ -1,6 +1,6 @@
package org.apache.lucene.search.poshighlight;
-/**
+/*
* 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.
@@ -32,7 +32,7 @@ public class PositionIntervalArrayIterat
private PositionInterval[] positions;
public PositionIntervalArrayIterator (PositionInterval[] positions, int count) {
- super(null);
+ super(null, false);
this.positions = positions;
this.count = count;
}
@@ -50,7 +50,8 @@ public class PositionIntervalArrayIterat
}
@Override
- public void collect() {
+ public void collect(PositionCollector collector) {
+ assert collectPositions;
}
@Override
Modified: lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/ScorePosDoc.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/ScorePosDoc.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/ScorePosDoc.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/poshighlight/ScorePosDoc.java Sat Jul 14 13:22:04 2012
@@ -1,6 +1,6 @@
package org.apache.lucene.search.poshighlight;
-/**
+/*
* 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.
Modified: lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/poshighlight/PosHighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/poshighlight/PosHighlighterTest.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/poshighlight/PosHighlighterTest.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/poshighlight/PosHighlighterTest.java Sat Jul 14 13:22:04 2012
@@ -373,7 +373,7 @@ public class PosHighlighterTest extends
@Override
public PositionIntervalIterator filter(PositionIntervalIterator iter) {
- return new BlockPositionIterator(iter);
+ return new BlockPositionIterator(true, iter);
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java Sat Jul 14 13:22:04 2012
@@ -212,7 +212,7 @@ class TermsIncludingScoreQuery extends Q
@Override
public PositionIntervalIterator positions(boolean needsPayloads,
- boolean needsOffsets) throws IOException {
+ boolean needsOffsets, boolean collectPositions) throws IOException {
throw new UnsupportedOperationException();
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java Sat Jul 14 13:22:04 2012
@@ -288,8 +288,8 @@ public class ToChildBlockJoinQuery exten
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException { // nocommit is that correct here?
- return parentScorer.positions(needsPayloads, needsOffsets);
+ public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException { // nocommit is that correct here?
+ return parentScorer.positions(needsPayloads, needsOffsets, false);
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java Sat Jul 14 13:22:04 2012
@@ -345,7 +345,7 @@ public class ToParentBlockJoinCollector
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+ public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
throw new UnsupportedOperationException();
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java Sat Jul 14 13:22:04 2012
@@ -403,7 +403,7 @@ public class ToParentBlockJoinQuery exte
@Override
public PositionIntervalIterator positions(boolean needsPayloads,
- boolean needsOffsets) throws IOException {
+ boolean needsOffsets, boolean collectPositions) throws IOException {
throw new UnsupportedOperationException();
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java Sat Jul 14 13:22:04 2012
@@ -337,8 +337,8 @@ public class CustomScoreQuery extends Qu
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
- return subQueryScorer.positions(needsPayloads, needsOffsets);
+ public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ return subQueryScorer.positions(needsPayloads, needsOffsets, false);
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java Sat Jul 14 13:22:04 2012
@@ -179,8 +179,8 @@ public class BoostedQuery extends Query
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
- return scorer.positions(needsPayloads, needsOffsets);
+ public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
+ return scorer.positions(needsPayloads, needsOffsets, false);
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java Sat Jul 14 13:22:04 2012
@@ -172,7 +172,7 @@ public class FunctionQuery extends Query
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+ public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
throw new UnsupportedOperationException();
//nocommit - is that correct here?
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java Sat Jul 14 13:22:04 2012
@@ -85,7 +85,7 @@ public class ValueSourceScorer extends S
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+ public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
throw new UnsupportedOperationException();
//nocommit - is that correct here?
}
Modified: lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/LatLonType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/LatLonType.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/LatLonType.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/LatLonType.java Sat Jul 14 13:22:04 2012
@@ -507,7 +507,7 @@ class SpatialDistanceQuery extends Exten
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+ public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
throw new UnsupportedOperationException();
}
}
Modified: lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java Sat Jul 14 13:22:04 2012
@@ -540,9 +540,9 @@ class JoinQuery extends Query {
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+ public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
if (iter instanceof Scorer) {
- return ((Scorer) iter).positions(needsPayloads, needsOffsets);
+ return ((Scorer) iter).positions(needsPayloads, needsOffsets, false);
}
throw new UnsupportedOperationException("Positions are only supported for Scorers");
Modified: lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java?rev=1361540&r1=1361539&r2=1361540&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java Sat Jul 14 13:22:04 2012
@@ -194,9 +194,9 @@ public class SolrConstantScoreQuery exte
}
@Override
- public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets) throws IOException {
+ public PositionIntervalIterator positions(boolean needsPayloads, boolean needsOffsets, boolean collectPositions) throws IOException {
if (docIdSetIterator instanceof Scorer) {
- return ((Scorer) docIdSetIterator).positions(needsPayloads, needsOffsets);
+ return ((Scorer) docIdSetIterator).positions(needsPayloads, needsOffsets, false);
}
throw new UnsupportedOperationException("Positions are only supported for Scorers");
}