From 26d5054faf088ca2438d1a368259a07b8ff568d3 Mon Sep 17 00:00:00 2001
From: Hui Wang <haley@victoriametrics.com>
Date: Thu, 29 Feb 2024 22:00:22 +0800
Subject: [PATCH] =?UTF-8?q?metricsql:=20fix=20label=5Fjoin()=20when=20`dst?=
=?UTF-8?q?=5Flabel`=20is=20equal=20to=20one=20of=20the=20`=E2=80=A6=20(#5?=
=?UTF-8?q?886)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* metricsql: fix label_join() when `dst_label` is equal to one of the `src_label`
* Update app/vmselect/promql/transform.go
* Update docs/CHANGELOG.md
---------
Co-authored-by: Aliaksandr Valialkin <valyala@victoriametrics.com>
---
app/vmselect/promql/exec_test.go | 15 +++++++++++++++
app/vmselect/promql/transform.go | 3 +--
docs/CHANGELOG.md | 1 +
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/app/vmselect/promql/exec_test.go b/app/vmselect/promql/exec_test.go
index a31950d266..0aab3b13aa 100644
--- a/app/vmselect/promql/exec_test.go
+++ b/app/vmselect/promql/exec_test.go
@@ -2135,6 +2135,21 @@ func TestExecSuccess(t *testing.T) {
resultExpected := []netstorage.Result{r}
f(q, resultExpected)
})
+ t.Run(`label_join dst_label is equal to src_label`, func(t *testing.T) {
+ t.Parallel()
+ q := `label_join(label_join(time(), "bar", "sep1", "a", "b"), "bar", "sep2", "a", "bar")`
+ r := netstorage.Result{
+ MetricName: metricNameExpected,
+ Values: []float64{1000, 1200, 1400, 1600, 1800, 2000},
+ Timestamps: timestampsExpected,
+ }
+ r.MetricName.Tags = []storage.Tag{{
+ Key: []byte("bar"),
+ Value: []byte("sep2sep1"),
+ }}
+ resultExpected := []netstorage.Result{r}
+ f(q, resultExpected)
+ })
t.Run(`label_value()`, func(t *testing.T) {
t.Parallel()
q := `with (
diff --git a/app/vmselect/promql/transform.go b/app/vmselect/promql/transform.go
index a436d52dd0..eaccde4529 100644
--- a/app/vmselect/promql/transform.go
+++ b/app/vmselect/promql/transform.go
@@ -1923,8 +1923,7 @@ func transformLabelJoin(tfa *transformFuncArg) ([]*timeseries, error) {
for _, ts := range rvs {
mn := &ts.MetricName
dstValue := getDstValue(mn, dstLabel)
- b := *dstValue
- b = b[:0]
+ var b []byte
for j, srcLabel := range srcLabels {
srcValue := mn.GetTagValue(srcLabel)
b = append(b, srcValue...)
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index e07764e202..1cf6999027 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -17,6 +17,7 @@ The following `tip` changes can be tested by building VictoriaMetrics components
or [/api/v1/query_range](https://docs.victoriametrics.com/keyconcepts/#range-query). See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5795).
* BUGFIX: [Single-node VictoriaMetrics](https://docs.victoriametrics.com/) and `vmselect` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/cluster-victoriametrics/): fixed floating-point error when parsing time in RFC3339 format. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5801) for details.
* BUGFIX: [vmalert](https://docs.victoriametrics.com/#vmalert): consistently sort groups by name and filename on `/groups` page in UI. This should prevent non-deterministic sorting for groups with identical names.
+* BUGFIX: [MetricsQL](https://docs.victoriametrics.com/MetricsQL.html): properly construct the destination label in [label_join](https://docs.victoriametrics.com/metricsql/#label_join) if it is used as source label. See this [issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5881) for details.
## [v1.93.12](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.93.12)