Skip to content

Commit

Permalink
Geo: Fix IndexedGeoBoundingBoxFilter to not modify the bits of other …
Browse files Browse the repository at this point in the history 
…filters.

Close #8325
  • Loading branch information
@jpountz
jpountz committed Nov 3, 2014
1 parent 695cd31 commit 2b639ae
Showing 1 changed file with 15 additions and 120 deletions.
135 changes: 15 additions & 120 deletions src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,13 @@

package org.elasticsearch.index.search.geo;

import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.Filter;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.FixedBitSet;
import org.elasticsearch.ElasticsearchIllegalArgumentException;
import org.elasticsearch.common.geo.GeoPoint;
import org.elasticsearch.common.lucene.docset.DocIdSets;
import org.elasticsearch.common.lucene.search.XBooleanFilter;
import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;

import java.io.IOException;

/**
*/
public class IndexedGeoBoundingBoxFilter {
Expand All @@ -41,124 +36,24 @@ public static Filter create(GeoPoint topLeft, GeoPoint bottomRight, GeoPointFiel
}
//checks to see if bounding box crosses 180 degrees
if (topLeft.lon() > bottomRight.lon()) {
return new WestGeoBoundingBoxFilter(topLeft, bottomRight, fieldMapper);
return westGeoBoundingBoxFilter(topLeft, bottomRight, fieldMapper);
} else {
return new EastGeoBoundingBoxFilter(topLeft, bottomRight, fieldMapper);
return eastGeoBoundingBoxFilter(topLeft, bottomRight, fieldMapper);
}
}

static class WestGeoBoundingBoxFilter extends Filter {

final Filter lonFilter1;
final Filter lonFilter2;
final Filter latFilter;

public WestGeoBoundingBoxFilter(GeoPoint topLeft, GeoPoint bottomRight, GeoPointFieldMapper fieldMapper) {
lonFilter1 = fieldMapper.lonMapper().rangeFilter(null, bottomRight.lon(), true, true);
lonFilter2 = fieldMapper.lonMapper().rangeFilter(topLeft.lon(), null, true, true);
latFilter = fieldMapper.latMapper().rangeFilter(bottomRight.lat(), topLeft.lat(), true, true);
}

@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptedDocs) throws IOException {
FixedBitSet main;
DocIdSet set = lonFilter1.getDocIdSet(context, acceptedDocs);
if (DocIdSets.isEmpty(set)) {
main = null;
} else {
main = (FixedBitSet) set;
}

set = lonFilter2.getDocIdSet(context, acceptedDocs);
if (DocIdSets.isEmpty(set)) {
if (main == null) {
return null;
} else {
// nothing to do here, we remain with the main one
}
} else {
if (main == null) {
main = (FixedBitSet) set;
} else {
main.or((FixedBitSet) set);
}
}

set = latFilter.getDocIdSet(context, acceptedDocs);
if (DocIdSets.isEmpty(set)) {
return null;
}
main.and(set.iterator());
return main;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;

WestGeoBoundingBoxFilter that = (WestGeoBoundingBoxFilter) o;

if (latFilter != null ? !latFilter.equals(that.latFilter) : that.latFilter != null) return false;
if (lonFilter1 != null ? !lonFilter1.equals(that.lonFilter1) : that.lonFilter1 != null) return false;
if (lonFilter2 != null ? !lonFilter2.equals(that.lonFilter2) : that.lonFilter2 != null) return false;

return true;
}

@Override
public int hashCode() {
int result = lonFilter1 != null ? lonFilter1.hashCode() : 0;
result = 31 * result + (lonFilter2 != null ? lonFilter2.hashCode() : 0);
result = 31 * result + (latFilter != null ? latFilter.hashCode() : 0);
return result;
}
private static Filter westGeoBoundingBoxFilter(GeoPoint topLeft, GeoPoint bottomRight, GeoPointFieldMapper fieldMapper) {
XBooleanFilter filter = new XBooleanFilter();
filter.add(fieldMapper.lonMapper().rangeFilter(null, bottomRight.lon(), true, true), Occur.SHOULD);
filter.add(fieldMapper.lonMapper().rangeFilter(topLeft.lon(), null, true, true), Occur.SHOULD);
filter.add(fieldMapper.latMapper().rangeFilter(bottomRight.lat(), topLeft.lat(), true, true), Occur.MUST);
return filter;
}

static class EastGeoBoundingBoxFilter extends Filter {

final Filter lonFilter;
final Filter latFilter;

public EastGeoBoundingBoxFilter(GeoPoint topLeft, GeoPoint bottomRight, GeoPointFieldMapper fieldMapper) {
lonFilter = fieldMapper.lonMapper().rangeFilter(topLeft.lon(), bottomRight.lon(), true, true);
latFilter = fieldMapper.latMapper().rangeFilter(bottomRight.lat(), topLeft.lat(), true, true);
}

@Override
public FixedBitSet getDocIdSet(AtomicReaderContext context, Bits acceptedDocs) throws IOException {
FixedBitSet main;
DocIdSet set = lonFilter.getDocIdSet(context, acceptedDocs);
if (DocIdSets.isEmpty(set)) {
return null;
}
main = (FixedBitSet) set;
set = latFilter.getDocIdSet(context, acceptedDocs);
if (DocIdSets.isEmpty(set)) {
return null;
}
main.and(set.iterator());
return main;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;

EastGeoBoundingBoxFilter that = (EastGeoBoundingBoxFilter) o;

if (latFilter != null ? !latFilter.equals(that.latFilter) : that.latFilter != null) return false;
if (lonFilter != null ? !lonFilter.equals(that.lonFilter) : that.lonFilter != null) return false;

return true;
}

@Override
public int hashCode() {
int result = lonFilter != null ? lonFilter.hashCode() : 0;
result = 31 * result + (latFilter != null ? latFilter.hashCode() : 0);
return result;
}
private static Filter eastGeoBoundingBoxFilter(GeoPoint topLeft, GeoPoint bottomRight, GeoPointFieldMapper fieldMapper) {
XBooleanFilter filter = new XBooleanFilter();
filter.add(fieldMapper.lonMapper().rangeFilter(topLeft.lon(), bottomRight.lon(), true, true), Occur.MUST);
filter.add(fieldMapper.latMapper().rangeFilter(bottomRight.lat(), topLeft.lat(), true, true), Occur.MUST);
return filter;
}
}

0 comments on commit 2b639ae

Please sign in to comment.