honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Geo Overhaul (work with multiple locations), closes #414.

This commit is contained in:
kimchy 2010-10-08 22:31:21 +02:00
parent 523a8b4c3e
commit 6314c2460c
38 changed files with 745 additions and 511 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/geo/GeoBoundingBoxFilter.java
View File

@ -24,8 +24,9 @@ import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.elasticsearch.common.lucene.docset.GetDocSet; import org.elasticsearch.common.lucene.docset.GetDocSet;
import org.elasticsearch.index.cache.field.data.FieldDataCache; import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.mapper.xcontent.geo.GeoPoint;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldData;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldDataType;
import java.io.IOException; import java.io.IOException;
@ -38,20 +39,14 @@ public class GeoBoundingBoxFilter extends Filter {
private final Point bottomRight; private final Point bottomRight;
private final String latFieldName; private final String fieldName;
private final String lonFieldName;
private final FieldDataType fieldDataType;
private final FieldDataCache fieldDataCache; private final FieldDataCache fieldDataCache;
public GeoBoundingBoxFilter(Point topLeft, Point bottomRight, String latFieldName, String lonFieldName, FieldDataType fieldDataType, FieldDataCache fieldDataCache) { public GeoBoundingBoxFilter(Point topLeft, Point bottomRight, String fieldName, FieldDataCache fieldDataCache) {
this.topLeft = topLeft; this.topLeft = topLeft;
this.bottomRight = bottomRight; this.bottomRight = bottomRight;
this.latFieldName = latFieldName; this.fieldName = fieldName;
this.lonFieldName = lonFieldName;
this.fieldDataType = fieldDataType;
this.fieldDataCache = fieldDataCache; this.fieldDataCache = fieldDataCache;
} }
@ -63,55 +58,46 @@ public class GeoBoundingBoxFilter extends Filter {
return bottomRight; return bottomRight;
} }
public String latFieldName() { public String fieldName() {
return latFieldName; return fieldName;
}
public String lonFieldName() {
return lonFieldName;
} }
@Override public DocIdSet getDocIdSet(IndexReader reader) throws IOException { @Override public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
final NumericFieldData latFieldData = (NumericFieldData) fieldDataCache.cache(fieldDataType, reader, latFieldName); final GeoPointFieldData fieldData = (GeoPointFieldData) fieldDataCache.cache(GeoPointFieldDataType.TYPE, reader, fieldName);
final NumericFieldData lonFieldData = (NumericFieldData) fieldDataCache.cache(fieldDataType, reader, lonFieldName);
//checks to see if bounding box crosses 180 degrees //checks to see if bounding box crosses 180 degrees
if (topLeft.lon > bottomRight.lon) { if (topLeft.lon > bottomRight.lon) {
return new GetDocSet(reader.maxDoc()) { return new GetDocSet(reader.maxDoc()) {
@Override public boolean get(int doc) throws IOException { @Override public boolean get(int doc) throws IOException {
if (!latFieldData.hasValue(doc) || !lonFieldData.hasValue(doc)) { if (!fieldData.hasValue(doc)) {
return false; return false;
} }
if (latFieldData.multiValued()) { if (fieldData.multiValued()) {
double[] lats = latFieldData.doubleValues(doc); GeoPoint[] points = fieldData.values(doc);
double[] lons = latFieldData.doubleValues(doc); for (GeoPoint point : points) {
for (int i = 0; i < lats.length; i++) { if (point.lon() < 0) {
double lat = lats[i]; if (-180.0 <= point.lon() && bottomRight.lon >= point.lon()
double lon = lons[i]; && topLeft.lat >= point.lat() && bottomRight.lat <= point.lat()) {
if (lon < 0) {
if (-180.0 <= lon && bottomRight.lon >= lon
&& topLeft.lat >= lat && bottomRight.lat <= lat) {
return true; return true;
} }
} else { } else {
if (topLeft.lon <= lon && 180 >= lon if (topLeft.lon <= point.lon() && 180 >= point.lon()
&& topLeft.lat >= lat && bottomRight.lat <= lat) { && topLeft.lat >= point.lat() && bottomRight.lat <= point.lat()) {
return true; return true;
} }
} }
} }
} else { } else {
double lat = latFieldData.doubleValue(doc); GeoPoint point = fieldData.value(doc);
double lon = lonFieldData.doubleValue(doc); if (point.lon() < 0) {
if (lon < 0) { if (-180.0 <= point.lon() && bottomRight.lon >= point.lon()
if (-180.0 <= lon && bottomRight.lon >= lon && topLeft.lat >= point.lat() && bottomRight.lat <= point.lat()) {
&& topLeft.lat >= lat && bottomRight.lat <= lat) {
return true; return true;
} }
} else { } else {
if (topLeft.lon <= lon && 180 >= lon if (topLeft.lon <= point.lon() && 180 >= point.lon()
&& topLeft.lat >= lat && bottomRight.lat <= lat) { && topLeft.lat >= point.lat() && bottomRight.lat <= point.lat()) {
return true; return true;
} }
} }
@ -122,25 +108,23 @@ public class GeoBoundingBoxFilter extends Filter {
} else { } else {
return new GetDocSet(reader.maxDoc()) { return new GetDocSet(reader.maxDoc()) {
@Override public boolean get(int doc) throws IOException { @Override public boolean get(int doc) throws IOException {
if (!latFieldData.hasValue(doc) || !lonFieldData.hasValue(doc)) { if (!fieldData.hasValue(doc)) {
return false; return false;
} }
if (latFieldData.multiValued()) { if (fieldData.multiValued()) {
double[] lats = latFieldData.doubleValues(doc); GeoPoint[] points = fieldData.values(doc);
double[] lons = latFieldData.doubleValues(doc); for (GeoPoint point : points) {
for (int i = 0; i < lats.length; i++) { if (topLeft.lon <= point.lon() && bottomRight.lon >= point.lon()
if (topLeft.lon <= lons[i] && bottomRight.lon >= lons[i] && topLeft.lat >= point.lat() && bottomRight.lat <= point.lat()) {
&& topLeft.lat >= lats[i] && bottomRight.lat <= lats[i]) {
return true; return true;
} }
} }
} else { } else {
double lat = latFieldData.doubleValue(doc); GeoPoint point = fieldData.value(doc);
double lon = lonFieldData.doubleValue(doc);
if (topLeft.lon <= lon && bottomRight.lon >= lon if (topLeft.lon <= point.lon() && bottomRight.lon >= point.lon()
&& topLeft.lat >= lat && bottomRight.lat <= lat) { && topLeft.lat >= point.lat() && bottomRight.lat <= point.lat()) {
return true; return true;
} }
} }

41
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/geo/GeoDistanceDataComparator.java
View File

@ -25,11 +25,11 @@ import org.apache.lucene.search.FieldComparatorSource;
import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.index.cache.field.data.FieldDataCache; import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.xcontent.GeoPointFieldMapper; import org.elasticsearch.index.mapper.xcontent.geo.GeoPoint;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldData;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldDataType;
import java.io.IOException; import java.io.IOException;
@ -78,9 +78,7 @@ public class GeoDistanceDataComparator extends FieldComparator {
protected final String fieldName; protected final String fieldName;
protected final String indexLatFieldName; protected final String indexFieldName;
protected final String indexLonFieldName;
protected final double lat; protected final double lat;
@ -92,11 +90,7 @@ public class GeoDistanceDataComparator extends FieldComparator {
protected final FieldDataCache fieldDataCache; protected final FieldDataCache fieldDataCache;
protected final FieldDataType fieldDataType; protected GeoPointFieldData fieldData;
protected NumericFieldData latFieldData;
protected NumericFieldData lonFieldData;
private final double[] values; private final double[] values;
@ -113,23 +107,18 @@ public class GeoDistanceDataComparator extends FieldComparator {
this.geoDistance = geoDistance; this.geoDistance = geoDistance;
this.fieldDataCache = fieldDataCache; this.fieldDataCache = fieldDataCache;
FieldMapper mapper = mapperService.smartNameFieldMapper(fieldName + GeoPointFieldMapper.Names.LAT_SUFFIX); FieldMapper mapper = mapperService.smartNameFieldMapper(fieldName);
if (mapper == null) { if (mapper == null) {
throw new ElasticSearchIllegalArgumentException("No mapping found for field [" + fieldName + "] for geo distance sort"); throw new ElasticSearchIllegalArgumentException("No mapping found for field [" + fieldName + "] for geo distance sort");
} }
this.indexLatFieldName = mapper.names().indexName(); if (mapper.fieldDataType() != GeoPointFieldDataType.TYPE) {
throw new ElasticSearchIllegalArgumentException("field [" + fieldName + "] is not a geo_point field");
mapper = mapperService.smartNameFieldMapper(fieldName + GeoPointFieldMapper.Names.LON_SUFFIX);
if (mapper == null) {
throw new ElasticSearchIllegalArgumentException("No mapping found for field [" + fieldName + "] for geo distance sort");
} }
this.indexLonFieldName = mapper.names().indexName(); this.indexFieldName = mapper.names().indexName();
this.fieldDataType = mapper.fieldDataType();
} }
@Override public void setNextReader(IndexReader reader, int docBase) throws IOException { @Override public void setNextReader(IndexReader reader, int docBase) throws IOException {
latFieldData = (NumericFieldData) fieldDataCache.cache(fieldDataType, reader, indexLatFieldName); fieldData = (GeoPointFieldData) fieldDataCache.cache(GeoPointFieldDataType.TYPE, reader, indexFieldName);
lonFieldData = (NumericFieldData) fieldDataCache.cache(fieldDataType, reader, indexLonFieldName);
} }
@Override public int compare(int slot1, int slot2) { @Override public int compare(int slot1, int slot2) {
@ -146,11 +135,12 @@ public class GeoDistanceDataComparator extends FieldComparator {
@Override public int compareBottom(int doc) { @Override public int compareBottom(int doc) {
double distance; double distance;
if (!latFieldData.hasValue(doc) || !lonFieldData.hasValue(doc)) { if (!fieldData.hasValue(doc)) {
// is this true? push this to the "end" // is this true? push this to the "end"
distance = Double.MAX_VALUE; distance = Double.MAX_VALUE;
} else { } else {
distance = geoDistance.calculate(lat, lon, latFieldData.doubleValue(doc), lonFieldData.doubleValue(doc), unit); GeoPoint point = fieldData.value(doc);
distance = geoDistance.calculate(lat, lon, point.lat(), point.lon(), unit);
} }
final double v2 = distance; final double v2 = distance;
if (bottom > v2) { if (bottom > v2) {
@ -164,11 +154,12 @@ public class GeoDistanceDataComparator extends FieldComparator {
@Override public void copy(int slot, int doc) { @Override public void copy(int slot, int doc) {
double distance; double distance;
if (!latFieldData.hasValue(doc) || !lonFieldData.hasValue(doc)) { if (!fieldData.hasValue(doc)) {
// is this true? push this to the "end" // is this true? push this to the "end"
distance = Double.MAX_VALUE; distance = Double.MAX_VALUE;
} else { } else {
distance = geoDistance.calculate(lat, lon, latFieldData.doubleValue(doc), lonFieldData.doubleValue(doc), unit); GeoPoint point = fieldData.value(doc);
distance = geoDistance.calculate(lat, lon, point.lat(), point.lon(), unit);
} }
values[slot] = distance; values[slot] = distance;
} }

61
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/geo/GeoDistanceFilter.java
View File

@ -25,8 +25,9 @@ import org.apache.lucene.search.Filter;
import org.elasticsearch.common.lucene.docset.GetDocSet; import org.elasticsearch.common.lucene.docset.GetDocSet;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.index.cache.field.data.FieldDataCache; import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.mapper.xcontent.geo.GeoPoint;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldData;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldDataType;
import java.io.IOException; import java.io.IOException;
@ -43,23 +44,16 @@ public class GeoDistanceFilter extends Filter {
private final GeoDistance geoDistance; private final GeoDistance geoDistance;
private final String latFieldName; private final String fieldName;
private final String lonFieldName;
private final FieldDataType fieldDataType;
private final FieldDataCache fieldDataCache; private final FieldDataCache fieldDataCache;
public GeoDistanceFilter(double lat, double lon, double distance, GeoDistance geoDistance, String latFieldName, String lonFieldName, public GeoDistanceFilter(double lat, double lon, double distance, GeoDistance geoDistance, String fieldName, FieldDataCache fieldDataCache) {
FieldDataType fieldDataType, FieldDataCache fieldDataCache) {
this.lat = lat; this.lat = lat;
this.lon = lon; this.lon = lon;
this.distance = distance; this.distance = distance;
this.geoDistance = geoDistance; this.geoDistance = geoDistance;
this.latFieldName = latFieldName; this.fieldName = fieldName;
this.lonFieldName = lonFieldName;
this.fieldDataType = fieldDataType;
this.fieldDataCache = fieldDataCache; this.fieldDataCache = fieldDataCache;
} }
@ -79,39 +73,34 @@ public class GeoDistanceFilter extends Filter {
return geoDistance; return geoDistance;
} }
public String latFieldName() { public String fieldName() {
return latFieldName; return fieldName;
}
public String lonFieldName() {
return lonFieldName;
} }
@Override public DocIdSet getDocIdSet(IndexReader reader) throws IOException { @Override public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
final NumericFieldData latFieldData = (NumericFieldData) fieldDataCache.cache(fieldDataType, reader, latFieldName); final GeoPointFieldData fieldData = (GeoPointFieldData) fieldDataCache.cache(GeoPointFieldDataType.TYPE, reader, fieldName);
final NumericFieldData lonFieldData = (NumericFieldData) fieldDataCache.cache(fieldDataType, reader, lonFieldName);
return new GetDocSet(reader.maxDoc()) { return new GetDocSet(reader.maxDoc()) {
@Override public boolean isCacheable() { @Override public boolean isCacheable() {
return false; return false;
} }
@Override public boolean get(int doc) throws IOException { @Override public boolean get(int doc) throws IOException {
if (!latFieldData.hasValue(doc) || !lonFieldData.hasValue(doc)) { if (!fieldData.hasValue(doc)) {
return false; return false;
} }
if (latFieldData.multiValued()) { if (fieldData.multiValued()) {
double[] lats = latFieldData.doubleValues(doc); GeoPoint[] points = fieldData.values(doc);
double[] lons = latFieldData.doubleValues(doc); for (GeoPoint point : points) {
for (int i = 0; i < lats.length; i++) { double d = geoDistance.calculate(lat, lon, point.lat(), point.lon(), DistanceUnit.MILES);
double d = geoDistance.calculate(lat, lon, lats[i], lons[i], DistanceUnit.MILES);
if (d < distance) { if (d < distance) {
return true; return true;
} }
} }
return false; return false;
} else { } else {
double d = geoDistance.calculate(lat, lon, latFieldData.doubleValue(doc), lonFieldData.doubleValue(doc), DistanceUnit.MILES); GeoPoint point = fieldData.value(doc);
double d = geoDistance.calculate(lat, lon, point.lat(), point.lon(), DistanceUnit.MILES);
return d < distance; return d < distance;
} }
} }
@ -123,16 +112,13 @@ public class GeoDistanceFilter extends Filter {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
GeoDistanceFilter that = (GeoDistanceFilter) o; GeoDistanceFilter filter = (GeoDistanceFilter) o;
if (Double.compare(that.distance, distance) != 0) return false; if (Double.compare(filter.distance, distance) != 0) return false;
if (Double.compare(that.lat, lat) != 0) return false; if (Double.compare(filter.lat, lat) != 0) return false;
if (Double.compare(that.lon, lon) != 0) return false; if (Double.compare(filter.lon, lon) != 0) return false;
if (geoDistance != that.geoDistance) return false; if (fieldName != null ? !fieldName.equals(filter.fieldName) : filter.fieldName != null) return false;
if (latFieldName != null ? !latFieldName.equals(that.latFieldName) : that.latFieldName != null) if (geoDistance != filter.geoDistance) return false;
return false;
if (lonFieldName != null ? !lonFieldName.equals(that.lonFieldName) : that.lonFieldName != null)
return false;
return true; return true;
} }
@ -148,8 +134,7 @@ public class GeoDistanceFilter extends Filter {
temp = distance != +0.0d ? Double.doubleToLongBits(distance) : 0L; temp = distance != +0.0d ? Double.doubleToLongBits(distance) : 0L;
result = 31 * result + (int) (temp ^ (temp >>> 32)); result = 31 * result + (int) (temp ^ (temp >>> 32));
result = 31 * result + (geoDistance != null ? geoDistance.hashCode() : 0); result = 31 * result + (geoDistance != null ? geoDistance.hashCode() : 0);
result = 31 * result + (latFieldName != null ? latFieldName.hashCode() : 0); result = 31 * result + (fieldName != null ? fieldName.hashCode() : 0);
result = 31 * result + (lonFieldName != null ? lonFieldName.hashCode() : 0);
return result; return result;
} }
} }

8
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/geo/GeoHashUtils.java
View File

@ -113,7 +113,9 @@ public class GeoHashUtils {
} }
public static double[] decode(String geohash) { public static double[] decode(String geohash) {
return decode(geohash, new double[2]); double[] ret = new double[2];
decode(geohash, ret);
return ret;
} }
/** /**
@ -122,7 +124,7 @@ public class GeoHashUtils {
* @param geohash Geohash to deocde * @param geohash Geohash to deocde
* @return Array with the latitude at index 0, and longitude at index 1 * @return Array with the latitude at index 0, and longitude at index 1
*/ */
public static double[] decode(String geohash, double[] ret) { public static void decode(String geohash, double[] ret) {
// double[] latInterval = {-90.0, 90.0}; // double[] latInterval = {-90.0, 90.0};
// double[] lngInterval = {-180.0, 180.0}; // double[] lngInterval = {-180.0, 180.0};
double latInterval0 = -90.0; double latInterval0 = -90.0;
@ -162,6 +164,6 @@ public class GeoHashUtils {
// longitude = (lngInterval[0] + lngInterval[1]) / 2D; // longitude = (lngInterval[0] + lngInterval[1]) / 2D;
ret[1] = (lngInterval0 + lngInterval1) / 2D; ret[1] = (lngInterval0 + lngInterval1) / 2D;
return ret; // return ret;
} }
} }

44
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/geo/GeoPolygonFilter.java
View File

@ -24,8 +24,9 @@ import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.elasticsearch.common.lucene.docset.GetDocSet; import org.elasticsearch.common.lucene.docset.GetDocSet;
import org.elasticsearch.index.cache.field.data.FieldDataCache; import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.mapper.xcontent.geo.GeoPoint;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldData;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldDataType;
import java.io.IOException; import java.io.IOException;
@ -36,19 +37,13 @@ public class GeoPolygonFilter extends Filter {
private final Point[] points; private final Point[] points;
private final String latFieldName; private final String fieldName;
private final String lonFieldName;
private final FieldDataType fieldDataType;
private final FieldDataCache fieldDataCache; private final FieldDataCache fieldDataCache;
public GeoPolygonFilter(Point[] points, String latFieldName, String lonFieldName, FieldDataType fieldDataType, FieldDataCache fieldDataCache) { public GeoPolygonFilter(Point[] points, String fieldName, FieldDataCache fieldDataCache) {
this.points = points; this.points = points;
this.latFieldName = latFieldName; this.fieldName = fieldName;
this.lonFieldName = lonFieldName;
this.fieldDataType = fieldDataType;
this.fieldDataCache = fieldDataCache; this.fieldDataCache = fieldDataCache;
} }
@ -56,36 +51,29 @@ public class GeoPolygonFilter extends Filter {
return points; return points;
} }
public String latFieldName() { public String fieldName() {
return latFieldName; return this.fieldName;
}
public String lonFieldName() {
return lonFieldName;
} }
@Override public DocIdSet getDocIdSet(IndexReader reader) throws IOException { @Override public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
final NumericFieldData latFieldData = (NumericFieldData) fieldDataCache.cache(fieldDataType, reader, latFieldName); final GeoPointFieldData fieldData = (GeoPointFieldData) fieldDataCache.cache(GeoPointFieldDataType.TYPE, reader, fieldName);
final NumericFieldData lonFieldData = (NumericFieldData) fieldDataCache.cache(fieldDataType, reader, lonFieldName);
return new GetDocSet(reader.maxDoc()) { return new GetDocSet(reader.maxDoc()) {
@Override public boolean get(int doc) throws IOException { @Override public boolean get(int doc) throws IOException {
if (!latFieldData.hasValue(doc) || !lonFieldData.hasValue(doc)) { if (!fieldData.hasValue(doc)) {
return false; return false;
} }
if (latFieldData.multiValued()) { if (fieldData.multiValued()) {
double[] lats = latFieldData.doubleValues(doc); GeoPoint[] docPoints = fieldData.values(doc);
double[] lons = latFieldData.doubleValues(doc); for (GeoPoint docPoint : docPoints) {
for (int i = 0; i < lats.length; i++) { if (pointInPolygon(points, docPoint.lat(), docPoint.lon())) {
if (pointInPolygon(points, lats[i], lons[i])) {
return true; return true;
} }
} }
} else { } else {
double lat = latFieldData.doubleValue(doc); GeoPoint point = fieldData.value(doc);
double lon = lonFieldData.doubleValue(doc); return pointInPolygon(points, point.lat(), point.lon());
return pointInPolygon(points, lat, lon);
} }
return false; return false;
} }

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldData.java
View File

@ -20,9 +20,7 @@
package org.elasticsearch.index.field.data; package org.elasticsearch.index.field.data;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.FieldComparator;
import org.elasticsearch.common.thread.ThreadLocals; import org.elasticsearch.common.thread.ThreadLocals;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import java.io.IOException; import java.io.IOException;
@ -89,8 +87,6 @@ public abstract class FieldData<Doc extends DocFieldData> {
*/ */
public abstract FieldDataType type(); public abstract FieldDataType type();
public abstract FieldComparator newComparator(FieldDataCache fieldDataCache, int numHits, String field, int sortPos, boolean reversed);
public static FieldData load(FieldDataType type, IndexReader reader, String fieldName) throws IOException { public static FieldData load(FieldDataType type, IndexReader reader, String fieldName) throws IOException {
return type.load(reader, fieldName); return type.load(reader, fieldName);
} }

6
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldData.java
View File

@ -21,9 +21,7 @@ package org.elasticsearch.index.field.data.doubles;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldComparator;
import org.elasticsearch.common.trove.TDoubleArrayList; import org.elasticsearch.common.trove.TDoubleArrayList;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.field.data.support.FieldDataLoader; import org.elasticsearch.index.field.data.support.FieldDataLoader;
@ -44,10 +42,6 @@ public abstract class DoubleFieldData extends NumericFieldData<DoubleDocFieldDat
this.values = values; this.values = values;
} }
@Override public FieldComparator newComparator(FieldDataCache fieldDataCache, int numHits, String field, int sortPos, boolean reversed) {
return new DoubleFieldDataComparator(numHits, field, fieldDataCache);
}
abstract public double value(int docId); abstract public double value(int docId);
abstract public double[] values(int docId); abstract public double[] values(int docId);

6
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldData.java
View File

@ -21,9 +21,7 @@ package org.elasticsearch.index.field.data.floats;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldComparator;
import org.elasticsearch.common.trove.TFloatArrayList; import org.elasticsearch.common.trove.TFloatArrayList;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.field.data.support.FieldDataLoader; import org.elasticsearch.index.field.data.support.FieldDataLoader;
@ -44,10 +42,6 @@ public abstract class FloatFieldData extends NumericFieldData<FloatDocFieldData>
this.values = values; this.values = values;
} }
@Override public FieldComparator newComparator(FieldDataCache fieldDataCache, int numHits, String field, int sortPos, boolean reversed) {
return new FloatFieldDataComparator(numHits, field, fieldDataCache);
}
abstract public float value(int docId); abstract public float value(int docId);
abstract public float[] values(int docId); abstract public float[] values(int docId);

6
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldData.java
View File

@ -21,9 +21,7 @@ package org.elasticsearch.index.field.data.ints;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldComparator;
import org.elasticsearch.common.trove.TIntArrayList; import org.elasticsearch.common.trove.TIntArrayList;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.field.data.support.FieldDataLoader; import org.elasticsearch.index.field.data.support.FieldDataLoader;
@ -44,10 +42,6 @@ public abstract class IntFieldData extends NumericFieldData<IntDocFieldData> {
this.values = values; this.values = values;
} }
@Override public FieldComparator newComparator(FieldDataCache fieldDataCache, int numHits, String field, int sortPos, boolean reversed) {
return new IntFieldDataComparator(numHits, field, fieldDataCache);
}
abstract public int value(int docId); abstract public int value(int docId);
abstract public int[] values(int docId); abstract public int[] values(int docId);

6
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldData.java
View File

@ -21,11 +21,9 @@ package org.elasticsearch.index.field.data.longs;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldComparator;
import org.elasticsearch.common.joda.time.MutableDateTime; import org.elasticsearch.common.joda.time.MutableDateTime;
import org.elasticsearch.common.thread.ThreadLocals; import org.elasticsearch.common.thread.ThreadLocals;
import org.elasticsearch.common.trove.TLongArrayList; import org.elasticsearch.common.trove.TLongArrayList;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.field.data.support.FieldDataLoader; import org.elasticsearch.index.field.data.support.FieldDataLoader;
@ -53,10 +51,6 @@ public abstract class LongFieldData extends NumericFieldData<LongDocFieldData> {
this.values = values; this.values = values;
} }
@Override public FieldComparator newComparator(FieldDataCache fieldDataCache, int numHits, String field, int sortPos, boolean reversed) {
return new LongFieldDataComparator(numHits, field, fieldDataCache);
}
abstract public long value(int docId); abstract public long value(int docId);
abstract public long[] values(int docId); abstract public long[] values(int docId);

6
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldData.java
View File

@ -21,9 +21,7 @@ package org.elasticsearch.index.field.data.shorts;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldComparator;
import org.elasticsearch.common.trove.TShortArrayList; import org.elasticsearch.common.trove.TShortArrayList;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.field.data.support.FieldDataLoader; import org.elasticsearch.index.field.data.support.FieldDataLoader;
@ -44,10 +42,6 @@ public abstract class ShortFieldData extends NumericFieldData<ShortDocFieldData>
this.values = values; this.values = values;
} }
@Override public FieldComparator newComparator(FieldDataCache fieldDataCache, int numHits, String field, int sortPos, boolean reversed) {
return new ShortFieldDataComparator(numHits, field, fieldDataCache);
}
abstract public short value(int docId); abstract public short value(int docId);
abstract public short[] values(int docId); abstract public short[] values(int docId);

6
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java
View File

@ -19,10 +19,8 @@
package org.elasticsearch.index.field.data.strings; package org.elasticsearch.index.field.data.strings;
import org.apache.lucene.search.FieldComparator;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.thread.ThreadLocals; import org.elasticsearch.common.thread.ThreadLocals;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
/** /**
* @author kimchy (shay.banon) * @author kimchy (shay.banon)
@ -49,10 +47,6 @@ public class MultiValueStringFieldData extends StringFieldData {
this.order = order; this.order = order;
} }
@Override public FieldComparator newComparator(FieldDataCache fieldDataCache, int numHits, String field, int sortPos, boolean reversed) {
return new StringValFieldDataComparator(numHits, field, fieldDataCache);
}
@Override public boolean multiValued() { @Override public boolean multiValued() {
return true; return true;
} }

6
modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/SingleValueStringFieldData.java
View File

@ -19,10 +19,8 @@
package org.elasticsearch.index.field.data.strings; package org.elasticsearch.index.field.data.strings;
import org.apache.lucene.search.FieldComparator;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.thread.ThreadLocals; import org.elasticsearch.common.thread.ThreadLocals;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
/** /**
* @author kimchy (shay.banon) * @author kimchy (shay.banon)
@ -43,10 +41,6 @@ public class SingleValueStringFieldData extends StringFieldData {
this.order = order; this.order = order;
} }
@Override public FieldComparator newComparator(FieldDataCache fieldDataCache, int numHits, String field, int sortPos, boolean reversed) {
return new StringOrdValFieldDataComparator(numHits, field, sortPos, reversed, fieldDataCache);
}
int[] order() { int[] order() {
return order; return order;
} }

1
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDocumentMapperParser.java
View File

@ -35,6 +35,7 @@ import org.elasticsearch.index.analysis.AnalysisService;
import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.DocumentMapperParser;
import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MapperParsingException;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldMapper;
import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.settings.IndexSettings;
import javax.annotation.Nullable; import javax.annotation.Nullable;

61
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/geo/GeoPoint.java Normal file
View File

@ -0,0 +1,61 @@
/*
* Licensed to Elastic Search and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Elastic Search 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.
*/
package org.elasticsearch.index.mapper.xcontent.geo;
import org.elasticsearch.common.lucene.geo.GeoHashUtils;
/**
* @author kimchy (shay.banon)
*/
public class GeoPoint {
private final double lat;
private final double lon;
public GeoPoint(double lat, double lon) {
this.lat = lat;
this.lon = lon;
}
public final double lat() {
return this.lat;
}
public final double getLat() {
return this.lat;
}
public final double lon() {
return this.lon;
}
public final double getLon() {
return this.lon;
}
public final String geohash() {
return GeoHashUtils.encode(lat, lon);
}
public final String getGeohash() {
return GeoHashUtils.encode(lat, lon);
}
}

40
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/geo/GeoPointDocFieldData.java Normal file
View File

@ -0,0 +1,40 @@
/*
* Licensed to Elastic Search and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Elastic Search 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.
*/
package org.elasticsearch.index.mapper.xcontent.geo;
import org.elasticsearch.index.field.data.DocFieldData;
/**
* @author kimchy (shay.banon)
*/
public class GeoPointDocFieldData extends DocFieldData<GeoPointFieldData> {
public GeoPointDocFieldData(GeoPointFieldData fieldData) {
super(fieldData);
}
public GeoPoint getValue() {
return fieldData.value(docId);
}
public GeoPoint[] getValues() {
return fieldData.values(docId);
}
}

110
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/geo/GeoPointFieldData.java Normal file
View File

@ -0,0 +1,110 @@
/*
* Licensed to Elastic Search and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Elastic Search 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.
*/
package org.elasticsearch.index.mapper.xcontent.geo;
import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.lucene.geo.GeoHashUtils;
import org.elasticsearch.index.field.data.FieldData;
import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.support.FieldDataLoader;
import java.io.IOException;
import java.util.ArrayList;
/**
* @author kimchy (shay.banon)
*/
public abstract class GeoPointFieldData extends FieldData<GeoPointDocFieldData> {
public static final GeoPoint[] EMPTY_ARRAY = new GeoPoint[0];
protected final GeoPoint[] values;
protected GeoPointFieldData(String fieldName, GeoPoint[] values) {
super(fieldName);
this.values = values;
}
abstract public GeoPoint value(int docId);
abstract public GeoPoint[] values(int docId);
@Override public GeoPointDocFieldData docFieldData(int docId) {
return super.docFieldData(docId);
}
@Override public String stringValue(int docId) {
return value(docId).geohash();
}
@Override protected GeoPointDocFieldData createFieldData() {
return new GeoPointDocFieldData(this);
}
@Override public FieldDataType type() {
return GeoPointFieldDataType.TYPE;
}
@Override public void forEachValue(StringValueProc proc) {
for (int i = 1; i < values.length; i++) {
proc.onValue(values[i].geohash());
}
}
public void forEachValue(ValueProc proc) {
for (int i = 1; i < values.length; i++) {
proc.onValue(values[i]);
}
}
public static interface ValueProc {
void onValue(GeoPoint value);
}
public static GeoPointFieldData load(IndexReader reader, String field) throws IOException {
return FieldDataLoader.load(reader, field, new StringTypeLoader());
}
static class StringTypeLoader extends FieldDataLoader.FreqsTypeLoader<GeoPointFieldData> {
private final ArrayList<GeoPoint> terms = new ArrayList<GeoPoint>();
private final double[] latlon = new double[2];
StringTypeLoader() {
super();
// the first one indicates null value
terms.add(null);
}
@Override public void collectTerm(String term) {
GeoHashUtils.decode(term, latlon);
terms.add(new GeoPoint(latlon[0], latlon[1]));
}
@Override public GeoPointFieldData buildSingleValue(String field, int[] order) {
return new SingleValueGeoPointFieldData(field, order, terms.toArray(new GeoPoint[terms.size()]));
}
@Override public GeoPointFieldData buildMultiValue(String field, int[][] order) {
return new MultiValueGeoPointFieldData(field, order, terms.toArray(new GeoPoint[terms.size()]));
}
}
}

53
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/geo/GeoPointFieldDataType.java Normal file
View File

@ -0,0 +1,53 @@
/*
* Licensed to Elastic Search and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Elastic Search 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.
*/
package org.elasticsearch.index.mapper.xcontent.geo;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.FieldComparatorSource;
import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.strings.StringOrdValFieldDataComparator;
import java.io.IOException;
/**
* @author kimchy (shay.banon)
*/
public class GeoPointFieldDataType implements FieldDataType<GeoPointFieldData> {
public static final GeoPointFieldDataType TYPE = new GeoPointFieldDataType();
@Override public Class<GeoPointFieldData> fieldDataClass() {
return GeoPointFieldData.class;
}
@Override public FieldComparatorSource newFieldComparatorSource(final FieldDataCache cache) {
return new FieldComparatorSource() {
@Override public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException {
return new StringOrdValFieldDataComparator(numHits, fieldname, sortPos, reversed, cache);
}
};
}
@Override public GeoPointFieldData load(IndexReader reader, String fieldName) throws IOException {
return GeoPointFieldData.load(reader, fieldName);
}
}

131
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/GeoPointFieldMapper.java → modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/geo/GeoPointFieldMapper.java
View File

@ -17,18 +17,20 @@
* under the License. * under the License.
*/ */
package org.elasticsearch.index.mapper.xcontent; package org.elasticsearch.index.mapper.xcontent.geo;
import org.apache.lucene.document.Field; import org.apache.lucene.document.Field;
import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.lucene.geo.GeoHashUtils; import org.elasticsearch.common.lucene.geo.GeoHashUtils;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.common.xcontent.support.XContentMapValues;
import org.elasticsearch.index.analysis.NamedAnalyzer;
import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.mapper.FieldMapperListener; import org.elasticsearch.index.mapper.FieldMapperListener;
import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MapperParsingException;
import org.elasticsearch.index.mapper.MergeMappingException; import org.elasticsearch.index.mapper.MergeMappingException;
import org.elasticsearch.index.mapper.xcontent.*;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
@ -70,15 +72,11 @@ public class GeoPointFieldMapper implements XContentMapper, ArrayValueMapperPars
private ContentPath.Type pathType = Defaults.PATH_TYPE; private ContentPath.Type pathType = Defaults.PATH_TYPE;
private boolean enableLatLon = true; private boolean enableLatLon = false;
private boolean enableGeohash = false;
private String resolution = "64";
private Integer precisionStep; private Integer precisionStep;
private int geohashPrecision = GeoHashUtils.PRECISION; private int precision = GeoHashUtils.PRECISION;
private Field.Store store = Defaults.STORE; private Field.Store store = Defaults.STORE;
@ -97,23 +95,13 @@ public class GeoPointFieldMapper implements XContentMapper, ArrayValueMapperPars
return this; return this;
} }
public Builder enableGeohash(boolean enableGeohash) {
this.enableGeohash = enableGeohash;
return this;
}
public Builder resolution(String resolution) {
this.resolution = resolution;
return this;
}
public Builder precisionStep(int precisionStep) { public Builder precisionStep(int precisionStep) {
this.precisionStep = precisionStep; this.precisionStep = precisionStep;
return this; return this;
} }
public Builder geohashPrecision(int geohashPrecision) { public Builder precision(int precision) {
this.geohashPrecision = geohashPrecision; this.precision = precision;
return this; return this;
} }
@ -126,23 +114,16 @@ public class GeoPointFieldMapper implements XContentMapper, ArrayValueMapperPars
ContentPath.Type origPathType = context.path().pathType(); ContentPath.Type origPathType = context.path().pathType();
context.path().pathType(pathType); context.path().pathType(pathType);
GeoHashFieldMapper geohashMapper = new GeoHashFieldMapper.Builder(name).includeInAll(false).build(context);
NumberFieldMapper latMapper = null; NumberFieldMapper latMapper = null;
NumberFieldMapper lonMapper = null; NumberFieldMapper lonMapper = null;
StringFieldMapper geohashMapper = null;
context.path().add(name); context.path().add(name);
if (enableLatLon) { if (enableLatLon) {
NumberFieldMapper.Builder latMapperBuilder; NumberFieldMapper.Builder latMapperBuilder = doubleField(Names.LAT).includeInAll(false);
NumberFieldMapper.Builder lonMapperBuilder; NumberFieldMapper.Builder lonMapperBuilder = doubleField(Names.LON).includeInAll(false);
if ("32".equals(resolution)) {
latMapperBuilder = floatField(Names.LAT).includeInAll(false);
lonMapperBuilder = floatField(Names.LON).includeInAll(false);
} else if ("64".equals(resolution)) {
latMapperBuilder = doubleField(Names.LAT).includeInAll(false);
lonMapperBuilder = doubleField(Names.LON).includeInAll(false);
} else {
throw new ElasticSearchIllegalArgumentException("Can't handle geo_point resolution [" + resolution + "]");
}
if (precisionStep != null) { if (precisionStep != null) {
latMapperBuilder.precisionStep(precisionStep); latMapperBuilder.precisionStep(precisionStep);
lonMapperBuilder.precisionStep(precisionStep); lonMapperBuilder.precisionStep(precisionStep);
@ -150,14 +131,11 @@ public class GeoPointFieldMapper implements XContentMapper, ArrayValueMapperPars
latMapper = (NumberFieldMapper) latMapperBuilder.includeInAll(false).store(store).build(context); latMapper = (NumberFieldMapper) latMapperBuilder.includeInAll(false).store(store).build(context);
lonMapper = (NumberFieldMapper) lonMapperBuilder.includeInAll(false).store(store).build(context); lonMapper = (NumberFieldMapper) lonMapperBuilder.includeInAll(false).store(store).build(context);
} }
if (enableGeohash) {
geohashMapper = stringField(Names.GEOHASH).includeInAll(false).build(context);
}
context.path().remove(); context.path().remove();
context.path().pathType(origPathType); context.path().pathType(origPathType);
return new GeoPointFieldMapper(name, pathType, enableLatLon, enableGeohash, resolution, precisionStep, geohashPrecision, latMapper, lonMapper, geohashMapper); return new GeoPointFieldMapper(name, pathType, enableLatLon, precisionStep, precision, latMapper, lonMapper, geohashMapper);
} }
} }
@ -174,14 +152,10 @@ public class GeoPointFieldMapper implements XContentMapper, ArrayValueMapperPars
builder.store(parseStore(name, fieldNode.toString())); builder.store(parseStore(name, fieldNode.toString()));
} else if (fieldName.equals("lat_lon")) { } else if (fieldName.equals("lat_lon")) {
builder.enableLatLon(XContentMapValues.nodeBooleanValue(fieldNode)); builder.enableLatLon(XContentMapValues.nodeBooleanValue(fieldNode));
} else if (fieldName.equals("geohash")) { } else if (fieldName.equals("precision_step")) {
builder.enableGeohash(XContentMapValues.nodeBooleanValue(fieldNode));
} else if (fieldName.equals("resolution")) {
builder.resolution(Integer.toString(XContentMapValues.nodeIntegerValue(fieldNode)));
} else if (fieldName.equals("precisionStep")) {
builder.precisionStep(XContentMapValues.nodeIntegerValue(fieldNode)); builder.precisionStep(XContentMapValues.nodeIntegerValue(fieldNode));
} else if (fieldName.equals("geohash_precision") || fieldName.equals("geohashPrecision")) { } else if (fieldName.equals("precision")) {
builder.geohashPrecision(XContentMapValues.nodeIntegerValue(fieldNode)); builder.precision(XContentMapValues.nodeIntegerValue(fieldNode));
} }
} }
return builder; return builder;
@ -194,13 +168,9 @@ public class GeoPointFieldMapper implements XContentMapper, ArrayValueMapperPars
private final boolean enableLatLon; private final boolean enableLatLon;
private final boolean enableGeohash;
private final String resolution;
private final Integer precisionStep; private final Integer precisionStep;
private final int geohashPrecision; private final int precision;
private final NumberFieldMapper latMapper; private final NumberFieldMapper latMapper;
@ -208,15 +178,13 @@ public class GeoPointFieldMapper implements XContentMapper, ArrayValueMapperPars
private final StringFieldMapper geohashMapper; private final StringFieldMapper geohashMapper;
public GeoPointFieldMapper(String name, ContentPath.Type pathType, boolean enableLatLon, boolean enableGeohash, String resolution, Integer precisionStep, int geohashPrecision, public GeoPointFieldMapper(String name, ContentPath.Type pathType, boolean enableLatLon, Integer precisionStep, int precision,
NumberFieldMapper latMapper, NumberFieldMapper lonMapper, StringFieldMapper geohashMapper) { NumberFieldMapper latMapper, NumberFieldMapper lonMapper, StringFieldMapper geohashMapper) {
this.name = name; this.name = name;
this.pathType = pathType; this.pathType = pathType;
this.enableLatLon = enableLatLon; this.enableLatLon = enableLatLon;
this.enableGeohash = enableGeohash;
this.resolution = resolution;
this.precisionStep = precisionStep; this.precisionStep = precisionStep;
this.geohashPrecision = geohashPrecision; this.precision = precision;
this.latMapper = latMapper; this.latMapper = latMapper;
this.lonMapper = lonMapper; this.lonMapper = lonMapper;
@ -318,19 +286,19 @@ public class GeoPointFieldMapper implements XContentMapper, ArrayValueMapperPars
} }
private void parseLatLon(ParseContext context, Double lat, Double lon) throws IOException { private void parseLatLon(ParseContext context, Double lat, Double lon) throws IOException {
context.externalValue(GeoHashUtils.encode(lat, lon, precision));
geohashMapper.parse(context);
if (enableLatLon) { if (enableLatLon) {
context.externalValue(lat); context.externalValue(lat);
latMapper.parse(context); latMapper.parse(context);
context.externalValue(lon); context.externalValue(lon);
lonMapper.parse(context); lonMapper.parse(context);
} }
if (enableGeohash) {
context.externalValue(GeoHashUtils.encode(lat, lon, geohashPrecision));
geohashMapper.parse(context);
}
} }
private void parseGeohash(ParseContext context, String geohash) throws IOException { private void parseGeohash(ParseContext context, String geohash) throws IOException {
context.externalValue(geohash);
geohashMapper.parse(context);
if (enableLatLon) { if (enableLatLon) {
double[] values = GeoHashUtils.decode(geohash); double[] values = GeoHashUtils.decode(geohash);
context.externalValue(values[0]); context.externalValue(values[0]);
@ -338,10 +306,6 @@ public class GeoPointFieldMapper implements XContentMapper, ArrayValueMapperPars
context.externalValue(values[1]); context.externalValue(values[1]);
lonMapper.parse(context); lonMapper.parse(context);
} }
if (enableGeohash) {
context.externalValue(geohash);
geohashMapper.parse(context);
}
} }
@Override public void merge(XContentMapper mergeWith, MergeContext mergeContext) throws MergeMappingException { @Override public void merge(XContentMapper mergeWith, MergeContext mergeContext) throws MergeMappingException {
@ -349,13 +313,11 @@ public class GeoPointFieldMapper implements XContentMapper, ArrayValueMapperPars
} }
@Override public void traverse(FieldMapperListener fieldMapperListener) { @Override public void traverse(FieldMapperListener fieldMapperListener) {
geohashMapper.traverse(fieldMapperListener);
if (enableLatLon) { if (enableLatLon) {
latMapper.traverse(fieldMapperListener); latMapper.traverse(fieldMapperListener);
lonMapper.traverse(fieldMapperListener); lonMapper.traverse(fieldMapperListener);
} }
if (enableGeohash) {
geohashMapper.traverse(fieldMapperListener);
}
} }
@Override public void toXContent(XContentBuilder builder, Params params) throws IOException { @Override public void toXContent(XContentBuilder builder, Params params) throws IOException {
@ -363,18 +325,55 @@ public class GeoPointFieldMapper implements XContentMapper, ArrayValueMapperPars
builder.field("type", CONTENT_TYPE); builder.field("type", CONTENT_TYPE);
builder.field("path", pathType.name().toLowerCase()); builder.field("path", pathType.name().toLowerCase());
builder.field("lat_lon", enableLatLon); builder.field("lat_lon", enableLatLon);
builder.field("geohash", enableGeohash);
builder.field("resolution", resolution);
if (latMapper != null) { if (latMapper != null) {
builder.field("store", latMapper.store().name().toLowerCase()); builder.field("store", latMapper.store().name().toLowerCase());
} else if (geohashMapper != null) { } else if (geohashMapper != null) {
builder.field("store", geohashMapper.store().name().toLowerCase()); builder.field("store", geohashMapper.store().name().toLowerCase());
} }
builder.field("geohash_precision", geohashPrecision); builder.field("precision", precision);
if (precisionStep != null) { if (precisionStep != null) {
builder.field("precision_step", precisionStep); builder.field("precision_step", precisionStep);
} }
builder.endObject(); builder.endObject();
} }
public static class GeoHashFieldMapper extends StringFieldMapper {
public static class Builder extends AbstractFieldMapper.OpenBuilder<Builder, StringFieldMapper> {
protected String nullValue = Defaults.NULL_VALUE;
public Builder(String name) {
super(name);
builder = this;
}
public Builder nullValue(String nullValue) {
this.nullValue = nullValue;
return this;
}
@Override public Builder includeInAll(Boolean includeInAll) {
this.includeInAll = includeInAll;
return this;
}
@Override public GeoHashFieldMapper build(BuilderContext context) {
GeoHashFieldMapper fieldMapper = new GeoHashFieldMapper(buildNames(context),
index, store, termVector, boost, omitNorms, omitTermFreqAndPositions, nullValue,
indexAnalyzer, searchAnalyzer);
fieldMapper.includeInAll(includeInAll);
return fieldMapper;
}
}
public GeoHashFieldMapper(Names names, Field.Index index, Field.Store store, Field.TermVector termVector, float boost, boolean omitNorms, boolean omitTermFreqAndPositions, String nullValue, NamedAnalyzer indexAnalyzer, NamedAnalyzer searchAnalyzer) {
super(names, index, store, termVector, boost, omitNorms, omitTermFreqAndPositions, nullValue, indexAnalyzer, searchAnalyzer);
}
@Override public FieldDataType fieldDataType() {
return GeoPointFieldDataType.TYPE;
}
}
} }

91
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/geo/MultiValueGeoPointFieldData.java Normal file
View File

@ -0,0 +1,91 @@
/*
* Licensed to Elastic Search and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Elastic Search 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.
*/
package org.elasticsearch.index.mapper.xcontent.geo;
import org.elasticsearch.common.thread.ThreadLocals;
/**
* @author kimchy (shay.banon)
*/
public class MultiValueGeoPointFieldData extends GeoPointFieldData {
private static final int VALUE_CACHE_SIZE = 100;
private static ThreadLocal<ThreadLocals.CleanableValue<GeoPoint[][]>> valuesCache = new ThreadLocal<ThreadLocals.CleanableValue<GeoPoint[][]>>() {
@Override protected ThreadLocals.CleanableValue<GeoPoint[][]> initialValue() {
GeoPoint[][] value = new GeoPoint[VALUE_CACHE_SIZE][];
for (int i = 0; i < value.length; i++) {
value[i] = new GeoPoint[i];
}
return new ThreadLocals.CleanableValue<GeoPoint[][]>(value);
}
};
// order with value 0 indicates no value
private final int[][] order;
public MultiValueGeoPointFieldData(String fieldName, int[][] order, GeoPoint[] values) {
super(fieldName, values);
this.order = order;
}
@Override public boolean multiValued() {
return true;
}
@Override public boolean hasValue(int docId) {
return order[docId] != null;
}
@Override public void forEachValueInDoc(int docId, StringValueInDocProc proc) {
int[] docOrders = order[docId];
if (docOrders == null) {
return;
}
for (int docOrder : docOrders) {
proc.onValue(docId, values[docOrder].geohash());
}
}
@Override public GeoPoint value(int docId) {
int[] docOrders = order[docId];
if (docOrders == null) {
return null;
}
return values[docOrders[0]];
}
@Override public GeoPoint[] values(int docId) {
int[] docOrders = order[docId];
if (docOrders == null) {
return EMPTY_ARRAY;
}
GeoPoint[] points;
if (docOrders.length < VALUE_CACHE_SIZE) {
points = valuesCache.get().get()[docOrders.length];
} else {
points = new GeoPoint[docOrders.length];
}
for (int i = 0; i < docOrders.length; i++) {
points[i] = values[docOrders[i]];
}
return points;
}
}

80
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/geo/SingleValueGeoPointFieldData.java Normal file
View File

@ -0,0 +1,80 @@
/*
* Licensed to Elastic Search and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Elastic Search 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.
*/
package org.elasticsearch.index.mapper.xcontent.geo;
import org.elasticsearch.common.thread.ThreadLocals;
/**
* @author kimchy (shay.banon)
*/
public class SingleValueGeoPointFieldData extends GeoPointFieldData {
private static ThreadLocal<ThreadLocals.CleanableValue<GeoPoint[]>> valuesCache = new ThreadLocal<ThreadLocals.CleanableValue<GeoPoint[]>>() {
@Override protected ThreadLocals.CleanableValue<GeoPoint[]> initialValue() {
return new ThreadLocals.CleanableValue<GeoPoint[]>(new GeoPoint[1]);
}
};
// order with value 0 indicates no value
private final int[] order;
public SingleValueGeoPointFieldData(String fieldName, int[] order, GeoPoint[] values) {
super(fieldName, values);
this.order = order;
}
int[] order() {
return order;
}
GeoPoint[] values() {
return this.values;
}
@Override public boolean multiValued() {
return false;
}
@Override public boolean hasValue(int docId) {
return order[docId] != 0;
}
@Override public void forEachValueInDoc(int docId, StringValueInDocProc proc) {
int loc = order[docId];
if (loc == 0) {
return;
}
proc.onValue(docId, values[loc].geohash());
}
@Override public GeoPoint value(int docId) {
return values[order[docId]];
}
@Override public GeoPoint[] values(int docId) {
int loc = order[docId];
if (loc == 0) {
return EMPTY_ARRAY;
}
GeoPoint[] ret = valuesCache.get().get();
ret[0] = values[loc];
return ret;
}
}

29
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/GeoBoundingBoxFilterParser.java
View File

@ -29,7 +29,8 @@ import org.elasticsearch.index.AbstractIndexComponent;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.xcontent.GeoPointFieldMapper; import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldDataType;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldMapper;
import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.query.QueryParsingException;
import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.settings.IndexSettings;
@ -55,8 +56,7 @@ public class GeoBoundingBoxFilterParser extends AbstractIndexComponent implement
@Override public Filter parse(QueryParseContext parseContext) throws IOException, QueryParsingException { @Override public Filter parse(QueryParseContext parseContext) throws IOException, QueryParsingException {
XContentParser parser = parseContext.parser(); XContentParser parser = parseContext.parser();
String latFieldName = null; String fieldName = null;
String lonFieldName = null;
GeoBoundingBoxFilter.Point topLeft = new GeoBoundingBoxFilter.Point(); GeoBoundingBoxFilter.Point topLeft = new GeoBoundingBoxFilter.Point();
GeoBoundingBoxFilter.Point bottomRight = new GeoBoundingBoxFilter.Point(); GeoBoundingBoxFilter.Point bottomRight = new GeoBoundingBoxFilter.Point();
@ -67,8 +67,7 @@ public class GeoBoundingBoxFilterParser extends AbstractIndexComponent implement
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName(); currentFieldName = parser.currentName();
} else if (token == XContentParser.Token.START_OBJECT) { } else if (token == XContentParser.Token.START_OBJECT) {
latFieldName = currentFieldName + GeoPointFieldMapper.Names.LAT_SUFFIX; fieldName = currentFieldName;
lonFieldName = currentFieldName + GeoPointFieldMapper.Names.LON_SUFFIX;
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
@ -117,8 +116,7 @@ public class GeoBoundingBoxFilterParser extends AbstractIndexComponent implement
} }
} else if (token.isValue()) { } else if (token.isValue()) {
if ("field".equals(currentFieldName)) { if ("field".equals(currentFieldName)) {
latFieldName = parser.text() + GeoPointFieldMapper.Names.LAT_SUFFIX; fieldName = parser.text();
lonFieldName = parser.text() + GeoPointFieldMapper.Names.LON_SUFFIX;
} else { } else {
GeoBoundingBoxFilter.Point point = null; GeoBoundingBoxFilter.Point point = null;
if ("top_left".equals(currentFieldName) || "topLeft".equals(currentFieldName)) { if ("top_left".equals(currentFieldName) || "topLeft".equals(currentFieldName)) {
@ -151,21 +149,18 @@ public class GeoBoundingBoxFilterParser extends AbstractIndexComponent implement
MapperService mapperService = parseContext.mapperService(); MapperService mapperService = parseContext.mapperService();
FieldMapper mapper = mapperService.smartNameFieldMapper(latFieldName); FieldMapper mapper = mapperService.smartNameFieldMapper(fieldName);
if (mapper == null) { if (mapper == null) {
throw new QueryParsingException(index, "failed to find lat field [" + latFieldName + "]"); throw new QueryParsingException(index, "failed to find geo_point field [" + fieldName + "]");
} }
latFieldName = mapper.names().indexName(); if (mapper.fieldDataType() != GeoPointFieldDataType.TYPE) {
throw new QueryParsingException(index, "field [" + fieldName + "] is not a geo_point field");
mapper = mapperService.smartNameFieldMapper(lonFieldName);
if (mapper == null) {
throw new QueryParsingException(index, "failed to find lon field [" + lonFieldName + "]");
} }
lonFieldName = mapper.names().indexName(); fieldName = mapper.names().indexName();
Filter filter = new GeoBoundingBoxFilter(topLeft, bottomRight, latFieldName, lonFieldName, mapper.fieldDataType(), parseContext.indexCache().fieldData()); Filter filter = new GeoBoundingBoxFilter(topLeft, bottomRight, fieldName, parseContext.indexCache().fieldData());
filter = wrapSmartNameFilter(filter, parseContext.smartFieldMappers(latFieldName), parseContext); filter = wrapSmartNameFilter(filter, parseContext.smartFieldMappers(fieldName), parseContext);
if (filterName != null) { if (filterName != null) {
parseContext.addNamedFilter(filterName, filter); parseContext.addNamedFilter(filterName, filter);
} }

40
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/GeoDistanceFilterParser.java
View File

@ -31,7 +31,8 @@ import org.elasticsearch.index.AbstractIndexComponent;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.xcontent.GeoPointFieldMapper; import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldDataType;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldMapper;
import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.query.QueryParsingException;
import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.settings.IndexSettings;
@ -70,8 +71,7 @@ public class GeoDistanceFilterParser extends AbstractIndexComponent implements X
String currentFieldName = null; String currentFieldName = null;
double lat = 0; double lat = 0;
double lon = 0; double lon = 0;
String latFieldName = null; String fieldName = null;
String lonFieldName = null;
double distance = 0; double distance = 0;
DistanceUnit unit = null; DistanceUnit unit = null;
GeoDistance geoDistance = GeoDistance.ARC; GeoDistance geoDistance = GeoDistance.ARC;
@ -86,13 +86,11 @@ public class GeoDistanceFilterParser extends AbstractIndexComponent implements X
while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) { while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
} }
latFieldName = currentFieldName + "." + GeoPointFieldMapper.Names.LAT; fieldName = currentFieldName;
lonFieldName = currentFieldName + "." + GeoPointFieldMapper.Names.LON;
} else if (token == XContentParser.Token.START_OBJECT) { } else if (token == XContentParser.Token.START_OBJECT) {
// the json in the format of -> field : { lat : 30, lon : 12 } // the json in the format of -> field : { lat : 30, lon : 12 }
String currentName = parser.currentName(); String currentName = parser.currentName();
latFieldName = currentFieldName + GeoPointFieldMapper.Names.LAT_SUFFIX; fieldName = currentFieldName;
lonFieldName = currentFieldName + GeoPointFieldMapper.Names.LON_SUFFIX;
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
currentName = parser.currentName(); currentName = parser.currentName();
@ -121,16 +119,15 @@ public class GeoDistanceFilterParser extends AbstractIndexComponent implements X
geoDistance = GeoDistance.fromString(parser.text()); geoDistance = GeoDistance.fromString(parser.text());
} else if (currentFieldName.endsWith(GeoPointFieldMapper.Names.LAT_SUFFIX)) { } else if (currentFieldName.endsWith(GeoPointFieldMapper.Names.LAT_SUFFIX)) {
lat = parser.doubleValue(); lat = parser.doubleValue();
latFieldName = currentFieldName; fieldName = currentFieldName.substring(0, currentFieldName.length() - GeoPointFieldMapper.Names.LAT_SUFFIX.length());
} else if (currentFieldName.endsWith(GeoPointFieldMapper.Names.LON_SUFFIX)) { } else if (currentFieldName.endsWith(GeoPointFieldMapper.Names.LON_SUFFIX)) {
lon = parser.doubleValue(); lon = parser.doubleValue();
lonFieldName = currentFieldName; fieldName = currentFieldName.substring(0, currentFieldName.length() - GeoPointFieldMapper.Names.LON_SUFFIX.length());
} else if (currentFieldName.endsWith(GeoPointFieldMapper.Names.GEOHASH_SUFFIX)) { } else if (currentFieldName.endsWith(GeoPointFieldMapper.Names.GEOHASH_SUFFIX)) {
double[] values = GeoHashUtils.decode(parser.text()); double[] values = GeoHashUtils.decode(parser.text());
lat = values[0]; lat = values[0];
lon = values[1]; lon = values[1];
latFieldName = currentFieldName.substring(0, currentFieldName.length() - GeoPointFieldMapper.Names.GEOHASH_SUFFIX.length()) + GeoPointFieldMapper.Names.LAT_SUFFIX; fieldName = currentFieldName.substring(0, currentFieldName.length() - GeoPointFieldMapper.Names.GEOHASH_SUFFIX.length());
lonFieldName = currentFieldName.substring(0, currentFieldName.length() - GeoPointFieldMapper.Names.GEOHASH_SUFFIX.length()) + GeoPointFieldMapper.Names.LON_SUFFIX;
} else if ("_name".equals(currentFieldName)) { } else if ("_name".equals(currentFieldName)) {
filterName = parser.text(); filterName = parser.text();
} else { } else {
@ -145,9 +142,7 @@ public class GeoDistanceFilterParser extends AbstractIndexComponent implements X
lat = values[0]; lat = values[0];
lon = values[1]; lon = values[1];
} }
fieldName = currentFieldName;
latFieldName = currentFieldName + GeoPointFieldMapper.Names.LAT_SUFFIX;
lonFieldName = currentFieldName + GeoPointFieldMapper.Names.LON_SUFFIX;
} }
} }
} }
@ -157,20 +152,17 @@ public class GeoDistanceFilterParser extends AbstractIndexComponent implements X
} }
MapperService mapperService = parseContext.mapperService(); MapperService mapperService = parseContext.mapperService();
FieldMapper mapper = mapperService.smartNameFieldMapper(latFieldName); FieldMapper mapper = mapperService.smartNameFieldMapper(fieldName);
if (mapper == null) { if (mapper == null) {
throw new QueryParsingException(index, "failed to find lat field [" + latFieldName + "]"); throw new QueryParsingException(index, "failed to find geo_point field [" + fieldName + "]");
} }
latFieldName = mapper.names().indexName(); if (mapper.fieldDataType() != GeoPointFieldDataType.TYPE) {
throw new QueryParsingException(index, "field [" + fieldName + "] is not a geo_point field");
mapper = mapperService.smartNameFieldMapper(lonFieldName);
if (mapper == null) {
throw new QueryParsingException(index, "failed to find lon field [" + lonFieldName + "]");
} }
lonFieldName = mapper.names().indexName(); fieldName = mapper.names().indexName();
Filter filter = new GeoDistanceFilter(lat, lon, distance, geoDistance, latFieldName, lonFieldName, mapper.fieldDataType(), parseContext.indexCache().fieldData()); Filter filter = new GeoDistanceFilter(lat, lon, distance, geoDistance, fieldName, parseContext.indexCache().fieldData());
filter = wrapSmartNameFilter(filter, parseContext.smartFieldMappers(latFieldName), parseContext); filter = wrapSmartNameFilter(filter, parseContext.smartFieldMappers(fieldName), parseContext);
if (filterName != null) { if (filterName != null) {
parseContext.addNamedFilter(filterName, filter); parseContext.addNamedFilter(filterName, filter);
} }

