Make sure null values are excluded from single point requests.

src/datastore/leveldb_datastore.go

@@ -666,40 +666,38 @@ func isPointInRange(fieldId, startTime, endTime, point []byte) bool {
 func (self *LevelDbDatastore) fetchSinglePoint(database, series string, fields []*Field,
 	query *parser.SelectQuery) (*protocol.Series, error) {
 	fieldCount := len(fields)
-	fieldNames := make([]string, fieldCount)
+	fieldNames := make([]string, 0, fieldCount)
-	point := &protocol.Point{Values: make([]*protocol.FieldValue, fieldCount, fieldCount)}
+	point := &protocol.Point{Values: make([]*protocol.FieldValue, 0, fieldCount)}
+	timestampBuffer := bytes.NewBuffer(make([]byte, 0, 8))
+	sequenceNumberBuffer := bytes.NewBuffer(make([]byte, 0, 8))
+	timestamp := common.TimeToMicroseconds(query.GetStartTime())
+	sequenceNumber, err := query.GetSinglePointQuerySequenceNumber()
+	if err != nil {
+		return nil, err
+	}
 
-	for i, field := range fields {
+	binary.Write(timestampBuffer, binary.BigEndian, self.convertTimestampToUint(&timestamp))
+	binary.Write(sequenceNumberBuffer, binary.BigEndian, sequenceNumber)
+	sequenceNumber_uint64 := uint64(sequenceNumber)
+	point.SequenceNumber = &sequenceNumber_uint64
+	point.SetTimestampInMicroseconds(timestamp)
 
-		fieldNames[i] = field.Name
+	for _, field := range fields {
-		timestampBuffer := bytes.NewBuffer(make([]byte, 0, 8))
-		sequenceNumberBuffer := bytes.NewBuffer(make([]byte, 0, 8))
-
-		timestamp := common.TimeToMicroseconds(query.GetStartTime())
-		sequence_number, err := query.GetSinglePointQuerySequenceNumber()
-		if err != nil {
-			return nil, err
-		}
-
-		binary.Write(timestampBuffer, binary.BigEndian, self.convertTimestampToUint(&timestamp))
-		binary.Write(sequenceNumberBuffer, binary.BigEndian, sequence_number)
 		pointKey := append(append(field.Id, timestampBuffer.Bytes()...), sequenceNumberBuffer.Bytes()...)
 
 		if data, err := self.db.Get(self.readOptions, pointKey); err != nil {
 			return nil, err
 		} else {
-			fv := &protocol.FieldValue{}
+			fieldValue := &protocol.FieldValue{}
-			err := proto.Unmarshal(data, fv)
+			err := proto.Unmarshal(data, fieldValue)
 			if err != nil {
 				return nil, err
 			}
-			point.Values[i] = fv
+			if data != nil {
+				fieldNames = append(fieldNames, field.Name)
+				point.Values = append(point.Values, fieldValue)
+			}
 		}
-
-		seq := uint64(sequence_number)
-		point.SetTimestampInMicroseconds(timestamp)
-		point.SequenceNumber = &seq
-
 	}
 
 	result := &protocol.Series{Name: &series, Fields: fieldNames, Points: []*protocol.Point{point}}

src/integration/benchmark_test.go

@@ -917,11 +917,44 @@ func (self *IntegrationSuite) TestSinglePointSelect(c *C) {
 		c.Assert(err, IsNil)
 		c.Assert(data, HasLen, 1)
 		c.Assert(data[0].Points, HasLen, 1)
+		c.Assert(data[0].Points[0], HasLen, 4)
 		c.Assert(data[0].Points[0][2], Equals, point[2])
 		c.Assert(data[0].Points[0][3], Equals, point[3])
 	}
 }
 
+func (self *IntegrationSuite) TestSinglePointSelectWithNullValues(c *C) {
+	err := self.server.WriteData(`
+[
+  {
+     "name": "test_single_points",
+     "columns": ["name", "age"],
+     "points": [["john", null]]
+  }
+]`)
+	c.Assert(err, IsNil)
+
+	query := "select * from test_single_points_with_nulls;"
+	bs, err := self.server.RunQuery(query, "u")
+	c.Assert(err, IsNil)
+
+	data := []*h.SerializedSeries{}
+	err = json.Unmarshal(bs, &data)
+	c.Assert(err, IsNil)
+
+	for _, point := range data[0].Points {
+		query := fmt.Sprintf("select name, age from test_single_points where time = %.0f and sequence_number = %0.f;", point[0].(float64), point[1])
+		bs, err := self.server.RunQuery(query, "u")
+		data := []*h.SerializedSeries{}
+		err = json.Unmarshal(bs, &data)
+		c.Assert(err, IsNil)
+		c.Assert(data, HasLen, 1)
+		c.Assert(data[0].Points, HasLen, 1)
+		c.Assert(data[0].Points[0], HasLen, 3)
+		c.Assert(data[0].Points[0][2], Equals, point[2])
+	}
+}
+
 func (self *IntegrationSuite) TestColumnsWithOnlySomeValuesWorkWithWhereQuery(c *C) {
 	err := self.server.WriteData(`
 [