Make bigBuckets a method of AWSStore

Author: juliusv

chunk/chunk_store.go

@@ -338,7 +338,7 @@ func (c *AWSStore) CreateTables() error {
 	return err
 }
 
-func bigBuckets(from, through model.Time, dailyBucketsFrom model.Time) []string {
+func (c *AWSStore) bigBuckets(from, through model.Time) []string {
 	var (
 		secondsInHour = int64(time.Hour / time.Second)
 		fromHour      = from.Unix() / secondsInHour
@@ -348,7 +348,7 @@ func bigBuckets(from, through model.Time, dailyBucketsFrom model.Time) []string
 		fromDay      = from.Unix() / secondsInDay
 		throughDay   = through.Unix() / secondsInDay
 
-		firstDailyBucket = dailyBucketsFrom.Unix() / secondsInDay
+		firstDailyBucket = c.dailyBucketsFrom.Unix() / secondsInDay
 		lastHourlyBucket = firstDailyBucket * 24
 
 		result []string
@@ -482,7 +482,7 @@ func (c *AWSStore) calculateDynamoWrites(userID string, chunks []Chunk) ([]*dyna
 		}
 
 		entries := 0
-		for _, bucket := range bigBuckets(chunk.From, chunk.Through, c.dailyBucketsFrom) {
+		for _, bucket := range c.bigBuckets(chunk.From, chunk.Through) {
 			hashValue := hashValue(userID, bucket, metricName)
 			for label, value := range chunk.Metric {
 				if label == model.MetricNameLabel {
@@ -582,7 +582,7 @@ func (c *AWSStore) lookupChunks(ctx context.Context, userID string, from, throug
 
 	incomingChunkSets := make(chan ByID)
 	incomingErrors := make(chan error)
-	buckets := bigBuckets(from, through, c.dailyBucketsFrom)
+	buckets := c.bigBuckets(from, through)
 	totalLookups := int32(0)
 	for _, b := range buckets {
 		go func(bucket string) {

chunk/chunk_store_test.go

@@ -149,36 +149,39 @@ func diff(want, have interface{}) string {
 
 func TestBigBuckets(t *testing.T) {
 	scenarios := []struct {
-		from, through, dayEpochFrom model.Time
-		buckets                     []string
+		from, through, dailyBucketsFrom model.Time
+		buckets                         []string
 	}{
 		{
-			from:         model.TimeFromUnix(0),
-			through:      model.TimeFromUnix(0).Add(3*24*time.Hour) - 1,
-			dayEpochFrom: model.TimeFromUnix(0).Add(1 * 24 * time.Hour),
-			buckets:      []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "d1", "d2"},
+			from:             model.TimeFromUnix(0),
+			through:          model.TimeFromUnix(0).Add(3*24*time.Hour) - 1,
+			dailyBucketsFrom: model.TimeFromUnix(0).Add(1 * 24 * time.Hour),
+			buckets:          []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "d1", "d2"},
 		},
 		{
-			from:         model.TimeFromUnix(0),
-			through:      model.TimeFromUnix(0).Add(3*24*time.Hour) - 1,
-			dayEpochFrom: model.TimeFromUnix(0).Add(2*24*time.Hour) - 1, // Only the day matters for the epoch start time, not the time.
-			buckets:      []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "d1", "d2"},
+			from:             model.TimeFromUnix(0),
+			through:          model.TimeFromUnix(0).Add(3*24*time.Hour) - 1,
+			dailyBucketsFrom: model.TimeFromUnix(0).Add(2*24*time.Hour) - 1, // Only the day matters for the epoch start time, not the time.
+			buckets:          []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "d1", "d2"},
 		},
 		{
-			from:         model.TimeFromUnix(0),
-			through:      model.TimeFromUnix(0).Add(3*24*time.Hour) - 1,
-			dayEpochFrom: model.TimeFromUnix(0).Add(1*24*time.Hour) - 1,
-			buckets:      []string{"0", "d0", "d1", "d2"},
+			from:             model.TimeFromUnix(0),
+			through:          model.TimeFromUnix(0).Add(3*24*time.Hour) - 1,
+			dailyBucketsFrom: model.TimeFromUnix(0).Add(1*24*time.Hour) - 1,
+			buckets:          []string{"0", "d0", "d1", "d2"},
 		},
 		{
-			from:         model.TimeFromUnix(0),
-			through:      model.TimeFromUnix(0).Add(2 * 24 * time.Hour),
-			dayEpochFrom: model.TimeFromUnix(0).Add(99 * 24 * time.Hour),
-			buckets:      []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48"},
+			from:             model.TimeFromUnix(0),
+			through:          model.TimeFromUnix(0).Add(2 * 24 * time.Hour),
+			dailyBucketsFrom: model.TimeFromUnix(0).Add(99 * 24 * time.Hour),
+			buckets:          []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48"},
 		},
 	}
 	for i, s := range scenarios {
-		buckets := bigBuckets(s.from, s.through, s.dayEpochFrom)
+		cs := &AWSStore{
+			dailyBucketsFrom: s.dailyBucketsFrom,
+		}
+		buckets := cs.bigBuckets(s.from, s.through)
 		if !reflect.DeepEqual(buckets, s.buckets) {
 			t.Fatalf("%d. unexpected buckets; want %v, got %v", i, s.buckets, buckets)
 		}