26
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/GeoPolygonFilterParser.java
View File

@ -30,7 +30,8 @@ import org.elasticsearch.index.AbstractIndexComponent;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.xcontent.GeoPointFieldMapper; import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldDataType;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldMapper;
import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.index.query.QueryParsingException;
import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.settings.IndexSettings;
@ -68,8 +69,7 @@ public class GeoPolygonFilterParser extends AbstractIndexComponent implements XC
@Override public Filter parse(QueryParseContext parseContext) throws IOException, QueryParsingException { @Override public Filter parse(QueryParseContext parseContext) throws IOException, QueryParsingException {
XContentParser parser = parseContext.parser(); XContentParser parser = parseContext.parser();
String latFieldName = null; String fieldName = null;
String lonFieldName = null;
List<GeoPolygonFilter.Point> points = Lists.newArrayList(); List<GeoPolygonFilter.Point> points = Lists.newArrayList();
@ -81,8 +81,7 @@ public class GeoPolygonFilterParser extends AbstractIndexComponent implements XC
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName(); currentFieldName = parser.currentName();
} else if (token == XContentParser.Token.START_OBJECT) { } else if (token == XContentParser.Token.START_OBJECT) {
latFieldName = currentFieldName + GeoPointFieldMapper.Names.LAT_SUFFIX; fieldName = currentFieldName;
lonFieldName = currentFieldName + GeoPointFieldMapper.Names.LON_SUFFIX;
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
@ -150,20 +149,17 @@ public class GeoPolygonFilterParser extends AbstractIndexComponent implements XC
} }
MapperService mapperService = parseContext.mapperService(); MapperService mapperService = parseContext.mapperService();
FieldMapper mapper = mapperService.smartNameFieldMapper(latFieldName); FieldMapper mapper = mapperService.smartNameFieldMapper(fieldName);
if (mapper == null) { if (mapper == null) {
throw new QueryParsingException(index, "failed to find lat field [" + latFieldName + "]"); throw new QueryParsingException(index, "failed to find geo_point field [" + fieldName + "]");
} }
latFieldName = mapper.names().indexName(); if (mapper.fieldDataType() != GeoPointFieldDataType.TYPE) {
throw new QueryParsingException(index, "field [" + fieldName + "] is not a geo_point field");
mapper = mapperService.smartNameFieldMapper(lonFieldName);
if (mapper == null) {
throw new QueryParsingException(index, "failed to find lon field [" + lonFieldName + "]");
} }
lonFieldName = mapper.names().indexName(); fieldName = mapper.names().indexName();
Filter filter = new GeoPolygonFilter(points.toArray(new GeoPolygonFilter.Point[points.size()]), latFieldName, lonFieldName, mapper.fieldDataType(), parseContext.indexCache().fieldData()); Filter filter = new GeoPolygonFilter(points.toArray(new GeoPolygonFilter.Point[points.size()]), fieldName, parseContext.indexCache().fieldData());
filter = wrapSmartNameFilter(filter, parseContext.smartFieldMappers(latFieldName), parseContext); filter = wrapSmartNameFilter(filter, parseContext.smartFieldMappers(fieldName), parseContext);
if (filterName != null) { if (filterName != null) {
parseContext.addNamedFilter(filterName, filter); parseContext.addNamedFilter(filterName, filter);
} }

