Use date format in mapping before fallback to default if not force format (elastic#29282)

Author: liketic

server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java

@@ -292,6 +292,9 @@ public Query termQuery(Object value, QueryShardContext context) {
         public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper,
                                 ShapeRelation relation, DateTimeZone timeZone, DateMathParser parser, QueryShardContext context) {
             failIfNotIndexed();
+            if (parser == null) {
+                parser = dateMathParser();
+            }
             return rangeType.rangeQuery(name(), hasDocValues(), lowerTerm, upperTerm, includeLower, includeUpper, relation,
                 timeZone, parser, context);
         }

server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java

@@ -34,6 +34,8 @@
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.geo.ShapeRelation;
+import org.elasticsearch.common.joda.DateMathParser;
+import org.elasticsearch.common.joda.FormatDateTimeFormatter;
 import org.elasticsearch.common.joda.Joda;
 import org.elasticsearch.common.network.InetAddresses;
 import org.elasticsearch.common.settings.Settings;
@@ -98,6 +100,33 @@ public void testRangeQuery() throws Exception {
             ft.rangeQuery(from, to, includeLower, includeUpper, relation, null, null, context));
     }
 
+    public void testRangeQueryUsingMappingFormat() throws Exception {
+        Settings indexSettings = Settings.builder()
+            .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build();
+        IndexSettings idxSettings = IndexSettingsModule.newIndexSettings(randomAlphaOfLengthBetween(1, 10), indexSettings);
+        QueryShardContext context = new QueryShardContext(0, idxSettings, null, null, null, null, null, xContentRegistry(),
+            writableRegistry(), null, null, () -> nowInMillis, null);
+
+        Version version = randomFrom(Version.V_5_0_0_alpha1, Version.V_6_0_0_beta1, Version.CURRENT);
+        RangeFieldMapper.RangeFieldType ft = new RangeFieldMapper.RangeFieldType(RangeType.DATE, version);
+        ft.setName(FIELDNAME);
+        ft.setIndexOptions(IndexOptions.DOCS);
+
+        FormatDateTimeFormatter formatter = Joda.forPattern( "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis");
+        ft.setDateTimeFormatter(formatter);
+        ShapeRelation relation = RandomPicks.randomFrom(random(), ShapeRelation.values());
+        boolean includeLower = random().nextBoolean();
+        boolean includeUpper = random().nextBoolean();
+        Object from = nextFrom();
+        Object to = nextTo(from);
+
+        boolean hasDocValues = version.onOrAfter(Version.V_6_0_0_beta1);
+        assertEquals(
+            RangeType.DATE.rangeQuery(FIELDNAME, hasDocValues, from, to, includeLower,
+                includeUpper, relation, null, ft.dateMathParser(), context),
+            ft.rangeQuery(from, to, includeLower, includeUpper, relation, null, ft.dateMathParser(), context));
+    }
+
     private Query getExpectedRangeQuery(ShapeRelation relation, Object from, Object to, boolean includeLower, boolean includeUpper) {
         switch (type) {
             case DATE: