You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2014/07/07 17:31:04 UTC
svn commit: r1608488 - in /lucene/dev/trunk/lucene: ./
spatial/src/java/org/apache/lucene/spatial/
spatial/src/java/org/apache/lucene/spatial/prefix/
spatial/src/test/org/apache/lucene/spatial/prefix/
Author: dsmiley
Date: Mon Jul 7 15:31:03 2014
New Revision: 1608488
URL: http://svn.apache.org/r1608488
Log:
LUCENE-5692: Deprecate DisjointSpatialFilter; RPT stops using it
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/DisjointSpatialFilter.java
lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java
lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1608488&r1=1608487&r2=1608488&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon Jul 7 15:31:03 2014
@@ -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
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/DisjointSpatialFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/DisjointSpatialFilter.java?rev=1608488&r1=1608487&r2=1608488&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/DisjointSpatialFilter.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/DisjointSpatialFilter.java Mon Jul 7 15:31:03 2014
@@ -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
Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java?rev=1608488&r1=1608487&r2=1608488&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java Mon Jul 7 15:31:03 2014
@@ -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
@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));
Modified: lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java?rev=1608488&r1=1608487&r2=1608488&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java Mon Jul 7 15:31:03 2014
@@ -148,13 +148,6 @@ public class RandomSpatialOpFuzzyPrefixT
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 {