48
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/geodistance/GeoDistanceFacetCollector.java
View File

@ -23,11 +23,10 @@ import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.lucene.geo.GeoDistance; import org.elasticsearch.common.lucene.geo.GeoDistance;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.index.cache.field.data.FieldDataCache; import org.elasticsearch.index.cache.field.data.FieldDataCache;
import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.xcontent.GeoPointFieldMapper; import org.elasticsearch.index.mapper.xcontent.geo.GeoPoint;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldData;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldDataType;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facets.Facet;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facets.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.support.AbstractFacetCollector; import org.elasticsearch.search.facets.support.AbstractFacetCollector;
@ -42,9 +41,7 @@ public class GeoDistanceFacetCollector extends AbstractFacetCollector {
protected final String fieldName; protected final String fieldName;
protected final String indexLatFieldName; protected final String indexFieldName;
protected final String indexLonFieldName;
protected final double lat; protected final double lat;
@ -56,11 +53,7 @@ public class GeoDistanceFacetCollector extends AbstractFacetCollector {
protected final FieldDataCache fieldDataCache; protected final FieldDataCache fieldDataCache;
protected final FieldDataType fieldDataType; protected GeoPointFieldData fieldData;
protected NumericFieldData latFieldData;
protected NumericFieldData lonFieldData;
protected final GeoDistanceFacet.Entry[] entries; protected final GeoDistanceFacet.Entry[] entries;
@ -75,41 +68,35 @@ public class GeoDistanceFacetCollector extends AbstractFacetCollector {
this.geoDistance = geoDistance; this.geoDistance = geoDistance;
this.fieldDataCache = context.fieldDataCache(); this.fieldDataCache = context.fieldDataCache();
MapperService.SmartNameFieldMappers smartMappers = context.mapperService().smartName(fieldName + GeoPointFieldMapper.Names.LAT_SUFFIX); MapperService.SmartNameFieldMappers smartMappers = context.mapperService().smartName(fieldName);
if (smartMappers == null || !smartMappers.hasMapper()) { if (smartMappers == null || !smartMappers.hasMapper()) {
throw new FacetPhaseExecutionException(facetName, "No mapping found for field [" + fieldName + "]"); throw new FacetPhaseExecutionException(facetName, "No mapping found for field [" + fieldName + "]");
} }
if (smartMappers.mapper().fieldDataType() != GeoPointFieldDataType.TYPE) {
throw new FacetPhaseExecutionException(facetName, "field [" + fieldName + "] is not a geo_point field");
}
// add type filter if there is exact doc mapper associated with it // add type filter if there is exact doc mapper associated with it
if (smartMappers.hasDocMapper()) { if (smartMappers.hasDocMapper()) {
setFilter(context.filterCache().cache(smartMappers.docMapper().typeFilter())); setFilter(context.filterCache().cache(smartMappers.docMapper().typeFilter()));
} }
this.indexLatFieldName = smartMappers.mapper().names().indexName(); this.indexFieldName = smartMappers.mapper().names().indexName();
FieldMapper mapper = context.mapperService().smartNameFieldMapper(fieldName + GeoPointFieldMapper.Names.LON_SUFFIX);
if (mapper == null) {
throw new FacetPhaseExecutionException(facetName, "No mapping found for field [" + fieldName + "]");
}
this.indexLonFieldName = mapper.names().indexName();
this.fieldDataType = mapper.fieldDataType();
} }
@Override protected void doSetNextReader(IndexReader reader, int docBase) throws IOException { @Override protected void doSetNextReader(IndexReader reader, int docBase) throws IOException {
latFieldData = (NumericFieldData) fieldDataCache.cache(fieldDataType, reader, indexLatFieldName); fieldData = (GeoPointFieldData) fieldDataCache.cache(GeoPointFieldDataType.TYPE, reader, indexFieldName);
lonFieldData = (NumericFieldData) fieldDataCache.cache(fieldDataType, reader, indexLonFieldName);
} }
@Override protected void doCollect(int doc) throws IOException { @Override protected void doCollect(int doc) throws IOException {
if (!latFieldData.hasValue(doc) || !lonFieldData.hasValue(doc)) { if (!fieldData.hasValue(doc)) {
return; return;
} }
if (latFieldData.multiValued()) { if (fieldData.multiValued()) {
double[] lats = latFieldData.doubleValues(doc); GeoPoint[] points = fieldData.values(doc);
double[] lons = latFieldData.doubleValues(doc); for (GeoPoint point : points) {
for (int i = 0; i < lats.length; i++) { double distance = geoDistance.calculate(lat, lon, point.lat(), point.lon(), unit);
double distance = geoDistance.calculate(lat, lon, lats[i], lons[i], unit);
for (GeoDistanceFacet.Entry entry : entries) { for (GeoDistanceFacet.Entry entry : entries) {
if (distance >= entry.getFrom() && distance < entry.getTo()) { if (distance >= entry.getFrom() && distance < entry.getTo()) {
entry.count++; entry.count++;
@ -118,7 +105,8 @@ public class GeoDistanceFacetCollector extends AbstractFacetCollector {
} }
} }
} else { } else {
double distance = geoDistance.calculate(lat, lon, latFieldData.doubleValue(doc), lonFieldData.doubleValue(doc), unit); GeoPoint point = fieldData.value(doc);
double distance = geoDistance.calculate(lat, lon, point.lat(), point.lon(), unit);
for (GeoDistanceFacet.Entry entry : entries) { for (GeoDistanceFacet.Entry entry : entries) {
if (distance >= entry.getFrom() && distance < entry.getTo()) { if (distance >= entry.getFrom() && distance < entry.getTo()) {
entry.count++; entry.count++;

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/geodistance/GeoDistanceFacetCollectorParser.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.common.lucene.geo.GeoHashUtils;
import org.elasticsearch.common.thread.ThreadLocals; import org.elasticsearch.common.thread.ThreadLocals;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.mapper.xcontent.GeoPointFieldMapper; import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldMapper;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facets.FacetPhaseExecutionException;
import org.elasticsearch.search.facets.collector.FacetCollector; import org.elasticsearch.search.facets.collector.FacetCollector;
import org.elasticsearch.search.facets.collector.FacetCollectorParser; import org.elasticsearch.search.facets.collector.FacetCollectorParser;

15
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/geodistance/ScriptGeoDistanceFacetCollector.java
View File

@ -22,6 +22,7 @@ package org.elasticsearch.search.facets.geodistance;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.elasticsearch.common.lucene.geo.GeoDistance; import org.elasticsearch.common.lucene.geo.GeoDistance;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPoint;
import org.elasticsearch.script.search.SearchScript; import org.elasticsearch.script.search.SearchScript;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
@ -49,17 +50,16 @@ public class ScriptGeoDistanceFacetCollector extends GeoDistanceFacetCollector {
} }
@Override protected void doCollect(int doc) throws IOException { @Override protected void doCollect(int doc) throws IOException {
if (!latFieldData.hasValue(doc) || !lonFieldData.hasValue(doc)) { if (!fieldData.hasValue(doc)) {
return; return;
} }
double value = ((Number) script.execute(doc)).doubleValue(); double value = ((Number) script.execute(doc)).doubleValue();
if (latFieldData.multiValued()) { if (fieldData.multiValued()) {
double[] lats = latFieldData.doubleValues(doc); GeoPoint[] points = fieldData.values(doc);
double[] lons = latFieldData.doubleValues(doc); for (GeoPoint point : points) {
for (int i = 0; i < lats.length; i++) { double distance = geoDistance.calculate(lat, lon, point.lat(), point.lon(), unit);
double distance = geoDistance.calculate(lat, lon, lats[i], lons[i], unit);
for (GeoDistanceFacet.Entry entry : entries) { for (GeoDistanceFacet.Entry entry : entries) {
if (distance >= entry.getFrom() && distance < entry.getTo()) { if (distance >= entry.getFrom() && distance < entry.getTo()) {
entry.count++; entry.count++;
@ -68,7 +68,8 @@ public class ScriptGeoDistanceFacetCollector extends GeoDistanceFacetCollector {
} }
} }
} else { } else {
double distance = geoDistance.calculate(lat, lon, latFieldData.doubleValue(doc), lonFieldData.doubleValue(doc), unit); GeoPoint point = fieldData.value(doc);
double distance = geoDistance.calculate(lat, lon, point.lat(), point.lon(), unit);
for (GeoDistanceFacet.Entry entry : entries) { for (GeoDistanceFacet.Entry entry : entries) {
if (distance >= entry.getFrom() && distance < entry.getTo()) { if (distance >= entry.getFrom() && distance < entry.getTo()) {
entry.count++; entry.count++;

15
modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/geodistance/ValueGeoDistanceFacetCollector.java
View File

@ -25,6 +25,7 @@ import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.index.field.data.FieldDataType; import org.elasticsearch.index.field.data.FieldDataType;
import org.elasticsearch.index.field.data.NumericFieldData; import org.elasticsearch.index.field.data.NumericFieldData;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.xcontent.geo.GeoPoint;
import org.elasticsearch.search.facets.Facet; import org.elasticsearch.search.facets.Facet;
import org.elasticsearch.search.facets.FacetPhaseExecutionException; import org.elasticsearch.search.facets.FacetPhaseExecutionException;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
@ -63,16 +64,15 @@ public class ValueGeoDistanceFacetCollector extends GeoDistanceFacetCollector {
} }
@Override protected void doCollect(int doc) throws IOException { @Override protected void doCollect(int doc) throws IOException {
if (!latFieldData.hasValue(doc) || !lonFieldData.hasValue(doc)) { if (!fieldData.hasValue(doc)) {
return; return;
} }
if (latFieldData.multiValued()) { if (fieldData.multiValued()) {
double[] lats = latFieldData.doubleValues(doc); GeoPoint[] points = fieldData.values(doc);
double[] lons = latFieldData.doubleValues(doc);
double[] values = valueFieldData.multiValued() ? valueFieldData.doubleValues(doc) : null; double[] values = valueFieldData.multiValued() ? valueFieldData.doubleValues(doc) : null;
for (int i = 0; i < lats.length; i++) { for (int i = 0; i < points.length; i++) {
double distance = geoDistance.calculate(lat, lon, lats[i], lons[i], unit); double distance = geoDistance.calculate(lat, lon, points[i].lat(), points[i].lon(), unit);
for (GeoDistanceFacet.Entry entry : entries) { for (GeoDistanceFacet.Entry entry : entries) {
if (distance >= entry.getFrom() && distance < entry.getTo()) { if (distance >= entry.getFrom() && distance < entry.getTo()) {
entry.count++; entry.count++;
@ -87,7 +87,8 @@ public class ValueGeoDistanceFacetCollector extends GeoDistanceFacetCollector {
} }
} }
} else { } else {
double distance = geoDistance.calculate(lat, lon, latFieldData.doubleValue(doc), lonFieldData.doubleValue(doc), unit); GeoPoint point = fieldData.value(doc);
double distance = geoDistance.calculate(lat, lon, point.lat(), point.lon(), unit);
for (GeoDistanceFacet.Entry entry : entries) { for (GeoDistanceFacet.Entry entry : entries) {
if (distance >= entry.getFrom() && distance < entry.getTo()) { if (distance >= entry.getFrom() && distance < entry.getTo()) {
entry.count++; entry.count++;

2
modules/elasticsearch/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.common.lucene.geo.GeoDistanceDataComparator;
import org.elasticsearch.common.lucene.geo.GeoHashUtils; import org.elasticsearch.common.lucene.geo.GeoHashUtils;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.mapper.xcontent.GeoPointFieldMapper; import org.elasticsearch.index.mapper.xcontent.geo.GeoPointFieldMapper;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
/** /**

12
modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/xcontent/geopoint/GeohashMappingGeoPointTests.java
View File

@ -36,7 +36,7 @@ public class GeohashMappingGeoPointTests {
@Test public void testLatLonValues() throws Exception { @Test public void testLatLonValues() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").field("geohash", true).field("lat_lon", false).endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", false).endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -49,12 +49,12 @@ public class GeohashMappingGeoPointTests {
MatcherAssert.assertThat(doc.doc().getField("point.lat"), nullValue()); MatcherAssert.assertThat(doc.doc().getField("point.lat"), nullValue());
MatcherAssert.assertThat(doc.doc().getField("point.lon"), nullValue()); MatcherAssert.assertThat(doc.doc().getField("point.lon"), nullValue());
MatcherAssert.assertThat(doc.doc().get("point.geohash"), equalTo(GeoHashUtils.encode(1.2, 1.3))); MatcherAssert.assertThat(doc.doc().get("point"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
} }
@Test public void testLatLonInOneValue() throws Exception { @Test public void testLatLonInOneValue() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").field("geohash", true).field("lat_lon", false).endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", false).endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -67,12 +67,12 @@ public class GeohashMappingGeoPointTests {
MatcherAssert.assertThat(doc.doc().getField("point.lat"), nullValue()); MatcherAssert.assertThat(doc.doc().getField("point.lat"), nullValue());
MatcherAssert.assertThat(doc.doc().getField("point.lon"), nullValue()); MatcherAssert.assertThat(doc.doc().getField("point.lon"), nullValue());
MatcherAssert.assertThat(doc.doc().get("point.geohash"), equalTo(GeoHashUtils.encode(1.2, 1.3))); MatcherAssert.assertThat(doc.doc().get("point"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
} }
@Test public void testGeoHashValue() throws Exception { @Test public void testGeoHashValue() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").field("geohash", true).field("lat_lon", false).endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("geohash", true).endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -85,6 +85,6 @@ public class GeohashMappingGeoPointTests {
MatcherAssert.assertThat(doc.doc().getField("point.lat"), nullValue()); MatcherAssert.assertThat(doc.doc().getField("point.lat"), nullValue());
MatcherAssert.assertThat(doc.doc().getField("point.lon"), nullValue()); MatcherAssert.assertThat(doc.doc().getField("point.lon"), nullValue());
MatcherAssert.assertThat(doc.doc().get("point.geohash"), equalTo(GeoHashUtils.encode(1.2, 1.3))); MatcherAssert.assertThat(doc.doc().get("point"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
} }
} }

90
modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/xcontent/geopoint/LatLonAndGeohashMappingGeoPointTests.java
View File

@ -1,90 +0,0 @@
/*
* Licensed to Elastic Search and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Elastic Search 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.
*/
package org.elasticsearch.index.mapper.xcontent.geopoint;
import org.elasticsearch.common.lucene.geo.GeoHashUtils;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.mapper.ParsedDocument;
import org.elasticsearch.index.mapper.xcontent.MapperTests;
import org.elasticsearch.index.mapper.xcontent.XContentDocumentMapper;
import org.hamcrest.MatcherAssert;
import org.testng.annotations.Test;
import static org.hamcrest.Matchers.*;
/**
* @author kimchy (shay.banon)
*/
public class LatLonAndGeohashMappingGeoPointTests {
@Test public void testLatLonValues() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").field("geohash", true).endObject().endObject()
.endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
ParsedDocument doc = defaultMapper.parse("type", "1", XContentFactory.jsonBuilder()
.startObject()
.startObject("point").field("lat", 1.2).field("lon", 1.3).endObject()
.endObject()
.copiedBytes());
MatcherAssert.assertThat(doc.doc().getField("point.lat"), notNullValue());
MatcherAssert.assertThat(doc.doc().getField("point.lon"), notNullValue());
MatcherAssert.assertThat(doc.doc().get("point.geohash"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
}
@Test public void testLatLonInOneValue() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").field("geohash", true).endObject().endObject()
.endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
ParsedDocument doc = defaultMapper.parse("type", "1", XContentFactory.jsonBuilder()
.startObject()
.field("point", "1.2,1.3")
.endObject()
.copiedBytes());
MatcherAssert.assertThat(doc.doc().getField("point.lat"), notNullValue());
MatcherAssert.assertThat(doc.doc().getField("point.lon"), notNullValue());
MatcherAssert.assertThat(doc.doc().get("point.geohash"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
}
@Test public void testGeoHashValue() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").field("geohash", true).endObject().endObject()
.endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
ParsedDocument doc = defaultMapper.parse("type", "1", XContentFactory.jsonBuilder()
.startObject()
.field("point", GeoHashUtils.encode(1.2, 1.3))
.endObject()
.copiedBytes());
MatcherAssert.assertThat(doc.doc().getField("point.lat"), notNullValue());
MatcherAssert.assertThat(doc.doc().getField("point.lon"), notNullValue());
MatcherAssert.assertThat(doc.doc().get("point.geohash"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
}
}

46
modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/xcontent/geopoint/LatLonMappingGeoPointTests.java
View File

@ -37,7 +37,7 @@ public class LatLonMappingGeoPointTests {
@Test public void testLatLonValues() throws Exception { @Test public void testLatLonValues() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", true).endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -52,12 +52,12 @@ public class LatLonMappingGeoPointTests {
assertThat(doc.doc().getField("point.lat").getBinaryValue(), nullValue()); assertThat(doc.doc().getField("point.lat").getBinaryValue(), nullValue());
assertThat(doc.doc().getField("point.lon"), notNullValue()); assertThat(doc.doc().getField("point.lon"), notNullValue());
assertThat(doc.doc().getField("point.lon").getBinaryValue(), nullValue()); assertThat(doc.doc().getField("point.lon").getBinaryValue(), nullValue());
assertThat(doc.doc().getField("point.geohash"), nullValue()); assertThat(doc.doc().get("point"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
} }
@Test public void testLatLonValuesStored() throws Exception { @Test public void testLatLonValuesStored() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").field("store", "yes").endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", true).field("store", "yes").endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -72,12 +72,12 @@ public class LatLonMappingGeoPointTests {
assertThat(doc.doc().getField("point.lat").getBinaryValue(), equalTo(Numbers.doubleToBytes(1.2))); assertThat(doc.doc().getField("point.lat").getBinaryValue(), equalTo(Numbers.doubleToBytes(1.2)));
assertThat(doc.doc().getField("point.lon"), notNullValue()); assertThat(doc.doc().getField("point.lon"), notNullValue());
assertThat(doc.doc().getField("point.lon").getBinaryValue(), equalTo(Numbers.doubleToBytes(1.3))); assertThat(doc.doc().getField("point.lon").getBinaryValue(), equalTo(Numbers.doubleToBytes(1.3)));
assertThat(doc.doc().getField("point.geohash"), nullValue()); assertThat(doc.doc().get("point"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
} }
@Test public void testArrayLatLonValues() throws Exception { @Test public void testArrayLatLonValues() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").field("store", "yes").endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", true).field("store", "yes").endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -95,15 +95,15 @@ public class LatLonMappingGeoPointTests {
assertThat(doc.doc().getFields("point.lon").length, equalTo(2)); assertThat(doc.doc().getFields("point.lon").length, equalTo(2));
assertThat(doc.doc().getFields("point.lat")[0].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.2))); assertThat(doc.doc().getFields("point.lat")[0].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.2)));
assertThat(doc.doc().getFields("point.lon")[0].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.3))); assertThat(doc.doc().getFields("point.lon")[0].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.3)));
assertThat(doc.doc().getFields("point")[0].stringValue(), equalTo(GeoHashUtils.encode(1.2, 1.3)));
assertThat(doc.doc().getFields("point.lat")[1].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.4))); assertThat(doc.doc().getFields("point.lat")[1].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.4)));
assertThat(doc.doc().getFields("point.lon")[1].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.5))); assertThat(doc.doc().getFields("point.lon")[1].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.5)));
assertThat(doc.doc().getFields("point")[1].stringValue(), equalTo(GeoHashUtils.encode(1.4, 1.5)));
assertThat(doc.doc().getField("point.geohash"), nullValue());
} }
@Test public void testLatLonInOneValue() throws Exception { @Test public void testLatLonInOneValue() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", true).endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -116,12 +116,12 @@ public class LatLonMappingGeoPointTests {
assertThat(doc.doc().getField("point.lat"), notNullValue()); assertThat(doc.doc().getField("point.lat"), notNullValue());
assertThat(doc.doc().getField("point.lon"), notNullValue()); assertThat(doc.doc().getField("point.lon"), notNullValue());
assertThat(doc.doc().getField("point.geohash"), nullValue()); assertThat(doc.doc().get("point"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
} }
@Test public void testLatLonInOneValueStored() throws Exception { @Test public void testLatLonInOneValueStored() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").field("store", "yes").endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", true).field("store", "yes").endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -136,12 +136,12 @@ public class LatLonMappingGeoPointTests {
assertThat(doc.doc().getField("point.lat").getBinaryValue(), equalTo(Numbers.doubleToBytes(1.2))); assertThat(doc.doc().getField("point.lat").getBinaryValue(), equalTo(Numbers.doubleToBytes(1.2)));
assertThat(doc.doc().getField("point.lon"), notNullValue()); assertThat(doc.doc().getField("point.lon"), notNullValue());
assertThat(doc.doc().getField("point.lon").getBinaryValue(), equalTo(Numbers.doubleToBytes(1.3))); assertThat(doc.doc().getField("point.lon").getBinaryValue(), equalTo(Numbers.doubleToBytes(1.3)));
assertThat(doc.doc().getField("point.geohash"), nullValue()); assertThat(doc.doc().get("point"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
} }
@Test public void testLatLonInOneValueArray() throws Exception { @Test public void testLatLonInOneValueArray() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").field("store", "yes").endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", true).field("store", "yes").endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -159,15 +159,15 @@ public class LatLonMappingGeoPointTests {
assertThat(doc.doc().getFields("point.lon").length, equalTo(2)); assertThat(doc.doc().getFields("point.lon").length, equalTo(2));
assertThat(doc.doc().getFields("point.lat")[0].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.2))); assertThat(doc.doc().getFields("point.lat")[0].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.2)));
assertThat(doc.doc().getFields("point.lon")[0].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.3))); assertThat(doc.doc().getFields("point.lon")[0].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.3)));
assertThat(doc.doc().getFields("point")[0].stringValue(), equalTo(GeoHashUtils.encode(1.2, 1.3)));
assertThat(doc.doc().getFields("point.lat")[1].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.4))); assertThat(doc.doc().getFields("point.lat")[1].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.4)));
assertThat(doc.doc().getFields("point.lon")[1].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.5))); assertThat(doc.doc().getFields("point.lon")[1].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.5)));
assertThat(doc.doc().getFields("point")[1].stringValue(), equalTo(GeoHashUtils.encode(1.4, 1.5)));
assertThat(doc.doc().getField("point.geohash"), nullValue());
} }
@Test public void testGeoHashValue() throws Exception { @Test public void testGeoHashValue() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", true).endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -180,12 +180,12 @@ public class LatLonMappingGeoPointTests {
assertThat(doc.doc().getField("point.lat"), notNullValue()); assertThat(doc.doc().getField("point.lat"), notNullValue());
assertThat(doc.doc().getField("point.lon"), notNullValue()); assertThat(doc.doc().getField("point.lon"), notNullValue());
assertThat(doc.doc().getField("point.geohash"), nullValue()); assertThat(doc.doc().get("point"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
} }
@Test public void testLatLonArray() throws Exception { @Test public void testLatLonArray() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", true).endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -200,12 +200,12 @@ public class LatLonMappingGeoPointTests {
assertThat(doc.doc().getField("point.lat").getBinaryValue(), nullValue()); assertThat(doc.doc().getField("point.lat").getBinaryValue(), nullValue());
assertThat(doc.doc().getField("point.lon"), notNullValue()); assertThat(doc.doc().getField("point.lon"), notNullValue());
assertThat(doc.doc().getField("point.lon").getBinaryValue(), nullValue()); assertThat(doc.doc().getField("point.lon").getBinaryValue(), nullValue());
assertThat(doc.doc().getField("point.geohash"), nullValue()); assertThat(doc.doc().get("point"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
} }
@Test public void testLatLonArrayStored() throws Exception { @Test public void testLatLonArrayStored() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").field("store", "yes").endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", true).field("store", "yes").endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -220,12 +220,12 @@ public class LatLonMappingGeoPointTests {
assertThat(doc.doc().getField("point.lat").getBinaryValue(), equalTo(Numbers.doubleToBytes(1.2))); assertThat(doc.doc().getField("point.lat").getBinaryValue(), equalTo(Numbers.doubleToBytes(1.2)));
assertThat(doc.doc().getField("point.lon"), notNullValue()); assertThat(doc.doc().getField("point.lon"), notNullValue());
assertThat(doc.doc().getField("point.lon").getBinaryValue(), equalTo(Numbers.doubleToBytes(1.3))); assertThat(doc.doc().getField("point.lon").getBinaryValue(), equalTo(Numbers.doubleToBytes(1.3)));
assertThat(doc.doc().getField("point.geohash"), nullValue()); assertThat(doc.doc().get("point"), equalTo(GeoHashUtils.encode(1.2, 1.3)));
} }
@Test public void testLatLonArrayArrayStored() throws Exception { @Test public void testLatLonArrayArrayStored() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("point").field("type", "geo_point").field("store", "yes").endObject().endObject() .startObject("properties").startObject("point").field("type", "geo_point").field("lat_lon", true).field("store", "yes").endObject().endObject()
.endObject().endObject().string(); .endObject().endObject().string();
XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping); XContentDocumentMapper defaultMapper = MapperTests.newParser().parse(mapping);
@ -243,9 +243,9 @@ public class LatLonMappingGeoPointTests {
assertThat(doc.doc().getFields("point.lon").length, equalTo(2)); assertThat(doc.doc().getFields("point.lon").length, equalTo(2));
assertThat(doc.doc().getFields("point.lat")[0].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.2))); assertThat(doc.doc().getFields("point.lat")[0].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.2)));
assertThat(doc.doc().getFields("point.lon")[0].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.3))); assertThat(doc.doc().getFields("point.lon")[0].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.3)));
assertThat(doc.doc().getFields("point")[0].stringValue(), equalTo(GeoHashUtils.encode(1.2, 1.3)));
assertThat(doc.doc().getFields("point.lat")[1].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.4))); assertThat(doc.doc().getFields("point.lat")[1].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.4)));
assertThat(doc.doc().getFields("point.lon")[1].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.5))); assertThat(doc.doc().getFields("point.lon")[1].getBinaryValue(), equalTo(Numbers.doubleToBytes(1.5)));
assertThat(doc.doc().getFields("point")[1].stringValue(), equalTo(GeoHashUtils.encode(1.4, 1.5)));
assertThat(doc.doc().getField("point.geohash"), nullValue());
} }
} }

