Skip to content

Commit 469c86c

Browse files
committed
upgrade parquet common version
Signed-off-by: yeya24 <[email protected]>
1 parent c170b5d commit 469c86c

File tree

5 files changed

+22
-11
lines changed

5 files changed

+22
-11
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ require (
8787
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
8888
github.com/oklog/ulid/v2 v2.1.1
8989
github.com/parquet-go/parquet-go v0.25.1
90-
github.com/prometheus-community/parquet-common v0.0.0-20251205214622-b9865c513b71
90+
github.com/prometheus-community/parquet-common v0.0.0-20251211092633-65ebeae24e94
9191
github.com/prometheus/client_golang/exp v0.0.0-20250914183048-a974e0d45e0a
9292
github.com/prometheus/procfs v0.16.1
9393
github.com/sercand/kuberesolver/v5 v5.1.1

go.sum

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,7 +1590,7 @@ github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQ
15901590
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
15911591
github.com/opentracing-contrib/go-grpc v0.1.2 h1:MP16Ozc59kqqwn1v18aQxpeGZhsBanJ2iurZYaQSZ+g=
15921592
github.com/opentracing-contrib/go-grpc v0.1.2/go.mod h1:glU6rl1Fhfp9aXUHkE36K2mR4ht8vih0ekOVlWKEUHM=
1593-
github.com/opentracing-contrib/go-stdlib v1.1.0 h1:cZBWc4pA4e65tqTJddbflK435S0tDImj6c9BMvkdUH0=
1593+
github.com/opentracing-contrib/go-stdlib v1.1.0 h1:hSJ8yYaiAO/k2YZUeWJWpQCPE2wRCDtxRnir0gU6wbA=
15941594
github.com/opentracing-contrib/go-stdlib v1.1.0/go.mod h1:S0p+X9p6dcBkoMTL+Qq2VOvxKs9ys5PpYWXWqlCS0bQ=
15951595
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
15961596
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
@@ -1634,8 +1634,8 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr
16341634
github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
16351635
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
16361636
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
1637-
github.com/prometheus-community/parquet-common v0.0.0-20251205214622-b9865c513b71 h1:BwrzRNGy0GbnBA7rQd85G6NuFvydvwTXxRB9XiA5TXk=
1638-
github.com/prometheus-community/parquet-common v0.0.0-20251205214622-b9865c513b71/go.mod h1:gewN7ZuOXJh0X2I57iGHyDLbLvL891P2Ynko2QM5axY=
1637+
github.com/prometheus-community/parquet-common v0.0.0-20251211092633-65ebeae24e94 h1:6WmPxbqGMjBKLOZvurIZR5eEBF0Rd0t1oQ06PMWaHe8=
1638+
github.com/prometheus-community/parquet-common v0.0.0-20251211092633-65ebeae24e94/go.mod h1:gewN7ZuOXJh0X2I57iGHyDLbLvL891P2Ynko2QM5axY=
16391639
github.com/prometheus-community/prom-label-proxy v0.11.1 h1:jX+m+BQCNM0z3/P6V6jVxbiDKgugvk91SaICD6bVhT4=
16401640
github.com/prometheus-community/prom-label-proxy v0.11.1/go.mod h1:uTeQW+wZ/VPV1LL3IPfvUE++wR2nPLex+Y4RE38Cpis=
16411641
github.com/prometheus/alertmanager v0.29.0 h1:/ET4NmAGx2Dv9kStrXIBqBgHyiSgIk4OetY+hoZRfgc=

integration/parquet_querier_test.go

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"time"
1414

1515
"github.com/cortexproject/promqlsmith"
16+
"github.com/prometheus/common/model"
1617
"github.com/prometheus/prometheus/model/labels"
17-
"github.com/prometheus/prometheus/promql"
1818
"github.com/stretchr/testify/require"
1919
"github.com/thanos-io/objstore"
2020
"github.com/thanos-io/thanos/pkg/block"
@@ -301,12 +301,16 @@ func TestParquetProjectionPushdown(t *testing.T) {
301301
c, err := e2ecortex.NewClient("", cortex.HTTPEndpoint(), "", "", "user-1")
302302
require.NoError(t, err)
303303

304-
// Test queries that should use projection hints
305304
testCases := []struct {
306305
name string
307306
query string
308307
expectedLabels []string // Labels that should be present in result
309308
}{
309+
{
310+
name: "vector selector query should not use projection",
311+
query: `http_requests_total`,
312+
expectedLabels: []string{"__name__", "job", "instance", "status_code", "method", "path", "cluster"},
313+
},
310314
{
311315
name: "simple_sum_by_job",
312316
query: `sum by (job) (http_requests_total)`,
@@ -322,6 +326,11 @@ func TestParquetProjectionPushdown(t *testing.T) {
322326
query: `sum by (job, status_code) (http_requests_total)`,
323327
expectedLabels: []string{"job", "status_code"},
324328
},
329+
{
330+
name: "aggregation without query",
331+
query: `sum without (instance, method) (http_requests_total)`,
332+
expectedLabels: []string{"job", "status_code", "path", "cluster"},
333+
},
325334
}
326335

327336
for _, tc := range testCases {
@@ -334,16 +343,17 @@ func TestParquetProjectionPushdown(t *testing.T) {
334343
require.NotNil(t, result)
335344

336345
// Verify we got results
337-
matrix := result.(promql.Matrix)
346+
matrix, ok := result.(model.Matrix)
347+
require.True(t, ok, "result should be a matrix")
338348
require.NotEmpty(t, matrix, "query should return results")
339349

340350
t.Logf("Query returned %d series", len(matrix))
341351

342352
// Verify projection worked: series should only have the expected labels
343-
for i, series := range matrix {
353+
for _, series := range matrix {
344354
actualLabels := make(map[string]struct{})
345355
for _, label := range series.Metric {
346-
actualLabels[label.Name] = struct{}{}
356+
actualLabels[string(label.Name)] = struct{}{}
347357
}
348358

349359
// Check that all expected labels are present

vendor/github.com/prometheus-community/parquet-common/search/materialize.go

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

vendor/modules.txt

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

0 commit comments

Comments
 (0)