Fixes bad initialization for uniqueString (#6432)

grafana · Jun 20, 2022 · 8ee0d62 · 8ee0d62
1 parent a1c72ad
commit 8ee0d62
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/pkg/logql/log/util.go b/pkg/logql/log/util.go
@@ -6,7 +6,7 @@ import (
 
 func uniqueString(s []string) []string {
 	unique := make(map[string]bool, len(s))
-	us := make([]string, len(unique))
+	us := make([]string, 0, len(s))
 	for _, elem := range s {
 		if len(elem) != 0 {
 			if !unique[elem] {

diff --git a/pkg/logql/log/util_test.go b/pkg/logql/log/util_test.go
@@ -1,6 +1,10 @@
 package log
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
 
 func Test_sanitizeLabelKey(t *testing.T) {
 	tests := []struct {
@@ -23,3 +27,10 @@ func Test_sanitizeLabelKey(t *testing.T) {
 		})
 	}
 }
+
+func Test_UniqueStrings(t *testing.T) {
+	in := []string{"foo", "bar", "baz", "foo"}
+	out := uniqueString(in)
+	require.Equal(t, []string{"foo", "bar", "baz"}, out)
+	require.Equal(t, 4, cap(out))
+}