47
modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/SimpleIndexQueryParserTests.java
View File

@ -90,6 +90,8 @@ public class SimpleIndexQueryParserTests {
new IndexNameModule(index) new IndexNameModule(index)
).createInjector(); ).createInjector();
String mapping = copyToStringFromClasspath("/org/elasticsearch/index/query/xcontent/mapping.json");
injector.getInstance(MapperService.class).add("person", mapping);
injector.getInstance(MapperService.class).type("person").parse(copyToBytesFromClasspath("/org/elasticsearch/index/query/xcontent/data.json")); injector.getInstance(MapperService.class).type("person").parse(copyToBytesFromClasspath("/org/elasticsearch/index/query/xcontent/data.json"));
this.queryParser = injector.getInstance(IndexQueryParserService.class); this.queryParser = injector.getInstance(IndexQueryParserService.class);
} }
@ -1130,8 +1132,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery.query(), instanceOf(FilteredQuery.class)); assertThat(parsedQuery.query(), instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery.query(); FilteredQuery filteredQuery = (FilteredQuery) parsedQuery.query();
GeoDistanceFilter filter = (GeoDistanceFilter) filteredQuery.getFilter(); GeoDistanceFilter filter = (GeoDistanceFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.lat(), closeTo(40, 0.00001)); assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001)); assertThat(filter.lon(), closeTo(-70, 0.00001));
assertThat(filter.distance(), closeTo(12, 0.00001)); assertThat(filter.distance(), closeTo(12, 0.00001));
@ -1144,8 +1145,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery, instanceOf(FilteredQuery.class)); assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery; FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) filteredQuery.getFilter(); GeoDistanceFilter filter = (GeoDistanceFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.lat(), closeTo(40, 0.00001)); assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001)); assertThat(filter.lon(), closeTo(-70, 0.00001));
assertThat(filter.distance(), closeTo(12, 0.00001)); assertThat(filter.distance(), closeTo(12, 0.00001));
@ -1158,8 +1158,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery, instanceOf(FilteredQuery.class)); assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery; FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) filteredQuery.getFilter(); GeoDistanceFilter filter = (GeoDistanceFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.lat(), closeTo(40, 0.00001)); assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001)); assertThat(filter.lon(), closeTo(-70, 0.00001));
assertThat(filter.distance(), closeTo(12, 0.00001)); assertThat(filter.distance(), closeTo(12, 0.00001));
@ -1172,8 +1171,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery, instanceOf(FilteredQuery.class)); assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery; FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) filteredQuery.getFilter(); GeoDistanceFilter filter = (GeoDistanceFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.lat(), closeTo(40, 0.00001)); assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001)); assertThat(filter.lon(), closeTo(-70, 0.00001));
assertThat(filter.distance(), closeTo(12, 0.00001)); assertThat(filter.distance(), closeTo(12, 0.00001));
@ -1186,8 +1184,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery, instanceOf(FilteredQuery.class)); assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery; FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) filteredQuery.getFilter(); GeoDistanceFilter filter = (GeoDistanceFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.lat(), closeTo(40, 0.00001)); assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001)); assertThat(filter.lon(), closeTo(-70, 0.00001));
assertThat(filter.distance(), closeTo(12, 0.00001)); assertThat(filter.distance(), closeTo(12, 0.00001));
@ -1201,8 +1198,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true)); assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery.query(); FilteredQuery filteredQuery = (FilteredQuery) parsedQuery.query();
GeoBoundingBoxFilter filter = (GeoBoundingBoxFilter) filteredQuery.getFilter(); GeoBoundingBoxFilter filter = (GeoBoundingBoxFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.topLeft().lat, closeTo(40, 0.00001)); assertThat(filter.topLeft().lat, closeTo(40, 0.00001));
assertThat(filter.topLeft().lon, closeTo(-70, 0.00001)); assertThat(filter.topLeft().lon, closeTo(-70, 0.00001));
assertThat(filter.bottomRight().lat, closeTo(30, 0.00001)); assertThat(filter.bottomRight().lat, closeTo(30, 0.00001));
@ -1217,8 +1213,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery, instanceOf(FilteredQuery.class)); assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery; FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
GeoBoundingBoxFilter filter = (GeoBoundingBoxFilter) filteredQuery.getFilter(); GeoBoundingBoxFilter filter = (GeoBoundingBoxFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.topLeft().lat, closeTo(40, 0.00001)); assertThat(filter.topLeft().lat, closeTo(40, 0.00001));
assertThat(filter.topLeft().lon, closeTo(-70, 0.00001)); assertThat(filter.topLeft().lon, closeTo(-70, 0.00001));
assertThat(filter.bottomRight().lat, closeTo(30, 0.00001)); assertThat(filter.bottomRight().lat, closeTo(30, 0.00001));
@ -1232,8 +1227,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery, instanceOf(FilteredQuery.class)); assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery; FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
GeoBoundingBoxFilter filter = (GeoBoundingBoxFilter) filteredQuery.getFilter(); GeoBoundingBoxFilter filter = (GeoBoundingBoxFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.topLeft().lat, closeTo(40, 0.00001)); assertThat(filter.topLeft().lat, closeTo(40, 0.00001));
assertThat(filter.topLeft().lon, closeTo(-70, 0.00001)); assertThat(filter.topLeft().lon, closeTo(-70, 0.00001));
assertThat(filter.bottomRight().lat, closeTo(30, 0.00001)); assertThat(filter.bottomRight().lat, closeTo(30, 0.00001));
@ -1247,8 +1241,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery, instanceOf(FilteredQuery.class)); assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery; FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
GeoBoundingBoxFilter filter = (GeoBoundingBoxFilter) filteredQuery.getFilter(); GeoBoundingBoxFilter filter = (GeoBoundingBoxFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.topLeft().lat, closeTo(40, 0.00001)); assertThat(filter.topLeft().lat, closeTo(40, 0.00001));
assertThat(filter.topLeft().lon, closeTo(-70, 0.00001)); assertThat(filter.topLeft().lon, closeTo(-70, 0.00001));
assertThat(filter.bottomRight().lat, closeTo(30, 0.00001)); assertThat(filter.bottomRight().lat, closeTo(30, 0.00001));
@ -1262,8 +1255,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery, instanceOf(FilteredQuery.class)); assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery; FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
GeoBoundingBoxFilter filter = (GeoBoundingBoxFilter) filteredQuery.getFilter(); GeoBoundingBoxFilter filter = (GeoBoundingBoxFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.topLeft().lat, closeTo(40, 0.00001)); assertThat(filter.topLeft().lat, closeTo(40, 0.00001));
assertThat(filter.topLeft().lon, closeTo(-70, 0.00001)); assertThat(filter.topLeft().lon, closeTo(-70, 0.00001));
assertThat(filter.bottomRight().lat, closeTo(30, 0.00001)); assertThat(filter.bottomRight().lat, closeTo(30, 0.00001));
@ -1278,8 +1270,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery.query(), instanceOf(FilteredQuery.class)); assertThat(parsedQuery.query(), instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery.query(); FilteredQuery filteredQuery = (FilteredQuery) parsedQuery.query();
GeoPolygonFilter filter = (GeoPolygonFilter) filteredQuery.getFilter(); GeoPolygonFilter filter = (GeoPolygonFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.points().length, equalTo(3)); assertThat(filter.points().length, equalTo(3));
assertThat(filter.points()[0].lat, closeTo(40, 0.00001)); assertThat(filter.points()[0].lat, closeTo(40, 0.00001));
assertThat(filter.points()[0].lon, closeTo(-70, 0.00001)); assertThat(filter.points()[0].lon, closeTo(-70, 0.00001));
@ -1296,8 +1287,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery, instanceOf(FilteredQuery.class)); assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery; FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
GeoPolygonFilter filter = (GeoPolygonFilter) filteredQuery.getFilter(); GeoPolygonFilter filter = (GeoPolygonFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.points().length, equalTo(3)); assertThat(filter.points().length, equalTo(3));
assertThat(filter.points()[0].lat, closeTo(40, 0.00001)); assertThat(filter.points()[0].lat, closeTo(40, 0.00001));
assertThat(filter.points()[0].lon, closeTo(-70, 0.00001)); assertThat(filter.points()[0].lon, closeTo(-70, 0.00001));
@ -1314,8 +1304,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery, instanceOf(FilteredQuery.class)); assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery; FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
GeoPolygonFilter filter = (GeoPolygonFilter) filteredQuery.getFilter(); GeoPolygonFilter filter = (GeoPolygonFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.points().length, equalTo(3)); assertThat(filter.points().length, equalTo(3));
assertThat(filter.points()[0].lat, closeTo(40, 0.00001)); assertThat(filter.points()[0].lat, closeTo(40, 0.00001));
assertThat(filter.points()[0].lon, closeTo(-70, 0.00001)); assertThat(filter.points()[0].lon, closeTo(-70, 0.00001));
@ -1332,8 +1321,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery, instanceOf(FilteredQuery.class)); assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery; FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
GeoPolygonFilter filter = (GeoPolygonFilter) filteredQuery.getFilter(); GeoPolygonFilter filter = (GeoPolygonFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.points().length, equalTo(3)); assertThat(filter.points().length, equalTo(3));
assertThat(filter.points()[0].lat, closeTo(40, 0.00001)); assertThat(filter.points()[0].lat, closeTo(40, 0.00001));
assertThat(filter.points()[0].lon, closeTo(-70, 0.00001)); assertThat(filter.points()[0].lon, closeTo(-70, 0.00001));
@ -1350,8 +1338,7 @@ public class SimpleIndexQueryParserTests {
assertThat(parsedQuery, instanceOf(FilteredQuery.class)); assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery; FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
GeoPolygonFilter filter = (GeoPolygonFilter) filteredQuery.getFilter(); GeoPolygonFilter filter = (GeoPolygonFilter) filteredQuery.getFilter();
assertThat(filter.latFieldName(), equalTo("location.lat")); assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lonFieldName(), equalTo("location.lon"));
assertThat(filter.points().length, equalTo(3)); assertThat(filter.points().length, equalTo(3));
assertThat(filter.points()[0].lat, closeTo(40, 0.00001)); assertThat(filter.points()[0].lat, closeTo(40, 0.00001));
assertThat(filter.points()[0].lon, closeTo(-70, 0.00001)); assertThat(filter.points()[0].lon, closeTo(-70, 0.00001));

