Skip to content

Commit cacc742

Browse files
authored
DEVPROD-26636 Replace the parquet-go library with parquet-go/parquet-go (evergreen-ci#10013)
1 parent 89a31ec commit cacc742

10 files changed

Lines changed: 71 additions & 161 deletions

File tree

agent/command/results_utils.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ import (
1616
"github.com/evergreen-ci/evergreen/model/testresult"
1717
"github.com/evergreen-ci/pail"
1818
"github.com/evergreen-ci/utility"
19-
goparquet "github.com/fraugster/parquet-go"
20-
"github.com/fraugster/parquet-go/floor"
19+
"github.com/parquet-go/parquet-go"
2120
"github.com/pkg/errors"
2221
)
2322

@@ -145,10 +144,7 @@ func uploadParquet(ctx context.Context, credentials evergreen.S3Credentials, out
145144
}
146145
defer w.Close()
147146

148-
pw := floor.NewWriter(goparquet.NewFileWriter(w, goparquet.WithSchemaDefinition(task.ParquetTestResultsSchemaDef)))
149-
defer pw.Close()
150-
151-
return errors.Wrap(pw.Write(results), "writing Parquet test results")
147+
return errors.Wrap(parquet.Write(w, []testresult.ParquetTestResults{*results}), "writing Parquet test results")
152148
}
153149

154150
func makeTestResultsInfo(t task.Task, displayTaskInfo *apimodels.DisplayTaskInfo) testresult.TestResultsInfo {

agent/command/results_utils_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ import (
1818
"github.com/evergreen-ci/evergreen/testutil"
1919
"github.com/evergreen-ci/pail"
2020
"github.com/evergreen-ci/utility"
21-
goparquet "github.com/fraugster/parquet-go"
22-
"github.com/fraugster/parquet-go/floor"
2321
"github.com/mongodb/grip/sometimes"
22+
"github.com/parquet-go/parquet-go"
2423
"github.com/stretchr/testify/assert"
2524
"github.com/stretchr/testify/require"
2625
)
@@ -194,9 +193,7 @@ func saveTestResults(t *testing.T, ctx context.Context, testBucket pail.Bucket,
194193
require.NoError(t, err)
195194
defer func() { assert.NoError(t, w.Close()) }()
196195

197-
pw := floor.NewWriter(goparquet.NewFileWriter(w, goparquet.WithSchemaDefinition(task.ParquetTestResultsSchemaDef)))
198-
require.NoError(t, pw.Write(savedParquet))
199-
require.NoError(t, pw.Close())
196+
require.NoError(t, parquet.Write(w, []testresult.ParquetTestResults{savedParquet}))
200197
require.NoError(t, db.Insert(ctx, testresult.Collection, tr))
201198
require.NoError(t, svc.AppendTestResultMetadata(resultTestutil.MakeAppendTestResultMetadataReq(ctx, savedResults, tr.ID)))
202199
return savedResults

cmd/load-smoke-data/load-smoke-data.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ import (
1919
"github.com/evergreen-ci/evergreen/model/testresult"
2020
"github.com/evergreen-ci/pail"
2121
"github.com/evergreen-ci/utility"
22-
goparquet "github.com/fraugster/parquet-go"
23-
"github.com/fraugster/parquet-go/floor"
2422
"github.com/mongodb/amboy"
2523
"github.com/mongodb/amboy/queue"
2624
"github.com/mongodb/grip"
25+
"github.com/parquet-go/parquet-go"
2726
"github.com/pkg/errors"
2827
"go.mongodb.org/mongo-driver/bson"
2928
"go.mongodb.org/mongo-driver/mongo"
@@ -144,9 +143,9 @@ func writeDummyTestResultToLocalBucket(ctx context.Context) error {
144143
CreatedAt: tr.CreatedAt,
145144
Results: make([]testresult.ParquetTestResult, 1),
146145
}
147-
pw := floor.NewWriter(goparquet.NewFileWriter(w, goparquet.WithSchemaDefinition(task.ParquetTestResultsSchemaDef)))
148-
pw.Write(savedParquet)
149-
pw.Close()
146+
if err := parquet.Write(w, []testresult.ParquetTestResults{savedParquet}); err != nil {
147+
return errors.Wrap(err, "writing dummy Parquet test results")
148+
}
150149
return nil
151150
}
152151

go.mod

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/evergreen-ci/evergreen
22

3-
go 1.24.0
3+
go 1.24.9
44

55
require (
66
github.com/99designs/gqlgen v0.17.86
@@ -171,12 +171,12 @@ require (
171171
github.com/evergreen-ci/evg-lint v0.0.0-20251215145242-23eaa365e48f
172172
github.com/evergreen-ci/plank v0.0.0-20251203163536-53406252f581
173173
github.com/evergreen-ci/test-selection-client v0.0.0-20251016163227-83399b69e34c
174-
github.com/fraugster/parquet-go v0.11.0
175174
github.com/google/go-github/v70 v70.0.0
176175
github.com/gorilla/csrf v1.7.3
177176
github.com/gorilla/handlers v1.5.2
178177
github.com/kanopy-platform/kanopy-oidc-lib v0.1.3
179178
github.com/mongodb/jasper v0.0.0-20260115181313-e094cd64f89f
179+
github.com/parquet-go/parquet-go v0.29.0
180180
github.com/shirou/gopsutil/v3 v3.24.5
181181
github.com/sirupsen/logrus v1.9.4
182182
github.com/vikstrous/dataloadgen v0.0.10
@@ -186,8 +186,6 @@ require (
186186
)
187187

188188
require (
189-
github.com/apache/thrift v0.16.0 // indirect
190-
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de // indirect
191189
github.com/aws/aws-sdk-go-v2/service/signin v1.0.7 // indirect
192190
github.com/aws/aws-sdk-go-v2/service/sns v1.39.8 // indirect
193191
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
@@ -209,7 +207,10 @@ require (
209207
github.com/moby/sys/userns v0.1.0 // indirect
210208
github.com/montanaflynn/stats v0.7.1 // indirect
211209
github.com/okta/okta-jwt-verifier-golang/v2 v2.1.1 // indirect
210+
github.com/parquet-go/bitpack v1.0.0 // indirect
211+
github.com/parquet-go/jsonlite v1.0.0 // indirect
212212
github.com/segmentio/asm v1.2.1 // indirect
213+
github.com/twpayne/go-geom v1.6.1 // indirect
213214
github.com/urfave/cli/v3 v3.6.1 // indirect
214215
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
215216
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0 // indirect
@@ -236,6 +237,4 @@ require (
236237
gotest.tools/v3 v3.5.1 // indirect
237238
)
238239

239-
replace github.com/fraugster/parquet-go => github.com/evergreen-ci/parquet-go v0.0.0-20260116211725-cd13d4127a88
240-
241240
tool github.com/99designs/gqlgen

0 commit comments

Comments
 (0)