Return nil when we're supposed to stop processing points.

Fix #821
influxdata · Oct 27, 2014 · 6eb6e6a · 6eb6e6a
1 parent 225e9ad
commit 6eb6e6a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
-## V0.8.4-rc.2 [unreleased]
+## v0.8.5 [unreleased]
+
+### Bugfixes
+
+- [Issue #821](https://github.com/influxdb/influxdb/issues/821). Don't
+  scan through points when we hit the limit
+
+## v0.8.4-rc.2 [2014-10-24]
 
 ### Bugfixes
 

diff --git a/datastore/shard.go b/datastore/shard.go
@@ -209,6 +209,7 @@ func (self *Shard) executeQueryForSeries(querySpec *parser.QuerySpec, name strin
 					log.Error("Error while processing data: %v", err)
 					return err
 				}
+				return nil
 			}
 			seriesOutgoing = &protocol.Series{Name: protocol.String(name), Fields: columns, Points: make([]*protocol.Point, 0, self.pointBatchSize)}
 		}