Skip to content

Commit 1b3e381

Browse files
authored
Upgrade thanos promql engine to pull binary join and fix (#6810)
* upgrade thanos promql engine to pull binary join and fix Signed-off-by: yeya24 <[email protected]> * update version Signed-off-by: yeya24 <[email protected]> --------- Signed-off-by: yeya24 <[email protected]>
1 parent 506be73 commit 1b3e381

File tree

26 files changed

+56
-818
lines changed

26 files changed

+56
-818
lines changed

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ require (
5151
github.com/spf13/afero v1.11.0
5252
github.com/stretchr/testify v1.10.0
5353
github.com/thanos-io/objstore v0.0.0-20250317105316-a0136a6f898d
54-
github.com/thanos-io/promql-engine v0.0.0-20250606124720-6f637b9579dc
54+
github.com/thanos-io/promql-engine v0.0.0-20250611170940-015ebeb7b5ff
5555
github.com/thanos-io/thanos v0.37.3-0.20250603135757-4ad45948cd10
5656
github.com/uber/jaeger-client-go v2.30.0+incompatible
5757
github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5
@@ -230,7 +230,6 @@ require (
230230
github.com/weaveworks/promrus v1.2.0 // indirect
231231
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
232232
github.com/yuin/gopher-lua v1.1.1 // indirect
233-
github.com/zhangyunhao116/umap v0.0.0-20250307031311-0b61e69e958b // indirect
234233
go.mongodb.org/mongo-driver v1.17.3 // indirect
235234
go.opencensus.io v0.24.0 // indirect
236235
go.opentelemetry.io/auto/sdk v1.1.0 // indirect

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,8 +1658,8 @@ github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e h1:f1
16581658
github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e/go.mod h1:jXcofnrSln/cLI6/dhlBxPQZEEQHVPCcFaH75M+nSzM=
16591659
github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97 h1:VjG0mwhN1DkncwDHFvrpd12/2TLfgYNRmEQA48ikp+0=
16601660
github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97/go.mod h1:vyzFrBXgP+fGNG2FopEGWOO/zrIuoy7zt3LpLeezRsw=
1661-
github.com/thanos-io/promql-engine v0.0.0-20250606124720-6f637b9579dc h1:Hccd/2qzk75XPvK1Oi7F8E9NvBt1kLa0AGd7ivds9nc=
1662-
github.com/thanos-io/promql-engine v0.0.0-20250606124720-6f637b9579dc/go.mod h1:JkfCTUfgCD48IDOVm0Zpm4013dHXahoYjN2mdP2lccg=
1661+
github.com/thanos-io/promql-engine v0.0.0-20250611170940-015ebeb7b5ff h1:obQDLbgnae6rLPngWwQ6q/ifQZeDEmVvxHIJ6arJCDs=
1662+
github.com/thanos-io/promql-engine v0.0.0-20250611170940-015ebeb7b5ff/go.mod h1:IQjuIvDzOOVE2MGDs88Q65GYmmKrpmIsDkMVOqs5reo=
16631663
github.com/thanos-io/thanos v0.37.3-0.20250603135757-4ad45948cd10 h1:mtmcivEm0EoXeHTJAgjXTthyQSTLNFWrPTzpiovau3Y=
16641664
github.com/thanos-io/thanos v0.37.3-0.20250603135757-4ad45948cd10/go.mod h1:2NvA8ZJtoGcOTriumDnJQzDmbxJz1ISGPovVAGGYDbg=
16651665
github.com/tjhop/slog-gokit v0.1.4 h1:uj/vbDt3HaF0Py8bHPV4ti/s0utnO0miRbO277FLBKM=
@@ -1694,8 +1694,6 @@ github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M
16941694
github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
16951695
github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
16961696
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
1697-
github.com/zhangyunhao116/umap v0.0.0-20250307031311-0b61e69e958b h1:dNqfFK3KE2PSs366Y7TaIDrwkv24MHQjSp+x05+IlXc=
1698-
github.com/zhangyunhao116/umap v0.0.0-20250307031311-0b61e69e958b/go.mod h1:r86X1CnsDRrOeLtJlqRWdELPWpkcf933GTlojQlifQw=
16991697
go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
17001698
go.etcd.io/etcd/api/v3 v3.5.17 h1:cQB8eb8bxwuxOilBpMJAEo8fAONyrdXTHUNcMd8yT1w=
17011699
go.etcd.io/etcd/api/v3 v3.5.17/go.mod h1:d1hvkRuXkts6PmaYk2Vrgqbv7H4ADfAKhyJqHNLJCB4=

vendor/github.com/thanos-io/promql-engine/engine/engine.go

Lines changed: 3 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/promql-engine/engine/explain.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/promql-engine/execution/aggregate/count_values.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/promql-engine/execution/aggregate/hashaggregate.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/promql-engine/execution/aggregate/khashaggregate.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/promql-engine/execution/aggregate/scalar_table.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/promql-engine/execution/aggregate/vector_table.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/promql-engine/execution/binary/vector.go

Lines changed: 14 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/promql-engine/execution/exchange/coalesce.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/promql-engine/execution/function/operator.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/promql-engine/execution/model/vector.go

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/promql-engine/logicalplan/merge_selects.go

Lines changed: 8 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/promql-engine/ringbuffer/functions.go

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)