7
modules/elasticsearch/src/test/java/org/elasticsearch/index/query/xcontent/mapping.json Normal file
View File

@ -0,0 +1,7 @@
{
"person" : {
"properties" : {
"location" : { "type" : "geo_point" }
}
}
}

11
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.search.geo;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client; import org.elasticsearch.client.Client;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHit;
import org.elasticsearch.test.integration.AbstractNodesTests; import org.elasticsearch.test.integration.AbstractNodesTests;
import org.testng.annotations.AfterClass; import org.testng.annotations.AfterClass;
@ -62,7 +63,10 @@ public class GeoBoundingBoxTests extends AbstractNodesTests {
} catch (Exception e) { } catch (Exception e) {
// ignore // ignore
} }
client.admin().indices().prepareCreate("test").execute().actionGet(); String mapping = XContentFactory.jsonBuilder().startObject().startObject("type1")
.startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject()
.endObject().endObject().string();
client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet();
client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet();
client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject()
@ -125,7 +129,10 @@ public class GeoBoundingBoxTests extends AbstractNodesTests {
} catch (Exception e) { } catch (Exception e) {
// ignore // ignore
} }
client.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("number_of_shards", "1")).execute().actionGet(); String mapping = XContentFactory.jsonBuilder().startObject().startObject("type1")
.startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject()
.endObject().endObject().string();
client.admin().indices().prepareCreate("test").addMapping("type1", mapping).setSettings(settingsBuilder().put("number_of_shards", "1")).execute().actionGet();
client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet();
client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject()

