Fix raw data query test.

influxql/engine.go

@@ -4,7 +4,6 @@ import (
 	"encoding/binary"
 	"fmt"
 	"hash/fnv"
-	"log"
 	"math"
 	"sort"
 	"strings"
@@ -127,15 +126,12 @@ func (p *Planner) planExpr(e *Executor, expr Expr) (Processor, error) {
 
 // planCall generates a processor for a function call.
 func (p *Planner) planRawQuery(e *Executor, v *VarRef) (Processor, error) {
-	log.Println("plan: ", v.String())
 	// Convert the statement to a simplified substatement for the single field.
 	stmt, err := e.stmt.Substatement(v)
 	if err != nil {
 		return nil, err
 	}
 
-	log.Println("plan: ", stmt.String())
-
 	// Retrieve a list of iterators for the substatement.
 	itrs, err := e.tx.CreateIterators(stmt)
 	if err != nil {
@@ -701,7 +697,6 @@ func ReducePercentile(percentile float64) ReduceFunc {
 func MapRawQuery(itr Iterator, e *Emitter, tmin int64) {
 	for k, v := itr.Next(); k != 0; k, v = itr.Next() {
 		e.Emit(Key{k, itr.Tags()}, v)
-		log.Println("**** ", k, v)
 	}
 }
 
@@ -711,7 +706,6 @@ type rawQueryMapOutput struct {
 }
 
 func ReduceRawQuery(key Key, values []interface{}, e *Emitter) {
-	log.Println("reduce: ", key.Timestamp, values)
 	for _, v := range values {
 		e.Emit(key, v)
 	}

influxql/engine_test.go

@@ -207,7 +207,7 @@ func TestPlanner_Plan_RawData(t *testing.T) {
 	}
 
 	// Expected resultset.
-	exp := minify(`[{"name":"cpu","columns":["time","value"],"values":[[946684800000000,80],[946684860000000,60]]}]`)
+	exp := minify(`[{"name":"cpu","columns":["time","value"],"values":[[946684800000000,40],[946684810000000,30],[946684820000000,80],[946684822000000,20],[946684824000000,50],[946684890000000,10],[946684900000000,9],[946684910000000,8]]}]`)
 
 	// Execute and compare.
 	rs := MustPlanAndExecute(NewDB(tx), `2000-01-01T12:00:00Z`,