HighestCurrent may return wrong result

Because of DataPoints maybe empty and AggregationIterator.hasNextValue() will skip empty item. Signed-off-by: Chris Larsen <[email protected]>
jason-bj · May 21, 2018 · 58ab435 · 58ab435
1 parent a733c22
commit 58ab435
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/query/expression/HighestCurrent.java b/src/query/expression/HighestCurrent.java
@@ -92,10 +92,14 @@ public DataPoints[] evaluate(final TSQuery data_query,
               MutableDataPoint.ofLongValue(point.timestamp(), point.longValue())
             : MutableDataPoint.ofDoubleValue(point.timestamp(), point.doubleValue()));
         }
-        post_agg_results[ix++] = new PostAggregatedDataPoints(dps,
-                mutable_points.toArray(new DataPoint[mutable_points.size()]));
+        // Because of AggregationIterator.hasNextValue() will skip empty item.
+        if (mutable_points.size() > 0) {
+            post_agg_results[ix++] = new PostAggregatedDataPoints(dps,
+                    mutable_points.toArray(new DataPoint[mutable_points.size()]));
+        }
       }
     }
+    num_results = ix;
 
     final SeekableView[] views = new SeekableView[num_results];
     for (int i = 0; i < num_results; i++) {