Optimization

processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java

@@ -259,13 +259,14 @@ public class ScanQueryEngine
   }
 
   /**
-   * If we're performing time-ordering, we want to scan through every row in the segment (hence the maximum limit)
+   * If we're performing time-ordering, we want to scan through the first `limit` rows ignoring the number
+   * of rows already counted on other segments.
    */
   private long calculateLimit(ScanQuery query, Map<String, Object> responseContext)
   {
     if (query.getTimeOrder().equals(ScanQuery.TimeOrder.NONE)) {
       return query.getLimit() - (long) responseContext.get(ScanQueryRunnerFactory.CTX_COUNT);
     }
-    return Long.MAX_VALUE;
+    return query.getLimit();
   }
 }