Skip to content

Commit 95c299d

Browse files
authored
Upgrade parquet common to latest main (#7076)
1 parent fc6da2d commit 95c299d

File tree

14 files changed

+771
-374
lines changed

14 files changed

+771
-374
lines changed

go.mod

Lines changed: 5 additions & 2 deletions
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-20250827225610-65f0b68d35e6
90+
github.com/prometheus-community/parquet-common v0.0.0-20251023184424-4f977ece2a46
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
@@ -230,7 +230,7 @@ require (
230230
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
231231
github.com/prometheus-community/prom-label-proxy v0.11.1 // indirect
232232
github.com/prometheus/exporter-toolkit v0.14.0 // indirect
233-
github.com/prometheus/otlptranslator v0.0.0-20250620074007-94f535e0c588 // indirect
233+
github.com/prometheus/otlptranslator v0.0.2 // indirect
234234
github.com/prometheus/sigv4 v0.2.0 // indirect
235235
github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
236236
github.com/rantav/go-grpc-channelz v0.0.4 // indirect
@@ -334,3 +334,6 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.71.2
334334

335335
// See https://github.com/envoyproxy/go-control-plane/issues/1083 as this version introduces checksum mismatch.
336336
exclude github.com/envoyproxy/go-control-plane/envoy v1.32.3
337+
338+
// TODO: update it in next PR
339+
replace github.com/prometheus/otlptranslator => github.com/prometheus/otlptranslator v0.0.0-20250620074007-94f535e0c588

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1613,8 +1613,8 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr
16131613
github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
16141614
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
16151615
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
1616-
github.com/prometheus-community/parquet-common v0.0.0-20250827225610-65f0b68d35e6 h1:jWcDrCpAU047f2NTGtm3vRPqJ8skDOkdKCC5sSfSN4Q=
1617-
github.com/prometheus-community/parquet-common v0.0.0-20250827225610-65f0b68d35e6/go.mod h1:MbAv/yCv9GORLj0XvXgRF913R9Jc04+BvVq4VJpPCi0=
1616+
github.com/prometheus-community/parquet-common v0.0.0-20251023184424-4f977ece2a46 h1:ZzUcddfRLCewtFsx1d/XeyKVmQDsrJLYnlcamNopoYk=
1617+
github.com/prometheus-community/parquet-common v0.0.0-20251023184424-4f977ece2a46/go.mod h1:gewN7ZuOXJh0X2I57iGHyDLbLvL891P2Ynko2QM5axY=
16181618
github.com/prometheus-community/prom-label-proxy v0.11.1 h1:jX+m+BQCNM0z3/P6V6jVxbiDKgugvk91SaICD6bVhT4=
16191619
github.com/prometheus-community/prom-label-proxy v0.11.1/go.mod h1:uTeQW+wZ/VPV1LL3IPfvUE++wR2nPLex+Y4RE38Cpis=
16201620
github.com/prometheus/alertmanager v0.28.1 h1:BK5pCoAtaKg01BYRUJhEDV1tqJMEtYBGzPw8QdvnnvA=

pkg/parquetconverter/converter.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ func (c *Converter) convertUser(ctx context.Context, logger log.Logger, ring rin
444444
tsdbBlock.MinTime(),
445445
tsdbBlock.MaxTime(),
446446
[]convert.Convertible{tsdbBlock},
447+
util_log.GoKitLogToSlog(logger),
447448
converterOpts...,
448449
)
449450

pkg/parquetconverter/converter_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ func TestConverter_BlockConversionFailure(t *testing.T) {
247247

248248
// Create a new converter with test configuration
249249
cfg := Config{
250+
MaxRowsPerRowGroup: 1e6,
250251
MetaSyncConcurrency: 1,
251252
DataDir: t.TempDir(),
252253
}
@@ -302,6 +303,7 @@ func TestConverter_ShouldNotFailOnAccessDenyError(t *testing.T) {
302303

303304
// Create a new converter with test configuration
304305
cfg := Config{
306+
MaxRowsPerRowGroup: 1e6,
305307
MetaSyncConcurrency: 1,
306308
DataDir: t.TempDir(),
307309
}

pkg/querier/parquet_queryable_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
"github.com/cortexproject/cortex/pkg/util"
4040
"github.com/cortexproject/cortex/pkg/util/flagext"
4141
"github.com/cortexproject/cortex/pkg/util/limiter"
42+
util_log "github.com/cortexproject/cortex/pkg/util/log"
4243
"github.com/cortexproject/cortex/pkg/util/services"
4344
"github.com/cortexproject/cortex/pkg/util/validation"
4445
)
@@ -543,7 +544,7 @@ func TestParquetQueryable_Limits(t *testing.T) {
543544
if testData.expectedErr != nil {
544545
require.False(t, set.Next())
545546
err = set.Err()
546-
require.EqualError(t, err, testData.expectedErr.Error())
547+
require.ErrorContains(t, err, testData.expectedErr.Error())
547548
return
548549
}
549550

@@ -570,6 +571,7 @@ func convertBlockToParquet(t *testing.T, ctx context.Context, userBucketClient o
570571
tsdbBlock.MinTime(),
571572
tsdbBlock.MaxTime(),
572573
[]convert.Convertible{tsdbBlock},
574+
util_log.SLogger,
573575
converterOpts...,
574576
)
575577
require.NoError(t, err)

0 commit comments

Comments
 (0)