do away with CCacheMetric.Init just use standard constructor

Author: Dieterbe

mdata/cache/ccache.go

@@ -136,8 +136,8 @@ func (c *CCache) Add(metric schema.AMKey, prev uint32, itergen chunk.IterGen) {
 
 	ccm, ok := c.metricCache[metric]
 	if !ok {
-		ccm = NewCCacheMetric()
-		ccm.Init(metric.MKey, prev, itergen)
+		ccm = NewCCacheMetric(metric.MKey)
+		ccm.Add(prev, itergen)
 		c.metricCache[metric] = ccm
 
 		// if we do not have this raw key yet, create the entry with the association
@@ -166,11 +166,8 @@ func (c *CCache) AddRange(metric schema.AMKey, prev uint32, itergens []chunk.Ite
 
 	ccm, ok := c.metricCache[metric]
 	if !ok {
-		ccm = NewCCacheMetric()
-		ccm.Init(metric.MKey, prev, itergens[0])
-		if len(itergens) > 1 {
-			ccm.AddRange(itergens[0].Ts, itergens[1:])
-		}
+		ccm = NewCCacheMetric(metric.MKey)
+		ccm.AddRange(prev, itergens)
 		c.metricCache[metric] = ccm
 
 		// if we do not have this raw key yet, create the entry with the association

mdata/cache/ccache_metric.go

@@ -26,17 +26,13 @@ type CCacheMetric struct {
 }
 
 // NewCCacheMetric creates a CCacheMetric
-func NewCCacheMetric() *CCacheMetric {
+func NewCCacheMetric(mkey schema.MKey) *CCacheMetric {
 	return &CCacheMetric{
+		MKey:   mkey,
 		chunks: make(map[uint32]*CCacheChunk),
 	}
 }
 
-func (mc *CCacheMetric) Init(MKey schema.MKey, prev uint32, itergen chunk.IterGen) {
-	mc.Add(prev, itergen)
-	mc.MKey = MKey
-}
-
 // Del deletes chunks for the given timestamp
 func (mc *CCacheMetric) Del(ts uint32) int {
 	mc.Lock()

mdata/cache/ccache_metric_test.go

@@ -19,18 +19,15 @@ func generateChunks(b testing.TB, startAt, count, step uint32) []chunk.IterGen {
 	return res
 }
 
-func initMetric(b testing.TB, start, step uint32) (schema.MKey, *CCacheMetric) {
-	ccm := NewCCacheMetric()
+func getCCM() (schema.MKey, *CCacheMetric) {
 	mkey, _ := schema.MKeyFromString("1.12345678901234567890123456789012")
-	values := make([]uint32, step)
-	c := getItgen(b, values, start, true)
-	ccm.Init(mkey, 0, c)
+	ccm := NewCCacheMetric(mkey)
 	return mkey, ccm
 }
 
 func BenchmarkAddingManyChunksOneByOne(b *testing.B) {
-	_, ccm := initMetric(b, 10, 10)
-	chunks := generateChunks(b, 20, uint32(b.N), 10)
+	_, ccm := getCCM()
+	chunks := generateChunks(b, 10, uint32(b.N), 10)
 	prev := uint32(1)
 	b.ResetTimer()
 	for _, chunk := range chunks {
@@ -40,18 +37,18 @@ func BenchmarkAddingManyChunksOneByOne(b *testing.B) {
 }
 
 func BenchmarkAddingManyChunksAtOnce(b *testing.B) {
-	_, ccm := initMetric(b, 10, 10)
-	chunks := generateChunks(b, 20, uint32(b.N), 10)
+	_, ccm := getCCM()
+	chunks := generateChunks(b, 10, uint32(b.N), 10)
 	prev := uint32(1)
 	b.ResetTimer()
 	ccm.AddRange(prev, chunks)
 }
 
 func TestAddingChunksOneByOneAndQueryingThem(t *testing.T) {
-	mkey, ccm := initMetric(t, 10, 10)
+	mkey, ccm := getCCM()
 	amkey := schema.AMKey{MKey: mkey, Archive: 0}
-	chunks := generateChunks(t, 20, 5, 10)
-	prev := uint32(10)
+	chunks := generateChunks(t, 10, 6, 10)
+	prev := uint32(1)
 	for _, chunk := range chunks {
 		ccm.Add(prev, chunk)
 		prev = chunk.Ts
@@ -72,9 +69,9 @@ func TestAddingChunksOneByOneAndQueryingThem(t *testing.T) {
 	}
 }
 func TestAddingChunksAtOnceAndQueryingThem(t *testing.T) {
-	mkey, ccm := initMetric(t, 10, 10)
+	mkey, ccm := getCCM()
 	amkey := schema.AMKey{MKey: mkey, Archive: 0}
-	chunks := generateChunks(t, 20, 5, 10)
+	chunks := generateChunks(t, 10, 6, 10)
 	prev := uint32(10)
 	ccm.AddRange(prev, chunks)