Skip to content

Upgrade parquet common version #7149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yeya24 merged 1 commit into from
Dec 9, 2025
Merged

Upgrade parquet common version #7149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
github.com/oklog/ulid/v2 v2.1.1
github.com/parquet-go/parquet-go v0.25.1
github.com/prometheus-community/parquet-common v0.0.0-20251023184424-4f977ece2a46
github.com/prometheus-community/parquet-common v0.0.0-20251205214622-b9865c513b71
github.com/prometheus/client_golang/exp v0.0.0-20250914183048-a974e0d45e0a
github.com/prometheus/procfs v0.16.1
github.com/sercand/kuberesolver/v5 v5.1.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1634,8 +1634,8 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr
github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
github.com/prometheus-community/parquet-common v0.0.0-20251023184424-4f977ece2a46 h1:ZzUcddfRLCewtFsx1d/XeyKVmQDsrJLYnlcamNopoYk=
github.com/prometheus-community/parquet-common v0.0.0-20251023184424-4f977ece2a46/go.mod h1:gewN7ZuOXJh0X2I57iGHyDLbLvL891P2Ynko2QM5axY=
github.com/prometheus-community/parquet-common v0.0.0-20251205214622-b9865c513b71 h1:BwrzRNGy0GbnBA7rQd85G6NuFvydvwTXxRB9XiA5TXk=
github.com/prometheus-community/parquet-common v0.0.0-20251205214622-b9865c513b71/go.mod h1:gewN7ZuOXJh0X2I57iGHyDLbLvL891P2Ynko2QM5axY=
github.com/prometheus-community/prom-label-proxy v0.11.1 h1:jX+m+BQCNM0z3/P6V6jVxbiDKgugvk91SaICD6bVhT4=
github.com/prometheus-community/prom-label-proxy v0.11.1/go.mod h1:uTeQW+wZ/VPV1LL3IPfvUE++wR2nPLex+Y4RE38Cpis=
github.com/prometheus/alertmanager v0.29.0 h1:/ET4NmAGx2Dv9kStrXIBqBgHyiSgIk4OetY+hoZRfgc=
Expand Down
9 changes: 7 additions & 2 deletions pkg/querier/parquet_queryable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,11 @@ func NewParquetQueryable(
}

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

parquetQueryableOpts := []queryable.QueryableOpts{
queryable.WithRowCountLimitFunc(func(ctx context.Context) int64 {
Expand Down Expand Up @@ -195,7 +200,7 @@ func NewParquetQueryable(
return nil
}),
}
parquetQueryable, err := queryable.NewParquetQueryable(cDecoder, func(ctx context.Context, mint, maxt int64) ([]parquet_storage.ParquetShard, error) {
parquetQueryable, err := queryable.NewParquetQueryable(func(ctx context.Context, mint, maxt int64) ([]parquet_storage.ParquetShard, error) {
userID, err := users.TenantID(ctx)
if err != nil {
return nil, err
Expand Down Expand Up @@ -245,7 +250,7 @@ func NewParquetQueryable(
}

return shards, errGroup.Wait()
}, parquetQueryableOpts...)
}, constraintCacheFunc, cDecoder, parquetQueryableOpts...)

p := &parquetQueryableWithFallback{
subservices: manager,
Expand Down
11 changes: 7 additions & 4 deletions pkg/storegateway/parquet_bucket_stores.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ func (p *parquetBucketStore) newParquetBlock(ctx context.Context, name string, l
if err != nil {
return nil, err
}
m, err := search.NewMaterializer(s, d, shard, p.concurrency, rowCountQuota, chunkBytesQuota, dataBytesQuota, search.NoopMaterializedSeriesFunc, materializedLabelsFilterCallback)
m, err := search.NewMaterializer(s, d, shard, p.concurrency, rowCountQuota, chunkBytesQuota, dataBytesQuota, search.NoopMaterializedSeriesFunc, materializedLabelsFilterCallback, false)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -361,7 +361,8 @@ func (b *parquetBlock) Query(ctx context.Context, mint, maxt int64, skipChunks b
if err != nil {
return err
}
rr, err := search.Filter(ctx, b.shard, rgi, cs...)
// TODO: Add cache.
rr, err := search.Filter(ctx, b.shard, rgi, nil, cs...)
if err != nil {
return err
}
Expand Down Expand Up @@ -421,7 +422,8 @@ func (b *parquetBlock) LabelNames(ctx context.Context, limit int64, matchers []*
if err != nil {
return err
}
rr, err := search.Filter(ctx, b.shard, rgi, cs...)
// TODO: Add cache.
rr, err := search.Filter(ctx, b.shard, rgi, nil, cs...)
if err != nil {
return err
}
Expand Down Expand Up @@ -461,7 +463,8 @@ func (b *parquetBlock) LabelValues(ctx context.Context, name string, limit int64
if err != nil {
return err
}
rr, err := search.Filter(ctx, b.shard, rgi, cs...)
// TODO: Add cache.
rr, err := search.Filter(ctx, b.shard, rgi, nil, cs...)
if err != nil {
return err
}
Expand Down
159 changes: 155 additions & 4 deletions vendor/github.com/prometheus-community/parquet-common/convert/convert.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading