diff --git a/go.mod b/go.mod index 1bdafc94c0..cf337032b3 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( github.com/spf13/afero v1.11.0 github.com/stretchr/testify v1.10.0 github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97 - github.com/thanos-io/promql-engine v0.0.0-20241217103156-9dbff30059cf + github.com/thanos-io/promql-engine v0.0.0-20250104120320-2414c3d2ab47 github.com/thanos-io/thanos v0.37.3-0.20250107220537-0d426361672a github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5 diff --git a/go.sum b/go.sum index 6667cda005..52496abd23 100644 --- a/go.sum +++ b/go.sum @@ -1655,8 +1655,8 @@ github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e h1:f1 github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e/go.mod h1:jXcofnrSln/cLI6/dhlBxPQZEEQHVPCcFaH75M+nSzM= github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97 h1:VjG0mwhN1DkncwDHFvrpd12/2TLfgYNRmEQA48ikp+0= github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97/go.mod h1:vyzFrBXgP+fGNG2FopEGWOO/zrIuoy7zt3LpLeezRsw= -github.com/thanos-io/promql-engine v0.0.0-20241217103156-9dbff30059cf h1:JFh4PjC9yQidiFi4qMWbPddIgsLWPIsSEbXs75+tLxs= -github.com/thanos-io/promql-engine v0.0.0-20241217103156-9dbff30059cf/go.mod h1:wx0JlRZtsB2S10JYUgeg5GqLfMxw31SzArP+28yyE00= +github.com/thanos-io/promql-engine v0.0.0-20250104120320-2414c3d2ab47 h1:vIIrz8fm3ptR7/rJK8J5lJQwYoKd35qGO0ZmKiqDOSI= +github.com/thanos-io/promql-engine v0.0.0-20250104120320-2414c3d2ab47/go.mod h1:wx0JlRZtsB2S10JYUgeg5GqLfMxw31SzArP+28yyE00= github.com/thanos-io/thanos v0.37.3-0.20250107220537-0d426361672a h1:VdOsK6zhseRVfpkOxCJ3b2MKhuP1sBjTnC7Bib7DLws= github.com/thanos-io/thanos v0.37.3-0.20250107220537-0d426361672a/go.mod h1:VOu1neDpx4n/2OCQmfT/0RMU85UzhO35ce0S3Ew+NSk= github.com/tjhop/slog-gokit v0.1.2 h1:pmQI4SvU9h4gA0vIQsdhJQSqQg4mOmsPykG2/PM3j1I= diff --git a/vendor/github.com/thanos-io/promql-engine/execution/aggregate/hashaggregate.go b/vendor/github.com/thanos-io/promql-engine/execution/aggregate/hashaggregate.go index 62da9f5d4f..9d4fc469ab 100644 --- a/vendor/github.com/thanos-io/promql-engine/execution/aggregate/hashaggregate.go +++ b/vendor/github.com/thanos-io/promql-engine/execution/aggregate/hashaggregate.go @@ -220,6 +220,10 @@ func (a *aggregate) initializeTables(ctx context.Context) error { } func (a *aggregate) initializeVectorizedTables(ctx context.Context) ([]aggregateTable, []labels.Labels, error) { + // perform initialization of the underlying operator even if we are aggregating the labels away + if _, err := a.next.Series(ctx); err != nil { + return nil, nil, err + } tables, err := newVectorizedTables(a.stepsBatch, a.aggregation) if errors.Is(err, parse.ErrNotSupportedExpr) { return a.initializeScalarTables(ctx) diff --git a/vendor/github.com/thanos-io/promql-engine/execution/function/relabel.go b/vendor/github.com/thanos-io/promql-engine/execution/function/relabel.go index f3aa0d342b..2e2d85004a 100644 --- a/vendor/github.com/thanos-io/promql-engine/execution/function/relabel.go +++ b/vendor/github.com/thanos-io/promql-engine/execution/function/relabel.go @@ -47,7 +47,7 @@ func (o *relabelOperator) String() string { } func (o *relabelOperator) Explain() (next []model.VectorOperator) { - return []model.VectorOperator{} + return []model.VectorOperator{o.next} } func (o *relabelOperator) Series(ctx context.Context) ([]labels.Labels, error) { diff --git a/vendor/modules.txt b/vendor/modules.txt index 0123b50231..b93e653154 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -964,7 +964,7 @@ github.com/thanos-io/objstore/providers/gcs github.com/thanos-io/objstore/providers/s3 github.com/thanos-io/objstore/providers/swift github.com/thanos-io/objstore/tracing/opentracing -# github.com/thanos-io/promql-engine v0.0.0-20241217103156-9dbff30059cf +# github.com/thanos-io/promql-engine v0.0.0-20250104120320-2414c3d2ab47 ## explicit; go 1.22.0 github.com/thanos-io/promql-engine/api github.com/thanos-io/promql-engine/engine