6
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java
View File

@ -22,6 +22,7 @@ package org.elasticsearch.test.integration.search.geo;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client; import org.elasticsearch.client.Client;
import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.search.facets.geodistance.GeoDistanceFacet; import org.elasticsearch.search.facets.geodistance.GeoDistanceFacet;
import org.elasticsearch.test.integration.AbstractNodesTests; import org.elasticsearch.test.integration.AbstractNodesTests;
import org.testng.annotations.AfterClass; import org.testng.annotations.AfterClass;
@ -62,7 +63,10 @@ public class GeoDistanceFacetTests extends AbstractNodesTests {
} catch (Exception e) { } catch (Exception e) {
// ignore // ignore
} }
client.admin().indices().prepareCreate("test").execute().actionGet(); String mapping = XContentFactory.jsonBuilder().startObject().startObject("type1")
.startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject()
.endObject().endObject().string();
client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet();
client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet();
// to NY: 0 // to NY: 0

6
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.test.integration.search.geo;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client; import org.elasticsearch.client.Client;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortBuilders;
import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.search.sort.SortOrder;
@ -63,7 +64,10 @@ public class GeoDistanceTests extends AbstractNodesTests {
} catch (Exception e) { } catch (Exception e) {
// ignore // ignore
} }
client.admin().indices().prepareCreate("test").execute().actionGet(); String mapping = XContentFactory.jsonBuilder().startObject().startObject("type1")
.startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject()
.endObject().endObject().string();
client.admin().indices().prepareCreate("test").addMapping("type1", mapping).execute().actionGet();
client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet();
client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject() client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject()

5
plugins/river/twitter/src/main/java/org/elasticsearch/river/twitter/TwitterRiver.java
View File

@ -106,7 +106,10 @@ public class TwitterRiver extends AbstractRiverComponent implements River {
@Override public void start() { @Override public void start() {
logger.info("starting twitter stream"); logger.info("starting twitter stream");
try { try {
client.admin().indices().prepareCreate(indexName).execute().actionGet(); String mapping = XContentFactory.jsonBuilder().startObject().startObject(typeName)
.startObject("properties").startObject("location").field("type", "geo_point").endObject().endObject()
.endObject().endObject().string();
client.admin().indices().prepareCreate(indexName).addMapping(typeName, mapping).execute().actionGet();
} catch (Exception e) { } catch (Exception e) {
if (ExceptionsHelper.unwrapCause(e) instanceof IndexAlreadyExistsException) { if (ExceptionsHelper.unwrapCause(e) instanceof IndexAlreadyExistsException) {
// that's fine // that's fine