Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-5692: Deprecate DisjointSpatialFilter; RPT stops using it 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1608488 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Wayne Smiley 2014-07-07 15:31:03 +00:00
parent 685a445a1b
commit 5396b19e2a
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/CHANGES.txt
View File

@ -1,4 +1,3 @@
Lucene Change Log
For more information on past and future Lucene versions, please see:
@ -84,6 +83,9 @@ API Changes
takes the same selectors. Add helper methods to DocValues.java that are better
suited for search code (never return null, etc). (Mike McCandless, Robert Muir)
* LUCENE-5692: DisjointSpatialFilter is deprecated and RecursivePrefixTreeStrategy
no longer supports this predicate. (David Smiley)
Documentation
* LUCENE-5392: Add/improve analysis package documentation to reflect

3
lucene/spatial/src/java/org/apache/lucene/spatial/DisjointSpatialFilter.java
View File

@ -38,7 +38,10 @@ import java.io.IOException;
* a way to invert a query shape.
*
* @lucene.experimental
*
* @deprecated See https://issues.apache.org/jira/browse/LUCENE-5692
*/
@Deprecated
public class DisjointSpatialFilter extends Filter {
private final String field;//maybe null

3
lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java
View File

@ -21,7 +21,6 @@ import com.spatial4j.core.shape.Point;
import com.spatial4j.core.shape.Shape;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.search.Filter;
import org.apache.lucene.spatial.DisjointSpatialFilter;
import org.apache.lucene.spatial.prefix.tree.Cell;
import org.apache.lucene.spatial.prefix.tree.CellIterator;
import org.apache.lucene.spatial.prefix.tree.LegacyCell;
@ -165,8 +164,6 @@ public class RecursivePrefixTreeStrategy extends PrefixTreeStrategy {
@Override
public Filter makeFilter(SpatialArgs args) {
final SpatialOperation op = args.getOperation();
if (op == SpatialOperation.IsDisjointTo)
return new DisjointSpatialFilter(this, args, getFieldName());
Shape shape = args.getShape();
int detailLevel = grid.getLevelForDistance(args.resolveDistErr(ctx, distErrPct));

7
lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java
View File

@ -148,13 +148,6 @@ public class RandomSpatialOpFuzzyPrefixTreeTest extends StrategyTestCase {
doTest(SpatialOperation.Contains);
}
@Test
@Repeat(iterations = ITERATIONS)
public void testDisjoint() throws IOException {
setupGrid(-1);
doTest(SpatialOperation.IsDisjointTo);
}
/** See LUCENE-5062, {@link ContainsPrefixTreeFilter#multiOverlappingIndexedShapes}. */
@Test
public void testContainsPairOverlap() throws IOException {