From f664b03d8e38ebceb92d9867a3de810b5befe45d Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Wed, 11 Dec 2024 13:52:02 +0100 Subject: [PATCH 1/2] Update to apacha/arrow v17 https://arrow.apache.org/release/17.0.0.html --- go.mod | 10 ++++++---- go.sum | 10 ++++++++-- pkg/compactdictionary/compactdictionary.go | 6 +++--- pkg/ingester/ingester.go | 4 ++-- pkg/ingester/ingester_test.go | 4 ++-- pkg/normalizer/arrow.go | 8 ++++---- pkg/normalizer/normalizer.go | 8 ++++---- pkg/normalizer/otel.go | 4 ++-- pkg/parca/parca.go | 2 +- pkg/parca/parca_test.go | 2 +- pkg/parcacol/arrow.go | 6 +++--- pkg/parcacol/arrow_test.go | 2 +- pkg/parcacol/querier.go | 8 ++++---- pkg/profile/encode.go | 2 +- pkg/profile/encode_test.go | 2 +- pkg/profile/profile.go | 2 +- pkg/profile/reader.go | 4 ++-- pkg/profile/writer.go | 6 +++--- pkg/profilestore/profilecolumnstore.go | 4 ++-- pkg/profilestore/profilestore_test.go | 2 +- pkg/query/columnquery.go | 10 +++++----- pkg/query/columnquery_test.go | 4 ++-- pkg/query/flamegraph_arrow.go | 10 +++++----- pkg/query/flamegraph_arrow_test.go | 8 ++++---- pkg/query/flamegraph_table_test.go | 2 +- pkg/query/pprof.go | 4 ++-- pkg/query/query_test.go | 2 +- pkg/query/sources.go | 10 +++++----- pkg/query/sources_test.go | 2 +- pkg/query/table.go | 10 +++++----- pkg/query/table_test.go | 6 +++--- 31 files changed, 86 insertions(+), 78 deletions(-) diff --git a/go.mod b/go.mod index a758112935e..2779cd9b7ed 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/parca-dev/parca -go 1.22.7 +go 1.23 toolchain go1.23.4 require ( cloud.google.com/go/storage v1.47.0 github.com/alecthomas/kong v0.9.0 - github.com/apache/arrow/go/v16 v16.1.0 + github.com/apache/arrow/go/v17 v17.0.0 github.com/cenkalti/backoff/v4 v4.3.0 github.com/cespare/xxhash/v2 v2.3.0 github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be @@ -34,7 +34,7 @@ require ( github.com/olekukonko/tablewriter v0.0.5 github.com/parquet-go/parquet-go v0.24.0 github.com/planetscale/vtprotobuf v0.6.1-0.20241121165744-79df5c4772f2 - github.com/polarsignals/frostdb v0.0.0-20240823114939-ecd6b80402ae + github.com/polarsignals/frostdb v0.0.0-20241211123813-627a00ffae53 github.com/polarsignals/iceberg-go v0.0.0-20240502213135-2ee70b71e76b github.com/prometheus/client_golang v1.20.5 github.com/prometheus/common v0.60.1 @@ -90,6 +90,7 @@ require ( github.com/RoaringBitmap/roaring v1.9.4 // indirect github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible // indirect github.com/andybalholm/brotli v1.1.0 // indirect + github.com/apache/arrow/go/v16 v16.1.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/aws/aws-sdk-go v1.55.5 // indirect github.com/aws/aws-sdk-go-v2 v1.16.0 // indirect @@ -158,7 +159,7 @@ require ( github.com/gophercloud/gophercloud v1.14.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect - github.com/hamba/avro/v2 v2.20.1 // indirect + github.com/hamba/avro/v2 v2.22.1 // indirect github.com/hashicorp/consul/api v1.29.4 // indirect github.com/hashicorp/cronexpr v1.1.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect @@ -172,6 +173,7 @@ require ( github.com/hashicorp/nomad/api v0.0.0-20240717122358-3d93bd3778f3 // indirect github.com/hashicorp/serf v0.10.1 // indirect github.com/hetznercloud/hcloud-go/v2 v2.13.1 // indirect + github.com/huandu/xstrings v1.4.0 // indirect github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.3+incompatible // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/ionos-cloud/sdk-go/v6 v6.2.1 // indirect diff --git a/go.sum b/go.sum index dabd1666037..9ecd6e9ac36 100644 --- a/go.sum +++ b/go.sum @@ -89,6 +89,8 @@ github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v16 v16.1.0 h1:dwgfOya6s03CzH9JrjCBx6bkVb4yPD4ma3haj9p7FXI= github.com/apache/arrow/go/v16 v16.1.0/go.mod h1:9wnc9mn6vEDTRIm4+27pEjQpRKuTvBaessPoEXQzxWA= +github.com/apache/arrow/go/v17 v17.0.0 h1:RRR2bdqKcdbss9Gxy2NS/hK8i4LDMh23L6BbkN5+F54= +github.com/apache/arrow/go/v17 v17.0.0/go.mod h1:jR7QHkODl15PfYyjM2nU+yTLScZ/qfj7OSUZmJ8putc= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -435,8 +437,8 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU= github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0= -github.com/hamba/avro/v2 v2.20.1 h1:3WByQiVn7wT7d27WQq6pvBRC00FVOrniP6u67FLA/2E= -github.com/hamba/avro/v2 v2.20.1/go.mod h1:xHiKXbISpb3Ovc809XdzWow+XGTn+Oyf/F9aZbTLAig= +github.com/hamba/avro/v2 v2.22.1 h1:q1rAbfJsrbMaZPDLQvwUQMfQzp6H+hGXvckmU/lXemk= +github.com/hamba/avro/v2 v2.22.1/go.mod h1:HOeTrE3kvWnBAgsufqhAzDDV5gvS0QXs65Z6BHfGgbg= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/api v1.29.4 h1:P6slzxDLBOxUSj3fWo2o65VuKtbtOXFi7TSSgtXutuE= github.com/hashicorp/consul/api v1.29.4/go.mod h1:HUlfw+l2Zy68ceJavv2zAyArl2fqhGWnMycyt56sBgg= @@ -504,6 +506,8 @@ github.com/hetznercloud/hcloud-go/v2 v2.13.1/go.mod h1:dhix40Br3fDiBhwaSG/zgaYOF github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= +github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.3+incompatible h1:tKTaPHNVwikS3I1rdyf1INNvgJXWSf/+TzqsiGbrgnQ= github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.3+incompatible/go.mod h1:l7VUhRbTKCzdOacdT4oWCwATKyvZqUOlOqr0Ous3k4s= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= @@ -726,6 +730,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/polarsignals/frostdb v0.0.0-20240823114939-ecd6b80402ae h1:S6I0pqMvDah/rWLLC1cIcsVjLe0nHF9AQPEYx5LKZwI= github.com/polarsignals/frostdb v0.0.0-20240823114939-ecd6b80402ae/go.mod h1:gF12QGLNx2JFGMMQQhur6mQCV+1KV8qEbd/JCWIAso4= +github.com/polarsignals/frostdb v0.0.0-20241211123813-627a00ffae53 h1:tY68clYMUKhh3OA5FMU3B0li4IDUtZ/SYkJYlIDMVLQ= +github.com/polarsignals/frostdb v0.0.0-20241211123813-627a00ffae53/go.mod h1:WfipOp1TRYHga3yU1D6sSn9ay/CthXYGb6E53j83yZ8= github.com/polarsignals/iceberg-go v0.0.0-20240502213135-2ee70b71e76b h1:Dbm5itapR0uYIMujR8OntWpDJ/nm5OM6JiaKauLcZ4Y= github.com/polarsignals/iceberg-go v0.0.0-20240502213135-2ee70b71e76b/go.mod h1:5T9ChEZjRNhAGGLwH1cqzDA7wXB84SmU+WkXQr/ZAjo= github.com/polarsignals/wal v0.0.0-20240619104840-9da940027f9c h1:ReFgEXqZ9/y+/9ZdNHOa1L62wqt8mWqoqrWutWj2x+A= diff --git a/pkg/compactdictionary/compactdictionary.go b/pkg/compactdictionary/compactdictionary.go index 0b7ec9b8c99..2f7e4174ab7 100644 --- a/pkg/compactdictionary/compactdictionary.go +++ b/pkg/compactdictionary/compactdictionary.go @@ -17,9 +17,9 @@ import ( "fmt" stdmath "math" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/memory" ) type Releasable interface { diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go index 97657942e80..0a95b07c15c 100644 --- a/pkg/ingester/ingester.go +++ b/pkg/ingester/ingester.go @@ -16,8 +16,8 @@ package ingester import ( "context" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/go-kit/log" ) diff --git a/pkg/ingester/ingester_test.go b/pkg/ingester/ingester_test.go index baa378e6bba..cc147ef688a 100644 --- a/pkg/ingester/ingester_test.go +++ b/pkg/ingester/ingester_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/go-kit/log" "github.com/polarsignals/frostdb/dynparquet" "github.com/stretchr/testify/require" diff --git a/pkg/normalizer/arrow.go b/pkg/normalizer/arrow.go index 8b36c6474c2..1babc30a175 100644 --- a/pkg/normalizer/arrow.go +++ b/pkg/normalizer/arrow.go @@ -21,10 +21,10 @@ import ( "time" "unsafe" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/compute" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/compute" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/polarsignals/frostdb/dynparquet" "github.com/polarsignals/frostdb/pqarrow/arrowutils" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/normalizer/normalizer.go b/pkg/normalizer/normalizer.go index 3ab6f91dc68..117dc7f50a7 100644 --- a/pkg/normalizer/normalizer.go +++ b/pkg/normalizer/normalizer.go @@ -25,10 +25,10 @@ import ( "strings" "time" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/compute" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/compute" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/gogo/status" "github.com/parquet-go/parquet-go" "github.com/polarsignals/frostdb/dynparquet" diff --git a/pkg/normalizer/otel.go b/pkg/normalizer/otel.go index ad7c277b3c4..28efbe54db6 100644 --- a/pkg/normalizer/otel.go +++ b/pkg/normalizer/otel.go @@ -20,8 +20,8 @@ import ( "strings" "time" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/parquet-go/parquet-go" "github.com/polarsignals/frostdb/dynparquet" "github.com/polarsignals/frostdb/pqarrow" diff --git a/pkg/parca/parca.go b/pkg/parca/parca.go index 6c05f168ab6..3fc277a9167 100644 --- a/pkg/parca/parca.go +++ b/pkg/parca/parca.go @@ -28,7 +28,7 @@ import ( "syscall" "time" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/dgraph-io/badger/v4" "github.com/go-kit/log" "github.com/go-kit/log/level" diff --git a/pkg/parca/parca_test.go b/pkg/parca/parca_test.go index a4a2cb0081c..4d4c80252c1 100644 --- a/pkg/parca/parca_test.go +++ b/pkg/parca/parca_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/cenkalti/backoff/v4" "github.com/go-kit/log" "github.com/google/pprof/profile" diff --git a/pkg/parcacol/arrow.go b/pkg/parcacol/arrow.go index 1406f9edcf3..290dbf3addb 100644 --- a/pkg/parcacol/arrow.go +++ b/pkg/parcacol/arrow.go @@ -19,9 +19,9 @@ import ( "strings" "unsafe" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/memory" "go.opentelemetry.io/otel/trace" pb "github.com/parca-dev/parca/gen/proto/go/parca/metastore/v1alpha1" diff --git a/pkg/parcacol/arrow_test.go b/pkg/parcacol/arrow_test.go index c429f4c74a1..33b23111f6f 100644 --- a/pkg/parcacol/arrow_test.go +++ b/pkg/parcacol/arrow_test.go @@ -16,7 +16,7 @@ package parcacol import ( "testing" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/require" pb "github.com/parca-dev/parca/gen/proto/go/parca/metastore/v1alpha1" diff --git a/pkg/parcacol/querier.go b/pkg/parcacol/querier.go index 06ede0c4ab1..2ad7bc86a6a 100644 --- a/pkg/parcacol/querier.go +++ b/pkg/parcacol/querier.go @@ -21,10 +21,10 @@ import ( "strings" "time" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/memory" - "github.com/apache/arrow/go/v16/arrow/scalar" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/scalar" "github.com/go-kit/log" "github.com/polarsignals/frostdb/pqarrow/arrowutils" "github.com/polarsignals/frostdb/query" diff --git a/pkg/profile/encode.go b/pkg/profile/encode.go index db36f8f17da..e8e03e3bbee 100644 --- a/pkg/profile/encode.go +++ b/pkg/profile/encode.go @@ -16,7 +16,7 @@ package profile import ( "encoding/binary" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow/array" pprofextended "go.opentelemetry.io/proto/otlp/profiles/v1experimental" pprofpb "github.com/parca-dev/parca/gen/proto/go/google/pprof" diff --git a/pkg/profile/encode_test.go b/pkg/profile/encode_test.go index 8a87b084dd4..a0c26904bb9 100644 --- a/pkg/profile/encode_test.go +++ b/pkg/profile/encode_test.go @@ -16,7 +16,7 @@ package profile import ( "testing" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" pprofpb "github.com/parca-dev/parca/gen/proto/go/google/pprof" ) diff --git a/pkg/profile/profile.go b/pkg/profile/profile.go index 531a40283fb..2b1094cdcd7 100644 --- a/pkg/profile/profile.go +++ b/pkg/profile/profile.go @@ -16,7 +16,7 @@ package profile import ( "time" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" pprofproto "github.com/parca-dev/parca/gen/proto/go/google/pprof" pb "github.com/parca-dev/parca/gen/proto/go/parca/metastore/v1alpha1" diff --git a/pkg/profile/reader.go b/pkg/profile/reader.go index 6d7341eda7b..5bb5b7f9615 100644 --- a/pkg/profile/reader.go +++ b/pkg/profile/reader.go @@ -16,8 +16,8 @@ package profile import ( "strings" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" ) type LabelColumn struct { diff --git a/pkg/profile/writer.go b/pkg/profile/writer.go index 1549c4d9367..e51b74d9e6d 100644 --- a/pkg/profile/writer.go +++ b/pkg/profile/writer.go @@ -14,9 +14,9 @@ package profile import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/memory" ) type Writer struct { diff --git a/pkg/profilestore/profilecolumnstore.go b/pkg/profilestore/profilecolumnstore.go index 0bb9110f620..a10adef32de 100644 --- a/pkg/profilestore/profilecolumnstore.go +++ b/pkg/profilestore/profilecolumnstore.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/apache/arrow/go/v16/arrow/ipc" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/ipc" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/go-kit/log" "github.com/gogo/status" "github.com/polarsignals/frostdb/dynparquet" diff --git a/pkg/profilestore/profilestore_test.go b/pkg/profilestore/profilestore_test.go index 2b125c053f6..2a061d6eeb2 100644 --- a/pkg/profilestore/profilestore_test.go +++ b/pkg/profilestore/profilestore_test.go @@ -18,7 +18,7 @@ import ( "os" "testing" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/go-kit/log" "github.com/polarsignals/frostdb" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/query/columnquery.go b/pkg/query/columnquery.go index 2a1d5e82060..6d57a7a21b5 100644 --- a/pkg/query/columnquery.go +++ b/pkg/query/columnquery.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/bitutil" - "github.com/apache/arrow/go/v16/arrow/math" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/bitutil" + "github.com/apache/arrow/go/v17/arrow/math" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/go-kit/log" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" diff --git a/pkg/query/columnquery_test.go b/pkg/query/columnquery_test.go index eebbe6f4ecd..99cb4ba7b42 100644 --- a/pkg/query/columnquery_test.go +++ b/pkg/query/columnquery_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/go-kit/log" pprofprofile "github.com/google/pprof/profile" columnstore "github.com/polarsignals/frostdb" diff --git a/pkg/query/flamegraph_arrow.go b/pkg/query/flamegraph_arrow.go index 56c155aa347..47fb954b34e 100644 --- a/pkg/query/flamegraph_arrow.go +++ b/pkg/query/flamegraph_arrow.go @@ -22,11 +22,11 @@ import ( "strings" "unsafe" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/ipc" - "github.com/apache/arrow/go/v16/arrow/math" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/ipc" + "github.com/apache/arrow/go/v17/arrow/math" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/olekukonko/tablewriter" "github.com/polarsignals/frostdb/pqarrow/builder" "github.com/zeebo/xxh3" diff --git a/pkg/query/flamegraph_arrow_test.go b/pkg/query/flamegraph_arrow_test.go index da7ef9655db..3cb668669f4 100644 --- a/pkg/query/flamegraph_arrow_test.go +++ b/pkg/query/flamegraph_arrow_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/ipc" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/ipc" + "github.com/apache/arrow/go/v17/arrow/memory" pprofprofile "github.com/google/pprof/profile" "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" diff --git a/pkg/query/flamegraph_table_test.go b/pkg/query/flamegraph_table_test.go index 9d4f1bd40c8..069a31469b9 100644 --- a/pkg/query/flamegraph_table_test.go +++ b/pkg/query/flamegraph_table_test.go @@ -19,7 +19,7 @@ import ( "sort" "testing" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" pprofprofile "github.com/google/pprof/profile" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace/noop" diff --git a/pkg/query/pprof.go b/pkg/query/pprof.go index 2c36434d3e0..1fcb7f431fd 100644 --- a/pkg/query/pprof.go +++ b/pkg/query/pprof.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" pprofpb "github.com/parca-dev/parca/gen/proto/go/google/pprof" parcaprofile "github.com/parca-dev/parca/pkg/profile" diff --git a/pkg/query/query_test.go b/pkg/query/query_test.go index 6c8d4c5ed35..d699ceb11ca 100644 --- a/pkg/query/query_test.go +++ b/pkg/query/query_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/go-kit/log" "github.com/polarsignals/frostdb" columnstore "github.com/polarsignals/frostdb" diff --git a/pkg/query/sources.go b/pkg/query/sources.go index cc119973d00..8b0d4bc1a2c 100644 --- a/pkg/query/sources.go +++ b/pkg/query/sources.go @@ -18,11 +18,11 @@ import ( "context" "strings" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/ipc" - "github.com/apache/arrow/go/v16/arrow/math" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/ipc" + "github.com/apache/arrow/go/v17/arrow/math" + "github.com/apache/arrow/go/v17/arrow/memory" "go.opentelemetry.io/otel/trace" pb "github.com/parca-dev/parca/gen/proto/go/parca/query/v1alpha1" diff --git a/pkg/query/sources_test.go b/pkg/query/sources_test.go index e0d7a5c1ad5..1a05e0dd7c9 100644 --- a/pkg/query/sources_test.go +++ b/pkg/query/sources_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/go-kit/log" "github.com/stretchr/testify/require" "github.com/thanos-io/objstore" diff --git a/pkg/query/table.go b/pkg/query/table.go index 2846d5d26a2..ef34be37841 100644 --- a/pkg/query/table.go +++ b/pkg/query/table.go @@ -18,11 +18,11 @@ import ( "context" "fmt" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/ipc" - "github.com/apache/arrow/go/v16/arrow/math" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/ipc" + "github.com/apache/arrow/go/v17/arrow/math" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/polarsignals/frostdb/pqarrow/builder" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" diff --git a/pkg/query/table_test.go b/pkg/query/table_test.go index a73a9b99139..591201523f4 100644 --- a/pkg/query/table_test.go +++ b/pkg/query/table_test.go @@ -17,9 +17,9 @@ import ( "context" "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/memory" pprofprofile "github.com/google/pprof/profile" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace/noop" From faddda7d2b215e8ad75e5f96b5caec5a4abaffd4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:58:51 +0000 Subject: [PATCH 2/2] [pre-commit.ci lite] apply automatic fixes --- go.mod | 1 - go.sum | 4 ---- 2 files changed, 5 deletions(-) diff --git a/go.mod b/go.mod index 2779cd9b7ed..a049cfe7b79 100644 --- a/go.mod +++ b/go.mod @@ -90,7 +90,6 @@ require ( github.com/RoaringBitmap/roaring v1.9.4 // indirect github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible // indirect github.com/andybalholm/brotli v1.1.0 // indirect - github.com/apache/arrow/go/v16 v16.1.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/aws/aws-sdk-go v1.55.5 // indirect github.com/aws/aws-sdk-go-v2 v1.16.0 // indirect diff --git a/go.sum b/go.sum index 9ecd6e9ac36..d3ed82a96e7 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,6 @@ github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible h1:9gWa46nstkJ9miBReJcN8 github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= -github.com/apache/arrow/go/v16 v16.1.0 h1:dwgfOya6s03CzH9JrjCBx6bkVb4yPD4ma3haj9p7FXI= -github.com/apache/arrow/go/v16 v16.1.0/go.mod h1:9wnc9mn6vEDTRIm4+27pEjQpRKuTvBaessPoEXQzxWA= github.com/apache/arrow/go/v17 v17.0.0 h1:RRR2bdqKcdbss9Gxy2NS/hK8i4LDMh23L6BbkN5+F54= github.com/apache/arrow/go/v17 v17.0.0/go.mod h1:jR7QHkODl15PfYyjM2nU+yTLScZ/qfj7OSUZmJ8putc= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= @@ -728,8 +726,6 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20241121165744-79df5c4772f2/go.mod h1 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polarsignals/frostdb v0.0.0-20240823114939-ecd6b80402ae h1:S6I0pqMvDah/rWLLC1cIcsVjLe0nHF9AQPEYx5LKZwI= -github.com/polarsignals/frostdb v0.0.0-20240823114939-ecd6b80402ae/go.mod h1:gF12QGLNx2JFGMMQQhur6mQCV+1KV8qEbd/JCWIAso4= github.com/polarsignals/frostdb v0.0.0-20241211123813-627a00ffae53 h1:tY68clYMUKhh3OA5FMU3B0li4IDUtZ/SYkJYlIDMVLQ= github.com/polarsignals/frostdb v0.0.0-20241211123813-627a00ffae53/go.mod h1:WfipOp1TRYHga3yU1D6sSn9ay/CthXYGb6E53j83yZ8= github.com/polarsignals/iceberg-go v0.0.0-20240502213135-2ee70b71e76b h1:Dbm5itapR0uYIMujR8OntWpDJ/nm5OM6JiaKauLcZ4Y=