Fix #1050 by seeking to the start timestamp of the query when the

manolama · manolama · commit e3cba734f1f7 · 2017-08-30T10:06:41.000-07:00
time zone aligned timestamp may be earlier than the start time.

Signed-off-by: Chris Larsen &lt;clarsen@yahoo-inc.com&gt;
diff --git a/src/core/AggregationIterator.java b/src/core/AggregationIterator.java
@@ -361,7 +361,7 @@ public AggregationIterator(final SeekableView[] iterators,
     for (int i = 0; i < size; i++) {
       SeekableView it = iterators[i];
       it.seek(start_time);
-      final DataPoint dp;
+      DataPoint dp;
       if (!it.hasNext()) {
         ++num_empty_spans;
         endReached(i);
@@ -374,12 +374,23 @@ public AggregationIterator(final SeekableView[] iterators,
         //          + dp.timestamp() + " >= " + start_time);
         putDataPoint(size + i, dp);
       } else {
-        if (LOG.isDebugEnabled()) {
-          LOG.debug(String.format("No DP in range for #%d: %d < %d", i,
-                                  dp.timestamp(), start_time));
+        // if there is data, advance to the start time if applicable.
+        while (dp != null && dp.timestamp() < start_time) {
+          if (it.hasNext()) {
+            dp = it.next();
+          } else {
+            dp = null;
+          }
         }
-        endReached(i);
-        continue;
+        if (dp == null) {
+          if (LOG.isDebugEnabled()) {
+            LOG.debug(String.format("No DP in range for #%d: start time %d", i,
+                                    start_time));
+          }
+          endReached(i);
+          continue;
+        }
+        putDataPoint(size + i, dp);
       }
       if (rate) {
         // The first rate against the time zero should be populated
