Skip to content

Commit 166e4b0

Browse files
committed
timestamp term match broken in 0.18.5, closes elastic#1543.
1 parent 7e0e2b0 commit 166e4b0

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

.idea/gradle.xml

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/groovyc.xml

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.lucene.search.NumericRangeQuery;
2727
import org.apache.lucene.search.Query;
2828
import org.apache.lucene.util.NumericUtils;
29+
import org.elasticsearch.common.Nullable;
2930
import org.elasticsearch.common.Numbers;
3031
import org.elasticsearch.common.Strings;
3132
import org.elasticsearch.common.joda.FormatDateTimeFormatter;
@@ -44,6 +45,7 @@
4445
import org.elasticsearch.index.mapper.MergeContext;
4546
import org.elasticsearch.index.mapper.MergeMappingException;
4647
import org.elasticsearch.index.mapper.ParseContext;
48+
import org.elasticsearch.index.query.QueryParseContext;
4749
import org.elasticsearch.index.search.NumericRangeFieldDataFilter;
4850

4951
import java.io.IOException;
@@ -219,13 +221,25 @@ protected DateFieldMapper(Names names, FormatDateTimeFormatter dateTimeFormatter
219221
true, true);
220222
}
221223

224+
@Override public Query fieldQuery(String value, @Nullable QueryParseContext context) {
225+
long lValue = parseStringValue(value);
226+
return NumericRangeQuery.newLongRange(names.indexName(), precisionStep,
227+
lValue, lValue, true, true);
228+
}
229+
222230
@Override public Query rangeQuery(String lowerTerm, String upperTerm, boolean includeLower, boolean includeUpper) {
223231
return NumericRangeQuery.newLongRange(names.indexName(), precisionStep,
224232
lowerTerm == null ? null : parseStringValue(lowerTerm),
225233
upperTerm == null ? null : includeUpper ? parseUpperInclusiveStringValue(upperTerm) : parseStringValue(upperTerm),
226234
includeLower, includeUpper);
227235
}
228236

237+
@Override public Filter fieldFilter(String value, @Nullable QueryParseContext context) {
238+
long lValue = parseStringValue(value);
239+
return NumericRangeFilter.newLongRange(names.indexName(), precisionStep,
240+
lValue, lValue, true, true);
241+
}
242+
229243
@Override public Filter rangeFilter(String lowerTerm, String upperTerm, boolean includeLower, boolean includeUpper) {
230244
return NumericRangeFilter.newLongRange(names.indexName(), precisionStep,
231245
lowerTerm == null ? null : parseStringValue(lowerTerm),

0 commit comments

Comments
 (0)