Skip to content

Commit de013ba

Browse files
kimchykimchy
committed
move geo filters and numeric range to use new field data
1 parent be1e5be commit de013ba

25 files changed

+239
-301
lines changed

‎src/main/java/org/elasticsearch/index/fielddata/FieldDataType.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ public FieldDataType(String type) {
3535
this(type, null, ImmutableMap.<String, String>of());
3636
}
3737

38+
public FieldDataType(String type, String format) {
39+
this(type, format, ImmutableMap.<String, String>of());
40+
}
41+
3842
public FieldDataType(String type, @Nullable String format, ImmutableMap<String, String> options) {
3943
this.type = type;
4044
this.format = format;

‎src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@
3737
import org.elasticsearch.common.xcontent.XContentParser;
3838
import org.elasticsearch.index.analysis.NamedAnalyzer;
3939
import org.elasticsearch.index.analysis.NumericIntegerAnalyzer;
40-
import org.elasticsearch.index.cache.field.data.FieldDataCache;
4140
import org.elasticsearch.index.codec.postingsformat.PostingsFormatProvider;
4241
import org.elasticsearch.index.field.data.FieldDataType;
42+
import org.elasticsearch.index.fielddata.IndexFieldDataService;
43+
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
4344
import org.elasticsearch.index.mapper.*;
4445
import org.elasticsearch.index.query.QueryParseContext;
4546
import org.elasticsearch.index.search.NumericRangeFieldDataFilter;
@@ -229,8 +230,8 @@ public Filter rangeFilter(Object lowerTerm, Object upperTerm, boolean includeLow
229230
}
230231

231232
@Override
232-
public Filter rangeFilter(FieldDataCache fieldDataCache, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
233-
return NumericRangeFieldDataFilter.newByteRange(fieldDataCache, names.indexName(),
233+
public Filter rangeFilter(IndexFieldDataService fieldData, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
234+
return NumericRangeFieldDataFilter.newByteRange((IndexNumericFieldData) fieldData.getForField(this),
234235
lowerTerm == null ? null : parseValue(lowerTerm),
235236
upperTerm == null ? null : parseValue(upperTerm),
236237
includeLower, includeUpper);

‎src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@
4040
import org.elasticsearch.common.xcontent.XContentParser;
4141
import org.elasticsearch.index.analysis.NamedAnalyzer;
4242
import org.elasticsearch.index.analysis.NumericDateAnalyzer;
43-
import org.elasticsearch.index.cache.field.data.FieldDataCache;
4443
import org.elasticsearch.index.codec.postingsformat.PostingsFormatProvider;
4544
import org.elasticsearch.index.field.data.FieldDataType;
45+
import org.elasticsearch.index.fielddata.IndexFieldDataService;
46+
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
4647
import org.elasticsearch.index.mapper.*;
4748
import org.elasticsearch.index.query.QueryParseContext;
4849
import org.elasticsearch.index.search.NumericRangeFieldDataFilter;
@@ -310,9 +311,9 @@ public Filter rangeFilter(Object lowerTerm, Object upperTerm, boolean includeLow
310311
}
311312

312313
@Override
313-
public Filter rangeFilter(FieldDataCache fieldDataCache, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
314+
public Filter rangeFilter(IndexFieldDataService fieldData, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
314315
long now = context == null ? System.currentTimeMillis() : context.nowInMillis();
315-
return NumericRangeFieldDataFilter.newLongRange(fieldDataCache, names.indexName(),
316+
return NumericRangeFieldDataFilter.newLongRange((IndexNumericFieldData) fieldData.getForField(this),
316317
lowerTerm == null ? null : dateMathParser.parse(convertToString(lowerTerm), now),
317318
upperTerm == null ? null : (includeUpper && parseUpperInclusive) ? dateMathParser.parseUpperInclusive(convertToString(upperTerm), now) : dateMathParser.parse(convertToString(upperTerm), now),
318319
includeLower, includeUpper);

‎src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@
3737
import org.elasticsearch.common.xcontent.XContentParser;
3838
import org.elasticsearch.index.analysis.NamedAnalyzer;
3939
import org.elasticsearch.index.analysis.NumericDoubleAnalyzer;
40-
import org.elasticsearch.index.cache.field.data.FieldDataCache;
4140
import org.elasticsearch.index.codec.postingsformat.PostingsFormatProvider;
4241
import org.elasticsearch.index.field.data.FieldDataType;
42+
import org.elasticsearch.index.fielddata.IndexFieldDataService;
43+
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
4344
import org.elasticsearch.index.mapper.*;
4445
import org.elasticsearch.index.query.QueryParseContext;
4546
import org.elasticsearch.index.search.NumericRangeFieldDataFilter;
@@ -228,8 +229,8 @@ public Filter rangeFilter(Double lowerTerm, Double upperTerm, boolean includeLow
228229
}
229230

230231
@Override
231-
public Filter rangeFilter(FieldDataCache fieldDataCache, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
232-
return NumericRangeFieldDataFilter.newDoubleRange(fieldDataCache, names.indexName(),
232+
public Filter rangeFilter(IndexFieldDataService fieldData, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
233+
return NumericRangeFieldDataFilter.newDoubleRange((IndexNumericFieldData) fieldData.getForField(this),
233234
lowerTerm == null ? null : parseValue(lowerTerm),
234235
upperTerm == null ? null : parseValue(upperTerm),
235236
includeLower, includeUpper);

‎src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@
3838
import org.elasticsearch.common.xcontent.XContentParser;
3939
import org.elasticsearch.index.analysis.NamedAnalyzer;
4040
import org.elasticsearch.index.analysis.NumericFloatAnalyzer;
41-
import org.elasticsearch.index.cache.field.data.FieldDataCache;
4241
import org.elasticsearch.index.codec.postingsformat.PostingsFormatProvider;
4342
import org.elasticsearch.index.field.data.FieldDataType;
43+
import org.elasticsearch.index.fielddata.IndexFieldDataService;
44+
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
4445
import org.elasticsearch.index.mapper.*;
4546
import org.elasticsearch.index.query.QueryParseContext;
4647
import org.elasticsearch.index.search.NumericRangeFieldDataFilter;
@@ -222,8 +223,8 @@ public Filter rangeFilter(Object lowerTerm, Object upperTerm, boolean includeLow
222223
}
223224

224225
@Override
225-
public Filter rangeFilter(FieldDataCache fieldDataCache, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
226-
return NumericRangeFieldDataFilter.newFloatRange(fieldDataCache, names.indexName(),
226+
public Filter rangeFilter(IndexFieldDataService fieldData, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
227+
return NumericRangeFieldDataFilter.newFloatRange((IndexNumericFieldData) fieldData.getForField(this),
227228
lowerTerm == null ? null : parseValue(lowerTerm),
228229
upperTerm == null ? null : parseValue(upperTerm),
229230
includeLower, includeUpper);

‎src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@
3838
import org.elasticsearch.common.xcontent.XContentParser;
3939
import org.elasticsearch.index.analysis.NamedAnalyzer;
4040
import org.elasticsearch.index.analysis.NumericIntegerAnalyzer;
41-
import org.elasticsearch.index.cache.field.data.FieldDataCache;
4241
import org.elasticsearch.index.codec.postingsformat.PostingsFormatProvider;
4342
import org.elasticsearch.index.field.data.FieldDataType;
43+
import org.elasticsearch.index.fielddata.IndexFieldDataService;
44+
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
4445
import org.elasticsearch.index.mapper.*;
4546
import org.elasticsearch.index.query.QueryParseContext;
4647
import org.elasticsearch.index.search.NumericRangeFieldDataFilter;
@@ -228,8 +229,8 @@ public Filter rangeFilter(Object lowerTerm, Object upperTerm, boolean includeLow
228229
}
229230

230231
@Override
231-
public Filter rangeFilter(FieldDataCache fieldDataCache, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
232-
return NumericRangeFieldDataFilter.newIntRange(fieldDataCache, names.indexName(),
232+
public Filter rangeFilter(IndexFieldDataService fieldData, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
233+
return NumericRangeFieldDataFilter.newIntRange((IndexNumericFieldData) fieldData.getForField(this),
233234
lowerTerm == null ? null : parseValue(lowerTerm),
234235
upperTerm == null ? null : parseValue(upperTerm),
235236
includeLower, includeUpper);

‎src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@
3838
import org.elasticsearch.common.xcontent.XContentParser;
3939
import org.elasticsearch.index.analysis.NamedAnalyzer;
4040
import org.elasticsearch.index.analysis.NumericLongAnalyzer;
41-
import org.elasticsearch.index.cache.field.data.FieldDataCache;
4241
import org.elasticsearch.index.codec.postingsformat.PostingsFormatProvider;
4342
import org.elasticsearch.index.field.data.FieldDataType;
43+
import org.elasticsearch.index.fielddata.IndexFieldDataService;
44+
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
4445
import org.elasticsearch.index.mapper.*;
4546
import org.elasticsearch.index.query.QueryParseContext;
4647
import org.elasticsearch.index.search.NumericRangeFieldDataFilter;
@@ -228,8 +229,8 @@ public Filter rangeFilter(Object lowerTerm, Object upperTerm, boolean includeLow
228229
}
229230

230231
@Override
231-
public Filter rangeFilter(FieldDataCache fieldDataCache, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
232-
return NumericRangeFieldDataFilter.newLongRange(fieldDataCache, names.indexName(),
232+
public Filter rangeFilter(IndexFieldDataService fieldData, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
233+
return NumericRangeFieldDataFilter.newLongRange((IndexNumericFieldData) fieldData.getForField(this),
233234
lowerTerm == null ? null : parseValue(lowerTerm),
234235
upperTerm == null ? null : parseValue(upperTerm),
235236
includeLower, includeUpper);

‎src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import org.elasticsearch.common.Nullable;
3131
import org.elasticsearch.common.xcontent.XContentBuilder;
3232
import org.elasticsearch.index.analysis.NamedAnalyzer;
33-
import org.elasticsearch.index.cache.field.data.FieldDataCache;
3433
import org.elasticsearch.index.codec.postingsformat.PostingsFormatProvider;
3534
import org.elasticsearch.index.field.data.FieldDataType;
35+
import org.elasticsearch.index.fielddata.IndexFieldDataService;
3636
import org.elasticsearch.index.mapper.*;
3737
import org.elasticsearch.index.mapper.internal.AllFieldMapper;
3838
import org.elasticsearch.index.query.QueryParseContext;
@@ -242,7 +242,7 @@ public Filter termFilter(Object value, @Nullable QueryParseContext context) {
242242
/**
243243
* A range filter based on the field data cache.
244244
*/
245-
public abstract Filter rangeFilter(FieldDataCache fieldDataCache, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context);
245+
public abstract Filter rangeFilter(IndexFieldDataService fieldData, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context);
246246

247247
/**
248248
* Override the default behavior (to return the string, and return the actual Number instance).

‎src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@
3838
import org.elasticsearch.common.xcontent.XContentParser;
3939
import org.elasticsearch.index.analysis.NamedAnalyzer;
4040
import org.elasticsearch.index.analysis.NumericIntegerAnalyzer;
41-
import org.elasticsearch.index.cache.field.data.FieldDataCache;
4241
import org.elasticsearch.index.codec.postingsformat.PostingsFormatProvider;
4342
import org.elasticsearch.index.field.data.FieldDataType;
43+
import org.elasticsearch.index.fielddata.IndexFieldDataService;
44+
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
4445
import org.elasticsearch.index.mapper.*;
4546
import org.elasticsearch.index.query.QueryParseContext;
4647
import org.elasticsearch.index.search.NumericRangeFieldDataFilter;
@@ -232,8 +233,8 @@ public Filter rangeFilter(Object lowerTerm, Object upperTerm, boolean includeLow
232233
}
233234

234235
@Override
235-
public Filter rangeFilter(FieldDataCache fieldDataCache, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
236-
return NumericRangeFieldDataFilter.newShortRange(fieldDataCache, names.indexName(),
236+
public Filter rangeFilter(IndexFieldDataService fieldData, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
237+
return NumericRangeFieldDataFilter.newShortRange((IndexNumericFieldData) fieldData.getForField(this),
237238
lowerTerm == null ? null : parseValue(lowerTerm),
238239
upperTerm == null ? null : parseValue(upperTerm),
239240
includeLower, includeUpper);

‎src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,10 @@ public DoubleFieldMapper lonMapper() {
287287
return lonMapper;
288288
}
289289

290+
public GeoStringFieldMapper stringMapper() {
291+
return this.geoStringMapper;
292+
}
293+
290294
public boolean isEnableLatLon() {
291295
return enableLatLon;
292296
}

‎src/main/java/org/elasticsearch/index/mapper/internal/BoostFieldMapper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@
3535
import org.elasticsearch.common.xcontent.XContentParser;
3636
import org.elasticsearch.index.analysis.NamedAnalyzer;
3737
import org.elasticsearch.index.analysis.NumericFloatAnalyzer;
38-
import org.elasticsearch.index.cache.field.data.FieldDataCache;
3938
import org.elasticsearch.index.codec.postingsformat.PostingsFormatProvider;
4039
import org.elasticsearch.index.field.data.FieldDataType;
40+
import org.elasticsearch.index.fielddata.IndexFieldDataService;
41+
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
4142
import org.elasticsearch.index.mapper.*;
4243
import org.elasticsearch.index.mapper.core.FloatFieldMapper;
4344
import org.elasticsearch.index.mapper.core.NumberFieldMapper;
@@ -211,8 +212,8 @@ public Filter rangeFilter(Object lowerTerm, Object upperTerm, boolean includeLow
211212
}
212213

213214
@Override
214-
public Filter rangeFilter(FieldDataCache fieldDataCache, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
215-
return NumericRangeFieldDataFilter.newFloatRange(fieldDataCache, names.indexName(),
215+
public Filter rangeFilter(IndexFieldDataService fieldData, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
216+
return NumericRangeFieldDataFilter.newFloatRange((IndexNumericFieldData) fieldData.getForField(this),
216217
lowerTerm == null ? null : parseValue(lowerTerm),
217218
upperTerm == null ? null : parseValue(upperTerm),
218219
includeLower, includeUpper);

‎src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public FieldType defaultFieldType() {
129129

130130
@Override
131131
public org.elasticsearch.index.fielddata.FieldDataType fieldDataType2() {
132-
return new FieldDataType("string");
132+
return new FieldDataType("string", "paged_bytes");
133133
}
134134

135135
@Override

‎src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@
3535
import org.elasticsearch.index.analysis.NamedAnalyzer;
3636
import org.elasticsearch.index.analysis.NumericAnalyzer;
3737
import org.elasticsearch.index.analysis.NumericTokenizer;
38-
import org.elasticsearch.index.cache.field.data.FieldDataCache;
3938
import org.elasticsearch.index.codec.postingsformat.PostingsFormatProvider;
4039
import org.elasticsearch.index.field.data.FieldDataType;
40+
import org.elasticsearch.index.fielddata.IndexFieldDataService;
41+
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
4142
import org.elasticsearch.index.mapper.*;
4243
import org.elasticsearch.index.mapper.core.LongFieldMapper;
4344
import org.elasticsearch.index.mapper.core.NumberFieldMapper;
@@ -249,8 +250,8 @@ public Filter rangeFilter(Object lowerTerm, Object upperTerm, boolean includeLow
249250
}
250251

251252
@Override
252-
public Filter rangeFilter(FieldDataCache fieldDataCache, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
253-
return NumericRangeFieldDataFilter.newLongRange(fieldDataCache, names.indexName(),
253+
public Filter rangeFilter(IndexFieldDataService fieldData, Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
254+
return NumericRangeFieldDataFilter.newLongRange((IndexNumericFieldData) fieldData.getForField(this),
254255
lowerTerm == null ? null : parseValue(lowerTerm),
255256
upperTerm == null ? null : parseValue(upperTerm),
256257
includeLower, includeUpper);

‎src/main/java/org/elasticsearch/index/query/GeoBoundingBoxFilterParser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.elasticsearch.common.inject.Inject;
2424
import org.elasticsearch.common.xcontent.XContentParser;
2525
import org.elasticsearch.index.cache.filter.support.CacheKeyFilter;
26+
import org.elasticsearch.index.fielddata.IndexGeoPointFieldData;
2627
import org.elasticsearch.index.mapper.FieldMapper;
2728
import org.elasticsearch.index.mapper.MapperService;
2829
import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;
@@ -174,13 +175,12 @@ public Filter parse(QueryParseContext parseContext) throws IOException, QueryPar
174175
}
175176
GeoPointFieldMapper geoMapper = ((GeoPointFieldMapper.GeoStringFieldMapper) mapper).geoMapper();
176177

177-
fieldName = mapper.names().indexName();
178-
179178
Filter filter;
180179
if ("indexed".equals(type)) {
181180
filter = IndexedGeoBoundingBoxFilter.create(topLeft, bottomRight, geoMapper);
182181
} else if ("memory".equals(type)) {
183-
filter = new InMemoryGeoBoundingBoxFilter(topLeft, bottomRight, fieldName, parseContext.indexCache().fieldData());
182+
IndexGeoPointFieldData indexFieldData = parseContext.fieldData().getForField(mapper);
183+
filter = new InMemoryGeoBoundingBoxFilter(topLeft, bottomRight, indexFieldData);
184184
} else {
185185
throw new QueryParsingException(parseContext.index(), "geo bounding box type [" + type + "] not supported, either 'indexed' or 'memory' are allowed");
186186
}

‎src/main/java/org/elasticsearch/index/query/GeoDistanceFilterParser.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.elasticsearch.common.unit.DistanceUnit;
2525
import org.elasticsearch.common.xcontent.XContentParser;
2626
import org.elasticsearch.index.cache.filter.support.CacheKeyFilter;
27+
import org.elasticsearch.index.fielddata.IndexGeoPointFieldData;
2728
import org.elasticsearch.index.mapper.FieldMapper;
2829
import org.elasticsearch.index.mapper.MapperService;
29-
import org.elasticsearch.index.mapper.geo.GeoPointFieldDataType;
3030
import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;
3131
import org.elasticsearch.index.search.geo.*;
3232

@@ -177,13 +177,14 @@ public Filter parse(QueryParseContext parseContext) throws IOException, QueryPar
177177
throw new QueryParsingException(parseContext.index(), "failed to find geo_point field [" + fieldName + "]");
178178
}
179179
FieldMapper mapper = smartMappers.mapper();
180-
if (mapper.fieldDataType() != GeoPointFieldDataType.TYPE) {
180+
if (!(mapper instanceof GeoPointFieldMapper.GeoStringFieldMapper)) {
181181
throw new QueryParsingException(parseContext.index(), "field [" + fieldName + "] is not a geo_point field");
182182
}
183183
GeoPointFieldMapper geoMapper = ((GeoPointFieldMapper.GeoStringFieldMapper) mapper).geoMapper();
184-
fieldName = mapper.names().indexName();
185184

186-
Filter filter = new GeoDistanceFilter(lat, lon, distance, geoDistance, fieldName, geoMapper, parseContext.indexCache().fieldData(), optimizeBbox);
185+
186+
IndexGeoPointFieldData indexFieldData = parseContext.fieldData().getForField(mapper);
187+
Filter filter = new GeoDistanceFilter(lat, lon, distance, geoDistance, indexFieldData, geoMapper, optimizeBbox);
187188
if (cache) {
188189
filter = parseContext.cacheFilter(filter, cacheKey);
189190
}

0 commit comments

Comments
 (0)