From 02effba7676b6b9eb50493ce90544ff04eeed5bb Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 5 Dec 2024 02:39:04 +0100 Subject: [PATCH] vendor: update github.com/VictoriaMetrics/metricsql from v0.81.0 to v0.81.1 This fixes possible `index out of range` panic when -search.logImplicitConversion or -search.disableImplicitConversion command-line flags are passed to vmselect and it tries executing incorrect query with too small number of arguments passed to rollup function. --- go.mod | 2 +- go.sum | 6 ++---- vendor/github.com/VictoriaMetrics/metricsql/utils.go | 2 +- vendor/modules.txt | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index d3c06de356..9c47045625 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/VictoriaMetrics/easyproto v0.1.4 github.com/VictoriaMetrics/fastcache v1.12.2 github.com/VictoriaMetrics/metrics v1.35.1 - github.com/VictoriaMetrics/metricsql v0.81.0 + github.com/VictoriaMetrics/metricsql v0.81.1 github.com/aws/aws-sdk-go-v2 v1.32.5 github.com/aws/aws-sdk-go-v2/config v1.28.5 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.41 diff --git a/go.sum b/go.sum index bac828e888..1fcf9282ec 100644 --- a/go.sum +++ b/go.sum @@ -94,10 +94,8 @@ github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkT github.com/VictoriaMetrics/metrics v1.34.0/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8= github.com/VictoriaMetrics/metrics v1.35.1 h1:o84wtBKQbzLdDy14XeskkCZih6anG+veZ1SwJHFGwrU= github.com/VictoriaMetrics/metrics v1.35.1/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8= -github.com/VictoriaMetrics/metricsql v0.80.0 h1:7Jxj4dcglKCypbWaRv9oTTRd3dYwSaUa10QE0JwELtY= -github.com/VictoriaMetrics/metricsql v0.80.0/go.mod h1:1g4hdCwlbJZ851PU9VN65xy9Rdlzupo6fx3SNZ8Z64U= -github.com/VictoriaMetrics/metricsql v0.81.0 h1:mFF0yadFix0i+m0uE0pAwLC8fBnOyna/nTY2LD9yCwE= -github.com/VictoriaMetrics/metricsql v0.81.0/go.mod h1:1g4hdCwlbJZ851PU9VN65xy9Rdlzupo6fx3SNZ8Z64U= +github.com/VictoriaMetrics/metricsql v0.81.1 h1:1gpqI3Mwru1tCM8nZiKxBG0P+DNkjlRwLhRPII3cuho= +github.com/VictoriaMetrics/metricsql v0.81.1/go.mod h1:1g4hdCwlbJZ851PU9VN65xy9Rdlzupo6fx3SNZ8Z64U= github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow= github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= diff --git a/vendor/github.com/VictoriaMetrics/metricsql/utils.go b/vendor/github.com/VictoriaMetrics/metricsql/utils.go index c14698147c..ee0b211278 100644 --- a/vendor/github.com/VictoriaMetrics/metricsql/utils.go +++ b/vendor/github.com/VictoriaMetrics/metricsql/utils.go @@ -84,7 +84,7 @@ func IsLikelyInvalid(e Expr) bool { return } idx := GetRollupArgIdx(fe) - if idx < 0 { + if idx < 0 || idx >= len(fe.Args) { return } arg := fe.Args[idx] diff --git a/vendor/modules.txt b/vendor/modules.txt index e8c6662e30..c8c9e02def 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -137,7 +137,7 @@ github.com/VictoriaMetrics/fastcache # github.com/VictoriaMetrics/metrics v1.35.1 ## explicit; go 1.17 github.com/VictoriaMetrics/metrics -# github.com/VictoriaMetrics/metricsql v0.81.0 +# github.com/VictoriaMetrics/metricsql v0.81.1 ## explicit; go 1.13 github.com/VictoriaMetrics/metricsql github.com/VictoriaMetrics/metricsql/binaryop