Fix to keep exhaustive agg from going on into forever

brianhks · brianhks · commit d5cd0bc7df64 · 2017-02-02T13:19:40.000-07:00
diff --git a/src/main/java/org/kairosdb/core/aggregator/RangeAggregator.java b/src/main/java/org/kairosdb/core/aggregator/RangeAggregator.java
@@ -164,7 +164,14 @@ public void setStartTime(long startTime)
 
 	public void setEndTime(long endTime)
 	{
-		m_queryEndTime = endTime;
+		//This is to tell the exhaustive agg when to stop.
+		//If the end time is not specified in the query the end time is
+		//set to MAX_LONG which causes exhaustive agg to go on forever.
+		long now = System.currentTimeMillis();
+		if (endTime > now)
+			m_queryEndTime = now;
+		else
+			m_queryEndTime = endTime;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,14 @@ public void setStartTime(long startTime)`
`164`	`164`
`165`	`165`	`public void setEndTime(long endTime)`
`166`	`166`	`{`
`167`		`- m_queryEndTime = endTime;`
	`167`	`+ //This is to tell the exhaustive agg when to stop.`
	`168`	`+ //If the end time is not specified in the query the end time is`
	`169`	`+ //set to MAX_LONG which causes exhaustive agg to go on forever.`
	`170`	`+ long now = System.currentTimeMillis();`
	`171`	`+ if (endTime > now)`
	`172`	`+ m_queryEndTime = now;`
	`173`	`+ else`
	`174`	`+ m_queryEndTime = endTime;`
`168`	`175`	`}`
`169`	`176`
`170`	`177`	`/**`