remove crufty NewBareIterGen()

no longer needed + now we have some actual validation

Author: Dieterbe

api/dataprocessor_test.go

@@ -553,7 +553,10 @@ func TestGetSeriesCachedStore(t *testing.T) {
 				// populate cache and store according to pattern definition
 				var prevts uint32
 				for i := 0; i < len(tc.Pattern); i++ {
-					itgen := chunk.NewBareIterGen(chunks[i].Series.T0, 0, chunks[i].Encode(span))
+					itgen, err := chunk.NewIterGen(chunks[i].Series.T0, 0, chunks[i].Encode(span))
+					if err != nil {
+						t.Fatalf("NewIterGen error: %s", err)
+					}
 					if pattern[i] == 'c' || pattern[i] == 'b' {
 						c.Add(metric, prevts, itgen)
 					}

cmd/mt-whisper-importer-reader/main.go

@@ -365,7 +365,11 @@ func encodedChunksFromPoints(points []whisper.Point, intervalIn, chunkSpan uint3
 		} else if prevT0 != t0 {
 			c.Finish()
 
-			encodedChunks = append(encodedChunks, chunk.NewBareIterGen(c.Series.T0, intervalIn, c.Encode(chunkSpan)))
+			itgen, err := chunk.NewIterGen(c.Series.T0, intervalIn, c.Encode(chunkSpan))
+			if err != nil {
+				panic(fmt.Sprintf("ERROR: failed to construct IterGen: %s", err))
+			}
+			encodedChunks = append(encodedChunks, itgen)
 
 			c = chunk.New(t0)
 			prevT0 = t0
@@ -381,7 +385,11 @@ func encodedChunksFromPoints(points []whisper.Point, intervalIn, chunkSpan uint3
 	// or if writeUnfinishedChunks is on, we close the chunk and push it
 	if point.Timestamp == t0+chunkSpan-intervalIn || *writeUnfinishedChunks {
 		c.Finish()
-		encodedChunks = append(encodedChunks, chunk.NewBareIterGen(c.Series.T0, intervalIn, c.Encode(chunkSpan)))
+		itgen, err := chunk.NewIterGen(c.Series.T0, intervalIn, c.Encode(chunkSpan))
+		if err != nil {
+			panic(fmt.Sprintf("ERROR: failed to construct IterGen: %s", err))
+		}
+		encodedChunks = append(encodedChunks, itgen)
 	}
 
 	return encodedChunks

mdata/aggmetric.go

@@ -348,7 +348,10 @@ func (a *AggMetric) pushToCache(c *chunk.Chunk) {
 	// push into cache
 	intervalHint := a.Key.Archive.Span()
 
-	itergen := chunk.NewBareIterGen(c.Series.T0, intervalHint, c.Encode(a.ChunkSpan))
+	itergen, err := chunk.NewIterGen(c.Series.T0, intervalHint, c.Encode(a.ChunkSpan))
+	if err != nil {
+		log.Errorf("AM: %s failed to generate IterGen. this should never happen: %s", a.Key, err)
+	}
 	go a.cachePusher.AddIfHot(a.Key, 0, itergen)
 }
 

mdata/cache/ccache_test.go

@@ -31,7 +31,12 @@ func getItgen(t testing.TB, values []uint32, ts uint32, spanaware bool) chunk.It
 	}
 	buf.Write(b)
 
-	return chunk.NewBareIterGen(ts, 1, buf.Bytes())
+	itgen, err := chunk.NewIterGen(ts, 1, buf.Bytes())
+	if err != nil {
+		t.Fatalf("invalid IterGen: %s", err)
+	}
+	return itgen
+
 }
 
 func getConnectedChunks(t *testing.T, metric schema.AMKey) *CCache {

mdata/chunk/chunk_test.go

@@ -40,7 +40,10 @@ func TestRealProduction4hChunksWithSinglePointThatNeedRemediation(t *testing.T)
 		if err != nil {
 			t.Fatal(err)
 		}
-		itgen := NewBareIterGen(rc.t0, 30*60, data)
+		itgen, err := NewIterGen(rc.t0, 30*60, data)
+		if err != nil {
+			t.Errorf("case %d: could not construct itergen: %s", i, err)
+		}
 		iter, err := itgen.Get()
 		if err != nil {
 			t.Errorf("case %d: could not get iterator: %s", i, err)

mdata/chunk/itergen.go

@@ -19,13 +19,6 @@ type IterGen struct {
 	B            []byte
 }
 
-// NewBareIterGen creates an IterGen without validation
-// note: it's ok for intervalHint to be 0 or 1 to mean unknown.
-// it just means that series4h corruptions can't be remediated in single-point-per-chunk scenarios
-func NewBareIterGen(t0, intervalHint uint32, b []byte) IterGen {
-	return IterGen{t0, intervalHint, b}
-}
-
 // NewIterGen creates an IterGen and performs crude validation of the data
 // note: it's ok for intervalHint to be 0 or 1 to mean unknown.
 // it just means that series4h corruptions can't be remediated in single-point-per-chunk scenarios

mdata/store_mock.go

@@ -40,7 +40,10 @@ func (c *MockStore) Items() int {
 func (c *MockStore) Add(cwr *ChunkWriteRequest) {
 	if !c.Drop {
 		intervalHint := cwr.Key.Archive.Span()
-		itgen := chunk.NewBareIterGen(cwr.Chunk.Series.T0, intervalHint, cwr.Chunk.Encode(cwr.Span))
+		itgen, err := chunk.NewIterGen(cwr.Chunk.Series.T0, intervalHint, cwr.Chunk.Encode(cwr.Span))
+		if err != nil {
+			panic(err)
+		}
 		c.results[cwr.Key] = append(c.results[cwr.Key], itgen)
 		c.items++
 	}