iter

Author: javanna

server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java

@@ -527,16 +527,16 @@ static ReducedQueryPhase reducedQueryPhase(
                 sortValueFormats = result.sortValueFormats();
             }
 
-            if (timeRangeFilterFromMillis == null) {
-                // we simply take the first one: we should get the same value from all shards anyway
-                timeRangeFilterFromMillis = result.getTimeRangeFilterFromMillis();
+            if (result.getTimeRangeFilterFromMillis() != null) {
+                if (timeRangeFilterFromMillis == null) {
+                    timeRangeFilterFromMillis = result.getTimeRangeFilterFromMillis();
+                } else {
+                    //all shards should hold the same value, besides edge cases like different mappings
+                    // for event.ingested and @timestamp across indices being searched
+                    timeRangeFilterFromMillis = Math.min(result.getTimeRangeFilterFromMillis(), timeRangeFilterFromMillis);
+                }
             }
 
-            assert timeRangeFilterFromMillis == null
-                || result.getTimeRangeFilterFromMillis() == null
-                || timeRangeFilterFromMillis.equals(result.getTimeRangeFilterFromMillis())
-                : timeRangeFilterFromMillis + " != " + result.getTimeRangeFilterFromMillis();
-
             if (hasSuggest) {
                 assert result.suggest() != null;
                 for (Suggestion<? extends Suggestion.Entry<? extends Suggestion.Entry.Option>> suggestion : result.suggest()) {