allow consecutive copies

grafana · Jan 24, 2024 · 893e3af · 893e3af
1 parent e131ea8
commit 893e3af
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 21 deletions.
diff --git a/pkg/logql/log/labels.go b/pkg/logql/log/labels.go
@@ -482,9 +482,9 @@ func (b *LabelsBuilder) IntoMap(m map[string]string) {
 	if !b.hasDel() && !b.hasAdd() && !b.HasErr() {
 		if b.baseMap == nil {
 			b.baseMap = b.base.Map()
-			for k, v := range b.baseMap {
-				m[k] = v
-			}
+		}
+		for k, v := range b.baseMap {
+			m[k] = v
 		}
 		return
 	}

diff --git a/pkg/logql/log/labels_test.go b/pkg/logql/log/labels_test.go
@@ -76,28 +76,54 @@ func TestLabelsBuilder_IntoMap(t *testing.T) {
 		"ToReplace", "text",
 	}
 	lbs := labels.FromStrings(strs...)
-	b := NewBaseLabelsBuilder().ForLabels(lbs, lbs.Hash())
 
-	m := map[string]string{}
-	b.IntoMap(m)
+	t.Run("it still copies the map after a Reset", func(t *testing.T) {
+		b := NewBaseLabelsBuilder().ForLabels(lbs, lbs.Hash())
 
-	require.Equal(t, map[string]string{
-		"namespace": "loki",
-		"job":       "us-central1/loki",
-		"cluster":   "us-central1",
-		"ToReplace": "text",
-	}, m)
+		m := map[string]string{}
+		b.IntoMap(m)
 
-	b.Reset()
+		require.Equal(t, map[string]string{
+			"namespace": "loki",
+			"job":       "us-central1/loki",
+			"cluster":   "us-central1",
+			"ToReplace": "text",
+		}, m)
+
+		b.Reset()
+
+		m2 := map[string]string{}
+		b.IntoMap(m2)
+		require.Equal(t, map[string]string{
+			"namespace": "loki",
+			"job":       "us-central1/loki",
+			"cluster":   "us-central1",
+			"ToReplace": "text",
+		}, m2)
+	})
+
+	t.Run("it can copy the map several times", func(t *testing.T) {
+		b := NewBaseLabelsBuilder().ForLabels(lbs, lbs.Hash())
+
+		m := map[string]string{}
+		b.IntoMap(m)
+
+		require.Equal(t, map[string]string{
+			"namespace": "loki",
+			"job":       "us-central1/loki",
+			"cluster":   "us-central1",
+			"ToReplace": "text",
+		}, m)
 
-	m2 := map[string]string{}
-	b.IntoMap(m2)
-	require.Equal(t, map[string]string{
-		"namespace": "loki",
-		"job":       "us-central1/loki",
-		"cluster":   "us-central1",
-		"ToReplace": "text",
-	}, m2)
+		m2 := map[string]string{}
+		b.IntoMap(m2)
+		require.Equal(t, map[string]string{
+			"namespace": "loki",
+			"job":       "us-central1/loki",
+			"cluster":   "us-central1",
+			"ToReplace": "text",
+		}, m2)
+	})
 }
 
 func TestLabelsBuilder_LabelsResult(t *testing.T) {