iter2

Author: martijnvg

server/src/main/java/org/elasticsearch/lucene/queries/TimestampComparator.java

@@ -108,7 +108,7 @@ class TimestampLeafComparator implements LeafFieldComparator {
                 primaryFieldSkipper = null;
             }
 
-            if (timestampSkipper.maxValue() < bottom) {
+            if (timestampSkipper == null || timestampSkipper.maxValue() < bottom) {
                 this.competitiveIterator = DocIdSetIterator.empty();
             } else {
                 this.competitiveIterator = DocIdSetIterator.all(maxDoc);

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

@@ -380,7 +380,9 @@ public SortFieldAndFormat build(SearchExecutionContext context) throws IOExcepti
             // (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)) {
                 field = new SortField(getFieldName(), new IndexFieldData.XFieldComparatorSource(missing, localSortMode(), nested) {
                     @Override