fixed tests

Author: martijnvg

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

@@ -99,6 +99,13 @@ public int advance(int target) throws IOException {
                     case YES:
                         return doc = target;
                     case MAYBE:
+                        if (target > innerApproximation.docID()) {
+                            target = innerApproximation.advance(target);
+                        }
+                        if (target <= upTo) {
+                            return doc = target;
+                        }
+                        break;
                     case NO:
                         if (match == Match.NO) {
                             primaryFieldSkipper.advance(target);

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

@@ -61,8 +61,20 @@ public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float bo
 
             @Override
             public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOException {
-                int maxDoc = context.reader().maxDoc();
-                var timestampSkipper = context.reader().getDocValuesSkipper(FIELD_NAME);
+                var reader = context.reader();
+                int maxDoc = reader.maxDoc();
+                if (maxDoc == 0) {
+                    return null;
+                }
+                if (reader.getFieldInfos().fieldInfo(FIELD_NAME) == null) {
+                    return null;
+                }
+
+                Sort indexSort = reader.getMetaData().sort();
+                assert indexSort != null;
+                assert indexSort.getSort().length == 1 || indexSort.getSort().length == 2;
+
+                var timestampSkipper = reader.getDocValuesSkipper(FIELD_NAME);
                 assert timestampSkipper != null;
                 if (timestampSkipper.minValue() > maxTimestamp || timestampSkipper.maxValue() < minTimestamp) {
                     return null;
@@ -71,14 +83,10 @@ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOExcepti
                     return ConstantScoreScorerSupplier.matchAll(score(), scoreMode, maxDoc);
                 }
 
-                Sort indexSort = context.reader().getMetaData().sort();
-                assert indexSort != null;
-                assert indexSort.getSort().length == 1 || indexSort.getSort().length == 2;
-                String primarySortField = indexSort.getSort()[0].getField();
-
                 var timestamps = getNumericDocValues(context);
+                String primarySortField = indexSort.getSort()[0].getField();
                 boolean timestampIsPrimarySort = primarySortField.equals(FIELD_NAME);
-                var primaryFieldValues = timestampIsPrimarySort ? null : context.reader().getSortedDocValues(primarySortField);
+                var primaryFieldValues = timestampIsPrimarySort ? null : reader.getSortedDocValues(primarySortField);
                 if (primaryFieldValues == null || primaryFieldValues.getValueCount() <= 1) {
                     var iterator = getIteratorIfTimestampIfPrimarySort(maxDoc, timestamps, timestampSkipper, minTimestamp, maxTimestamp);
                     return ConstantScoreScorerSupplier.fromIterator(iterator, score(), scoreMode, maxDoc);
@@ -95,7 +103,7 @@ public float matchCost() {
                         return 2; // 2 comparisons
                     }
                 };
-                var primaryFieldSkipper = context.reader().getDocValuesSkipper(primarySortField);
+                var primaryFieldSkipper = reader.getDocValuesSkipper(primarySortField);
                 iterator = new TimestampIterator(iterator, timestampSkipper, primaryFieldSkipper, minTimestamp, maxTimestamp);
                 return ConstantScoreScorerSupplier.fromIterator(TwoPhaseIterator.asDocIdSetIterator(iterator), score(), scoreMode, maxDoc);
             }
@@ -143,7 +151,7 @@ static NumericDocValues getNumericDocValues(LeafReaderContext ctx) throws IOExce
         var timestampValues = DocValues.getSortedNumeric(ctx.reader(), FIELD_NAME);
         assert timestampValues != null;
         var timestampSingleton = DocValues.unwrapSingleton(timestampValues);
-        assert timestampSingleton != null;
+        assert timestampSingleton != null : "@timestamp has multiple values per document";
         return timestampSingleton;
     }
 

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

@@ -10,10 +10,12 @@
 
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.TopDocs;
+import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.query.SearchExecutionContext;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class DoubleIndexingDocTests extends MapperServiceTestCase {
     public void testDoubleIndexingSameDoc() throws Exception {
@@ -31,6 +33,7 @@ public void testDoubleIndexingSameDoc() throws Exception {
         merge(mapperService, dynamicMapping(doc.dynamicMappingsUpdate()));
 
         SearchExecutionContext context = mock(SearchExecutionContext.class);
+        when(context.getIndexSettings()).thenReturn(createIndexSettings(IndexVersion.current(), getIndexSettings()));
 
         withLuceneIndex(mapperService, iw -> {
             iw.addDocument(doc.rootDoc());