Merge branch '0.8'

Conflicts:
	api/http/api.go
	cluster/cluster_configuration.go
	cluster/cluster_configuration_test.go
	coordinator/coordinator.go
	engine/aggregator_operators.go
	engine/common_merge_engine.go
	integration/data_test.go
	parser/parser.go

CHANGELOG.md

@@ -1,6 +1,44 @@
 ## v0.9.0 [unreleased]
 
-### Features
+### Bugfixes
+
+## v0.8.3 [2014-09-24]
+
+### Bugfixes
+
+- [Issue #885](https://github.com/influxdb/influxdb/issues/885). Multiple
+  queries separated by semicolons work as expected. Queries are process
+  sequentially
+- [Issue #652](https://github.com/influxdb/influxdb/issues/652). Return an
+  error if an invalid column is used in the where clause
+- [Issue #794](https://github.com/influxdb/influxdb/issues/794). Fix case
+  insensitive regex matching
+- [Issue #853](https://github.com/influxdb/influxdb/issues/853). Move
+  cluster config from raft to API.
+- [Issue #714](https://github.com/influxdb/influxdb/issues/714). Don't
+  panic on invalid boolean operators.
+- [Issue #843](https://github.com/influxdb/influxdb/issues/843). Prevent blank database names
+- [Issue #780](https://github.com/influxdb/influxdb/issues/780). Fix
+  fill() for all aggregators
+- [Issue #923](https://github.com/influxdb/influxdb/issues/923). Enclose
+  table names in double quotes in the result of GetQueryString()
+- [Issue #923](https://github.com/influxdb/influxdb/issues/923). Enclose
+  table names in double quotes in the result of GetQueryString()
+- [Issue #967](https://github.com/influxdb/influxdb/issues/967). Return an
+  error if the storage engine can't be created
+- [Issue #954](https://github.com/influxdb/influxdb/issues/954). Don't automatically
+  create shards which was causing too many shards to be created when used with
+  grafana
+- [Issue #939](https://github.com/influxdb/influxdb/issues/939). Aggregation should
+  ignore null values and invalid values, e.g. strings with mean().
+- [Issue #964](https://github.com/influxdb/influxdb/issues/964). Parse
+  big int in queries properly.
+
+## v0.8.2 [2014-09-05]
+
+### Bugfixes
+
+- [Issue #886](https://github.com/influxdb/influxdb/issues/886). Update shard space to not set defaults
 
 - [Issue #867](https://github.com/influxdb/influxdb/issues/867). Add option to return shard space mappings in list series
 

Makefile.in

@@ -272,7 +272,7 @@ ifeq ($(version),)
 	version = "dev"
 endif
 
-timeout = 10m
+timeout = 20m
 GOTEST_OPTS += -test.timeout=$(timeout)
 
 test: test_dependencies parser protobuf

cluster/cluster_configuration_test.go

@@ -1,8 +1,6 @@
 package cluster
 
 import (
-	"fmt"
-
 	"github.com/influxdb/influxdb/configuration"
 	"github.com/influxdb/influxdb/metastore"
 	. "launchpad.net/gocheck"
@@ -28,7 +26,6 @@ func (self *ClusterConfigurationSuite) TestSerializesShardSpaces(c *C) {
 	space2.Regex = "/space2/"
 	err = clusterConfig.AddShardSpace(space2)
 	c.Assert(err, IsNil)
-	fmt.Println(clusterConfig.databaseShardSpaces)
 
 	verify := func(conf *ClusterConfiguration) {
 		spaces := conf.databaseShardSpaces["db1"]

coordinator/coordinator.go

@@ -51,9 +51,7 @@ func (self *Coordinator) RunQuery(user common.User, database string, queryString
 	}
 
 	for _, query := range q {
-		// runSingleQuery shouldn't close the processor in case there are
-		// other queries to be run
-		err := self.runSingleQuery(user, database, query, p)
+		err := self.runSingleQuery(user, database, query, seriesWriter)
 		if err != nil {
 			return err
 		}

integration/data_test.go

@@ -1197,14 +1197,14 @@ func (self *DataTestSuite) TestAggregateWithExpression(c *C) {
 }
 
 func (self *DataTestSuite) verifyWrite(seriesName string, value interface{}, c *C) {
-	series := CreatePoints("foo", 1, 1)
+	series := CreatePoints(seriesName, 1, 1)
 	series[0].Columns = append(series[0].Columns, "time", "sequence_number")
 	now := time.Now().Truncate(time.Hour)
 	series[0].Points[0] = append(series[0].Points[0], 1.0, now.Unix())
 	self.client.WriteData(series, c, "s")
 	series[0].Points[0][0] = value
 	self.client.WriteData(series, c, "s")
-	data := self.client.RunQuery("select * from foo", c, "m")
+	data := self.client.RunQuery("select * from "+seriesName, c, "m")
 	if value == nil {
 		c.Assert(data, HasLen, 0)
 		return
@@ -1391,7 +1391,6 @@ func (self *DataTestSuite) TestArithmeticOperations(c *C) {
 	}
 
 	for query, values := range queries {
-
 		data := self.client.RunQuery(query, c, "m")
 		c.Assert(data, HasLen, 1)
 		c.Assert(data[0].Columns, HasLen, 3)
@@ -1437,8 +1436,8 @@ func (self *DataTestSuite) TestCountQueryOnSingleShard(c *C) {
 func (self *DataTestSuite) TestWhereClauseWithFunction(c *C) {
 	serieses := CreatePoints("test_where_clause_with_function", 1, 1)
 	self.client.WriteData(serieses, c)
+	// Make sure the query returns an error
 	self.client.RunInvalidQuery("select column0 from test_where_clause_with_function where empty(column0)", c)
-	//FIXME: Why doesn't this test have asserts?
 }
 
 func (self *DataTestSuite) TestGroupByDay(c *C) {