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

LUCENE-5692: Removed deprecated DisjointSpatialFilter on trunk. Moved CHANGES.txt deprecation note to 4.10 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1608501 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Wayne Smiley 2014-07-07 15:49:50 +00:00
parent 5396b19e2a
commit d76c4cbef0
2 changed files with 3 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lucene/CHANGES.txt
View File

@ -83,9 +83,6 @@ 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
@ -113,6 +110,9 @@ API Changes
* LUCENE-5793: Add equals/hashCode to FieldType. (Shay Banon, Robert Muir)
* LUCENE-5692: DisjointSpatialFilter is deprecated (used by RecursivePrefixTreeStrategy)
(David Smiley)
Optimizations
* LUCENE-5780: Make OrdinalMap more memory-efficient, especially in case the

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

@ -1,117 +0,0 @@
package org.apache.lucene.spatial;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.queries.ChainedFilter;
import org.apache.lucene.search.BitsFilteredDocIdSet;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter;
import org.apache.lucene.spatial.query.SpatialArgs;
import org.apache.lucene.spatial.query.SpatialOperation;
import org.apache.lucene.util.Bits;
import java.io.IOException;
/**
* A Spatial Filter implementing {@link SpatialOperation#IsDisjointTo} in terms
* of a {@link SpatialStrategy}'s support for {@link SpatialOperation#Intersects}.
* A document is considered disjoint if it has spatial data that does not
* intersect with the query shape. Another way of looking at this is that it's
* 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
private final Filter intersectsFilter;
/**
*
* @param strategy Needed to compute intersects
* @param args Used in spatial intersection
* @param field This field is used to determine which docs have spatial data via
* {@link AtomicReader#getDocsWithField(String)}.
* Passing null will assume all docs have spatial data.
*/
public DisjointSpatialFilter(SpatialStrategy strategy, SpatialArgs args, String field) {
this.field = field;
// TODO consider making SpatialArgs cloneable
SpatialOperation origOp = args.getOperation();//copy so we can restore
args.setOperation(SpatialOperation.Intersects);//temporarily set to intersects
intersectsFilter = strategy.makeFilter(args);
args.setOperation(origOp);//restore so it looks like it was
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
DisjointSpatialFilter that = (DisjointSpatialFilter) o;
if (field != null ? !field.equals(that.field) : that.field != null)
return false;
if (!intersectsFilter.equals(that.intersectsFilter)) return false;
return true;
}
@Override
public int hashCode() {
int result = field != null ? field.hashCode() : 0;
result = 31 * result + intersectsFilter.hashCode();
return result;
}
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, final Bits acceptDocs) throws IOException {
Bits docsWithField;
if (field == null) {
docsWithField = null;//all docs
} else {
//NOTE By using the FieldCache we re-use a cache
// which is nice but loading it in this way might be slower than say using an
// intersects filter against the world bounds. So do we add a method to the
// strategy, perhaps? But the strategy can't cache it.
docsWithField = DocValues.getDocsWithField(context.reader(), field);
final int maxDoc = context.reader().maxDoc();
if (docsWithField.length() != maxDoc )
throw new IllegalStateException("Bits length should be maxDoc ("+maxDoc+") but wasn't: "+docsWithField);
if (docsWithField instanceof Bits.MatchNoBits) {
return null;//match nothing
} else if (docsWithField instanceof Bits.MatchAllBits) {
docsWithField = null;//all docs
}
}
//not so much a chain but a way to conveniently invert the Filter
DocIdSet docIdSet = new ChainedFilter(new Filter[]{intersectsFilter}, ChainedFilter.ANDNOT).getDocIdSet(context, acceptDocs);
return BitsFilteredDocIdSet.wrap(docIdSet, docsWithField);
}
}