fix key encoding bug and add test for it

Author: replay

mdata/cwr_test.go

@@ -6,11 +6,59 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/metrictank/mdata/chunk"
 	"github.com/raintank/schema"
 )
 
+func getTestData(ts, interval, length uint32, val float64) []point {
+	testData := make([]point, 0, length)
+
+	for i := uint32(0); i < length; i++ {
+		testData = append(testData, point{ts: ts, val: val})
+		val++
+		ts += interval
+	}
+
+	return testData
+}
+
+func chunksFromPoints(points []point, chunkSpan uint32) []*chunk.Chunk {
+	var t0, prevT0 uint32
+	var c *chunk.Chunk
+	var encodedChunks []*chunk.Chunk
+
+	for _, point := range points {
+		t0 = point.ts - (point.ts % chunkSpan)
+
+		if prevT0 == 0 {
+			c = chunk.New(t0)
+			prevT0 = t0
+		} else if prevT0 != t0 {
+			c.Finish()
+			encodedChunks = append(encodedChunks, c)
+
+			c = chunk.New(t0)
+			prevT0 = t0
+		}
+
+		c.Push(point.ts, point.val)
+	}
+
+	c.Finish()
+	encodedChunks = append(encodedChunks, c)
+
+	return encodedChunks
+}
+
 func TestArchiveRequestEncodingDecoding(t *testing.T) {
-	key, _ := schema.AMKeyFromString("98.12345678901234567890123456789012")
+	testData := getTestData(6000, 60, 100, 0)
+	chunks := chunksFromPoints(testData, 1800)
+
+	id := "98.12345678901234567890123456789012"
+	key, err := schema.AMKeyFromString(id + "_sum_3600")
+	if err != nil {
+		t.Fatalf("Expected no error when getting AMKey from string %q", err)
+	}
 	originalRequest := ArchiveRequest{
 		MetricData: schema.MetricData{
 			Id:       "98.12345678901234567890123456789012",
@@ -23,16 +71,17 @@ func TestArchiveRequestEncodingDecoding(t *testing.T) {
 			Mtype:    "test",
 			Tags:     []string{"some=tag"},
 		},
-		ChunkWriteRequests: []ChunkWriteRequest{
-			{
-				Callback:  nil,
-				Key:       key,
-				TTL:       1,
-				T0:        2,
-				Data:      []byte("abcdefghijklmnopqrstuvwxyz"),
-				Timestamp: time.Unix(123, 456),
-			},
-		},
+	}
+
+	for i := 0; i < len(chunks); i++ {
+		originalRequest.ChunkWriteRequests = append(originalRequest.ChunkWriteRequests, ChunkWriteRequest{
+			Callback:  nil,
+			Key:       key,
+			TTL:       1,
+			T0:        chunks[i].Series.T0,
+			Data:      chunks[i].Encode(1800),
+			Timestamp: time.Unix(123, 456),
+		})
 	}
 
 	encoded, err := originalRequest.MarshalCompressed()
@@ -49,6 +98,28 @@ func TestArchiveRequestEncodingDecoding(t *testing.T) {
 	if !reflect.DeepEqual(originalRequest, got) {
 		t.Fatalf("Decoded request is different than the encoded one.\nexp: %+v\ngot: %+v\n", originalRequest, got)
 	}
+
+	var decodedData []point
+	for _, c := range got.ChunkWriteRequests {
+		itgen, err := chunk.NewIterGen(uint32(c.T0), 0, c.Data)
+		if err != nil {
+			t.Fatalf("Expected no error when getting IterGen %q", err)
+		}
+
+		iter, err := itgen.Get()
+		if err != nil {
+			t.Fatalf("Expected no error when getting Iterator %q", err)
+		}
+
+		for iter.Next() {
+			ts, val := iter.Values()
+			decodedData = append(decodedData, point{ts: ts, val: val})
+		}
+	}
+
+	if !reflect.DeepEqual(testData, decodedData) {
+		t.Fatalf("Decoded request is different than the encoded one.\nexp: %+v\ngot: %+v\n", originalRequest, got)
+	}
 }
 
 func TestArchiveRequestEncodingWithUnknownVersion(t *testing.T) {