New Query Engine is passing all tests

kprd · Mar 7, 2016 · 77cf385 · 77cf385
1 parent a5cf89b
commit 77cf385
Show file tree

Hide file tree

Showing 14 changed files with 1,366 additions and 53 deletions.
diff --git a/build.py b/build.py
@@ -119,6 +119,7 @@ def package_scripts(build_root):
 def run_generate():
     print "Running generate..."
     run("go get github.com/gogo/protobuf/protoc-gen-gogo")
+    run("go get github.com/benbjohnson/tmpl")
     run("go generate ./...")
     print "Generate succeeded."
     return True

diff --git a/functions.go b/functions.go
@@ -78,22 +78,22 @@ func (influxqlMapReducers) Percentile(field string, p float64) pipeline.MapReduc
 	return mr(field, "percentile", pipeline.StreamEdge, tsdb.MapEcho, r)
 }
 
-func (influxqlMapReducers) Top(limit int64, field string, fieldsOrTags ...string) pipeline.MapReduceInfo {
+func (influxqlMapReducers) Top(limit int64, field string, fieldsAndTags ...string) pipeline.MapReduceInfo {
 	m := func(in *tsdb.MapInput) interface{} {
-		return tsdb.MapTopBottom(in, int(limit), fieldsOrTags, len(fieldsOrTags)+2, "top")
+		return tsdb.MapTopBottom(in, int(limit), fieldsAndTags, len(fieldsAndTags)+2, "top")
 	}
 	r := func(values []interface{}) interface{} {
-		return tsdb.ReduceTopBottom(values, int(limit), fieldsOrTags, "top")
+		return tsdb.ReduceTopBottom(values, int(limit), fieldsAndTags, "top")
 	}
 	return mr(field, "top", pipeline.BatchEdge, m, r)
 }
 
-func (influxqlMapReducers) Bottom(limit int64, field string, fieldsOrTags ...string) pipeline.MapReduceInfo {
+func (influxqlMapReducers) Bottom(limit int64, field string, fieldsAndTags ...string) pipeline.MapReduceInfo {
 	m := func(in *tsdb.MapInput) interface{} {
-		return tsdb.MapTopBottom(in, int(limit), fieldsOrTags, len(fieldsOrTags)+2, "bottom")
+		return tsdb.MapTopBottom(in, int(limit), fieldsAndTags, len(fieldsAndTags)+2, "bottom")
 	}
 	r := func(values []interface{}) interface{} {
-		return tsdb.ReduceTopBottom(values, int(limit), fieldsOrTags, "bottom")
+		return tsdb.ReduceTopBottom(values, int(limit), fieldsAndTags, "bottom")
 	}
 	return mr(field, "bottom", pipeline.BatchEdge, m, r)
 }