compact: standardize group key order

thanos-io · Mar 8, 2018 · 064034d · 064034d
1 parent 89b14b5
commit 064034d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/compact/compact.go b/pkg/compact/compact.go
@@ -418,7 +418,7 @@ func newGroup(
 
 // Key returns an identifier for the group.
 func (cg *Group) Key() string {
-	return fmt.Sprintf("%s@%d", cg.labels, cg.resolution)
+	return fmt.Sprintf("%d@%s", cg.resolution, cg.labels)
 }
 
 // Add the block with the given meta to the group.

diff --git a/pkg/compact/compact_test.go b/pkg/compact/compact_test.go
@@ -171,9 +171,9 @@ func TestSyncer_GarbageCollect(t *testing.T) {
 	groups, err := sy.Groups()
 	testutil.Ok(t, err)
 
-	testutil.Equals(t, "{}@0", groups[0].Key())
+	testutil.Equals(t, "0@{}", groups[0].Key())
 	testutil.Equals(t, []ulid.ULID{metas[9].ULID, m3.ULID}, groups[0].IDs())
-	testutil.Equals(t, "{}@1000", groups[1].Key())
+	testutil.Equals(t, "1000@{}", groups[1].Key())
 	testutil.Equals(t, []ulid.ULID{m4.ULID}, groups[1].IDs())
 }