From 86cec8cea561f569f3382ce5e56d73cd265075c1 Mon Sep 17 00:00:00 2001
From: "Jonathan A. Sternberg" <jonathan@influxdb.com>
Date: Wed, 3 Feb 2016 17:21:29 -0500
Subject: [PATCH] Fix reduce slice iterators to also separate by name

---
 influxql/iterator.gen.go      | 8 ++++----
 influxql/iterator.gen.go.tmpl | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/influxql/iterator.gen.go b/influxql/iterator.gen.go
index 9a9f573271..0dd7bee1fb 100644
--- a/influxql/iterator.gen.go
+++ b/influxql/iterator.gen.go
@@ -621,7 +621,7 @@ func (itr *floatReduceSliceIterator) reduce() []FloatPoint {
 		tags := p.Tags.Subset(itr.opt.Dimensions)
 
 		// Append point to dimension.
-		id := tags.ID()
+		id := p.Name + "\x00" + tags.ID()
 		g := groups[id]
 		g.name = p.Name
 		g.tags = tags
@@ -1322,7 +1322,7 @@ func (itr *integerReduceSliceIterator) reduce() []IntegerPoint {
 		tags := p.Tags.Subset(itr.opt.Dimensions)
 
 		// Append point to dimension.
-		id := tags.ID()
+		id := p.Name + "\x00" + tags.ID()
 		g := groups[id]
 		g.name = p.Name
 		g.tags = tags
@@ -2023,7 +2023,7 @@ func (itr *stringReduceSliceIterator) reduce() []StringPoint {
 		tags := p.Tags.Subset(itr.opt.Dimensions)
 
 		// Append point to dimension.
-		id := tags.ID()
+		id := p.Name + "\x00" + tags.ID()
 		g := groups[id]
 		g.name = p.Name
 		g.tags = tags
@@ -2724,7 +2724,7 @@ func (itr *booleanReduceSliceIterator) reduce() []BooleanPoint {
 		tags := p.Tags.Subset(itr.opt.Dimensions)
 
 		// Append point to dimension.
-		id := tags.ID()
+		id := p.Name + "\x00" + tags.ID()
 		g := groups[id]
 		g.name = p.Name
 		g.tags = tags
diff --git a/influxql/iterator.gen.go.tmpl b/influxql/iterator.gen.go.tmpl
index 89b54bd865..53e9a2a6c9 100644
--- a/influxql/iterator.gen.go.tmpl
+++ b/influxql/iterator.gen.go.tmpl
@@ -272,7 +272,7 @@ func new{{.Name}}SortedMergeIterator(inputs []{{.Name}}Iterator, opt IteratorOpt
 }
 
 // Close closes the underlying iterators.
-func (itr *{{.name}}SortedMergeIterator) Close() error { 
+func (itr *{{.name}}SortedMergeIterator) Close() error {
 	for _, input := range itr.inputs {
 		input.Close()
 	}
@@ -623,7 +623,7 @@ func (itr *{{.name}}ReduceSliceIterator) reduce() []{{.Name}}Point {
 		tags := p.Tags.Subset(itr.opt.Dimensions)
 
 		// Append point to dimension.
-		id := tags.ID()
+		id := p.Name + "\x00" + tags.ID()
 		g := groups[id]
 		g.name = p.Name
 		g.tags = tags