improve conditions when to apply ts query logic.

Author: martijnvg

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

@@ -740,8 +740,12 @@ public Query rangeQuery(
                 parser = forcedDateParser;
             }
             return dateRangeQuery(lowerTerm, upperTerm, includeLower, includeUpper, timeZone, parser, context, resolution, (l, u) -> {
-                var indexMode = context.getIndexSettings().getMode();
+                var indexSettings = context.getIndexSettings();
+                var indexMode = indexSettings.getMode();
+                boolean sortOnTimestamp = indexSettings.getIndexSortConfig().hasSortOnField(DataStream.TIMESTAMP_FIELD_NAME);
                 if ((indexMode == IndexMode.TIME_SERIES || indexMode == IndexMode.LOGSDB)
+                    && sortOnTimestamp
+                    && indexSettings.useDocValuesSkipper()
                     && name().equals(DataStream.TIMESTAMP_FIELD_NAME)) {
                     return new TimestampQuery(l, u);
                 }

server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java

@@ -379,11 +379,13 @@ public SortFieldAndFormat build(SearchExecutionContext context) throws IOExcepti
             // TODO: HACK to wire up the special timestamp comparator
             // (typically we default to Lucene's sort fields and enabling a custom sort field for timestamp field mapper fails,
             // because index sorting uses this as well. Index sorting doesn't support custom sort fields. Need to fix this)
-            var indexMode = context.getIndexSettings().getMode();
-            boolean sortOnTimestamp = context.getIndexSettings().getIndexSortConfig().hasSortOnField(DataStream.TIMESTAMP_FIELD_NAME);
-            if (DataStream.TIMESTAMP_FIELD_NAME.equals(fieldName)
-                && sortOnTimestamp
-                && (indexMode == IndexMode.LOGSDB || indexMode == IndexMode.TIME_SERIES)) {
+            var indexSettings = context.getIndexSettings();
+            var indexMode = indexSettings.getMode();
+            boolean sortOnTimestamp = indexSettings.getIndexSortConfig().hasSortOnField(DataStream.TIMESTAMP_FIELD_NAME);
+            if (sortOnTimestamp
+                && (indexMode == IndexMode.LOGSDB || indexMode == IndexMode.TIME_SERIES)
+                && indexSettings.useDocValuesSkipper()
+                && DataStream.TIMESTAMP_FIELD_NAME.equals(fieldName)) {
                 field = new SortField(getFieldName(), new IndexFieldData.XFieldComparatorSource(missing, localSortMode(), nested) {
                     @Override
                     public FieldComparator<?> newComparator(String fieldname, int numHits, Pruning pruning, boolean reversed) {