Break out isFieldWithinQuery optimization into separate PR

Author: jordan-powers

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

@@ -16,7 +16,6 @@
 import org.apache.lucene.document.LongPoint;
 import org.apache.lucene.document.SortedNumericDocValuesField;
 import org.apache.lucene.document.StoredField;
-import org.apache.lucene.index.DocValuesSkipper;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.PointValues;
@@ -70,7 +69,6 @@
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.Collections;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
@@ -829,24 +827,8 @@ public Relation isFieldWithinQuery(
             QueryRewriteContext context
         ) throws IOException {
             if (isIndexed() == false && pointsMetadataAvailable == false && hasDocValues()) {
-                if (hasDocValuesSkipper() == false) {
-                    // we don't have a quick way to run this check on doc values, so fall back to default assuming we are within bounds
-                    return Relation.INTERSECTS;
-                }
-                long minValue = Long.MAX_VALUE;
-                long maxValue = Long.MIN_VALUE;
-                List<LeafReaderContext> leaves = reader.leaves();
-                if (leaves.size() == 0) {
-                    // no data, so nothing matches
-                    return Relation.DISJOINT;
-                }
-                for (LeafReaderContext ctx : leaves) {
-                    DocValuesSkipper skipper = ctx.reader().getDocValuesSkipper(name());
-                    assert skipper != null : "no skipper for field:" + name() + " and reader:" + reader;
-                    minValue = Long.min(minValue, skipper.minValue());
-                    maxValue = Long.max(maxValue, skipper.maxValue());
-                }
-                return isFieldWithinQuery(minValue, maxValue, from, to, includeLower, includeUpper, timeZone, dateParser, context);
+                // we don't have a quick way to run this check on doc values, so fall back to default assuming we are within bounds
+                return Relation.INTERSECTS;
             }
             byte[] minPackedValue = PointValues.getMinPackedValue(reader, name());
             if (minPackedValue == null) {

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

@@ -8,7 +8,6 @@
  */
 package org.elasticsearch.index.mapper;
 
-import org.apache.lucene.document.Field;
 import org.apache.lucene.document.LongPoint;
 import org.apache.lucene.document.NumericDocValuesField;
 import org.apache.lucene.document.SortedNumericDocValuesField;
@@ -86,51 +85,12 @@ public void testIsFieldWithinQueryDateNanos() throws IOException {
         isFieldWithinRangeTestCase(ft);
     }
 
-    public void testIsFieldWithinQueryDateMillisDocValueSkipper() throws IOException {
-        DateFieldType ft = new DateFieldType(
-            "my_date",
-            false,
-            false,
-            false,
-            true,
-            true,
-            DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER,
-            Resolution.MILLISECONDS,
-            null,
-            null,
-            Collections.emptyMap()
-        );
-        isFieldWithinRangeTestCase(ft);
-    }
-
-    public void testIsFieldWithinQueryDateNanosDocValueSkipper() throws IOException {
-        DateFieldType ft = new DateFieldType(
-            "my_date",
-            false,
-            false,
-            false,
-            true,
-            true,
-            DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER,
-            Resolution.NANOSECONDS,
-            null,
-            null,
-            Collections.emptyMap()
-        );
-        isFieldWithinRangeTestCase(ft);
-    }
-
     public void isFieldWithinRangeTestCase(DateFieldType ft) throws IOException {
 
         Directory dir = newDirectory();
         IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null));
         LuceneDocument doc = new LuceneDocument();
-        Field field;
-        if (ft.hasDocValuesSkipper()) {
-            field = SortedNumericDocValuesField.indexedField("my_date", ft.parse("2015-10-12"));
-        } else {
-            field = new LongPoint("my_date", ft.parse("2015-10-12"));
-        }
+        LongPoint field = new LongPoint("my_date", ft.parse("2015-10-12"));
         doc.add(field);
         w.addDocument(doc);
         field.setLongValue(ft.parse("2016-04-03"));