Skip to content

Commit 194fbcb

Browse files
authored
upgrade parquet common version (#7149)
1 parent a864fd4 commit 194fbcb

File tree

11 files changed

+505
-66
lines changed

11 files changed

+505
-66
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-20251023184424-4f977ece2a46
90+
github.com/prometheus-community/parquet-common v0.0.0-20251205214622-b9865c513b71
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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-20251023184424-4f977ece2a46 h1:ZzUcddfRLCewtFsx1d/XeyKVmQDsrJLYnlcamNopoYk=
1638-
github.com/prometheus-community/parquet-common v0.0.0-20251023184424-4f977ece2a46/go.mod h1:gewN7ZuOXJh0X2I57iGHyDLbLvL891P2Ynko2QM5axY=
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=
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=

pkg/querier/parquet_queryable.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ func NewParquetQueryable(
141141
}
142142

143143
cDecoder := schema.NewPrometheusParquetChunksDecoder(chunkenc.NewPool())
144+
// This is a noop cache for now as we didn't expose any config to enable this cache.
145+
rrConstraintsCache := search.NewConstraintRowRangeCacheSyncMap()
146+
constraintCacheFunc := func(ctx context.Context) (search.RowRangesForConstraintsCache, error) {
147+
return rrConstraintsCache, nil
148+
}
144149

145150
parquetQueryableOpts := []queryable.QueryableOpts{
146151
queryable.WithRowCountLimitFunc(func(ctx context.Context) int64 {
@@ -195,7 +200,7 @@ func NewParquetQueryable(
195200
return nil
196201
}),
197202
}
198-
parquetQueryable, err := queryable.NewParquetQueryable(cDecoder, func(ctx context.Context, mint, maxt int64) ([]parquet_storage.ParquetShard, error) {
203+
parquetQueryable, err := queryable.NewParquetQueryable(func(ctx context.Context, mint, maxt int64) ([]parquet_storage.ParquetShard, error) {
199204
userID, err := users.TenantID(ctx)
200205
if err != nil {
201206
return nil, err
@@ -245,7 +250,7 @@ func NewParquetQueryable(
245250
}
246251

247252
return shards, errGroup.Wait()
248-
}, parquetQueryableOpts...)
253+
}, constraintCacheFunc, cDecoder, parquetQueryableOpts...)
249254

250255
p := &parquetQueryableWithFallback{
251256
subservices: manager,

pkg/storegateway/parquet_bucket_stores.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func (p *parquetBucketStore) newParquetBlock(ctx context.Context, name string, l
286286
if err != nil {
287287
return nil, err
288288
}
289-
m, err := search.NewMaterializer(s, d, shard, p.concurrency, rowCountQuota, chunkBytesQuota, dataBytesQuota, search.NoopMaterializedSeriesFunc, materializedLabelsFilterCallback)
289+
m, err := search.NewMaterializer(s, d, shard, p.concurrency, rowCountQuota, chunkBytesQuota, dataBytesQuota, search.NoopMaterializedSeriesFunc, materializedLabelsFilterCallback, false)
290290
if err != nil {
291291
return nil, err
292292
}
@@ -361,7 +361,8 @@ func (b *parquetBlock) Query(ctx context.Context, mint, maxt int64, skipChunks b
361361
if err != nil {
362362
return err
363363
}
364-
rr, err := search.Filter(ctx, b.shard, rgi, cs...)
364+
// TODO: Add cache.
365+
rr, err := search.Filter(ctx, b.shard, rgi, nil, cs...)
365366
if err != nil {
366367
return err
367368
}
@@ -421,7 +422,8 @@ func (b *parquetBlock) LabelNames(ctx context.Context, limit int64, matchers []*
421422
if err != nil {
422423
return err
423424
}
424-
rr, err := search.Filter(ctx, b.shard, rgi, cs...)
425+
// TODO: Add cache.
426+
rr, err := search.Filter(ctx, b.shard, rgi, nil, cs...)
425427
if err != nil {
426428
return err
427429
}
@@ -461,7 +463,8 @@ func (b *parquetBlock) LabelValues(ctx context.Context, name string, limit int64
461463
if err != nil {
462464
return err
463465
}
464-
rr, err := search.Filter(ctx, b.shard, rgi, cs...)
466+
// TODO: Add cache.
467+
rr, err := search.Filter(ctx, b.shard, rgi, nil, cs...)
465468
if err != nil {
466469
return err
467470
}

vendor/github.com/prometheus-community/parquet-common/convert/convert.go

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

0 commit comments

Comments
 (0)