From 1dcef8853d2337032b4f724bbca669f47d77cb61 Mon Sep 17 00:00:00 2001 From: Dane Strandboge <136023093+DStrand1@users.noreply.github.com> Date: Thu, 6 Feb 2025 04:43:14 -0600 Subject: [PATCH] chore(deps): Fix apache arrow dependency, update to v18.1.0 (#16482) --- docs/LICENSE_OF_DEPENDENCIES.md | 1 + go.mod | 4 ++-- go.sum | 8 ++++---- plugins/inputs/sql/drivers.go | 2 +- plugins/outputs/parquet/README.md | 2 +- plugins/outputs/parquet/parquet.go | 10 +++++----- plugins/outputs/parquet/parquet_test.go | 2 +- plugins/parsers/parquet/columns.go | 4 ++-- plugins/parsers/parquet/parser.go | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md index 505d23e92..3a17bf254 100644 --- a/docs/LICENSE_OF_DEPENDENCIES.md +++ b/docs/LICENSE_OF_DEPENDENCIES.md @@ -55,6 +55,7 @@ following works: - github.com/antchfx/xmlquery [MIT License](https://github.com/antchfx/xmlquery/blob/master/LICENSE) - github.com/antchfx/xpath [MIT License](https://github.com/antchfx/xpath/blob/master/LICENSE) - github.com/antlr4-go/antlr [BSD 3-Clause "New" or "Revised" License](https://github.com/antlr/antlr4/blob/master/LICENSE.txt) +- github.com/apache/arrow-go [Apache License 2.0](https://github.com/apache/arrow-go/blob/main/LICENSE.txt) - github.com/apache/arrow/go [Apache License 2.0](https://github.com/apache/arrow/blob/master/LICENSE.txt) - github.com/apache/iotdb-client-go [Apache License 2.0](https://github.com/apache/iotdb-client-go/blob/main/LICENSE) - github.com/apache/thrift [Apache License 2.0](https://github.com/apache/thrift/blob/master/LICENSE) diff --git a/go.mod b/go.mod index 56bc21d78..d48d84255 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/antchfx/jsonquery v1.3.3 github.com/antchfx/xmlquery v1.4.1 github.com/antchfx/xpath v1.3.1 - github.com/apache/arrow/go/v18 v18.0.0-20240716144821-cf5d7c7ec3cf + github.com/apache/arrow-go/v18 v18.1.0 github.com/apache/iotdb-client-go v1.3.3 github.com/apache/thrift v0.21.0 github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740 @@ -357,7 +357,7 @@ require ( github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect - github.com/google/flatbuffers v24.3.25+incompatible // indirect + github.com/google/flatbuffers v24.12.23+incompatible // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect diff --git a/go.sum b/go.sum index b954030ad..ca8729fcd 100644 --- a/go.sum +++ b/go.sum @@ -836,12 +836,12 @@ github.com/antchfx/xpath v1.3.1/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwq github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= +github.com/apache/arrow-go/v18 v18.1.0 h1:agLwJUiVuwXZdwPYVrlITfx7bndULJ/dggbnLFgDp/Y= +github.com/apache/arrow-go/v18 v18.1.0/go.mod h1:tigU/sIgKNXaesf5d7Y95jBBKS5KsxTqYBKXFsvKzo0= github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI= github.com/apache/arrow/go/v15 v15.0.2 h1:60IliRbiyTWCWjERBCkO1W4Qun9svcYoZrSLcyOsMLE= github.com/apache/arrow/go/v15 v15.0.2/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= -github.com/apache/arrow/go/v18 v18.0.0-20240716144821-cf5d7c7ec3cf h1:9b4bG4uqvid0RH3MHWq2soXTfhPFbqbuNCqLRrl4ZGg= -github.com/apache/arrow/go/v18 v18.0.0-20240716144821-cf5d7c7ec3cf/go.mod h1:84kVJOfdiXAj9Zo8lvZ2uuJVzPn2vKlPdrSHU1zD2mE= github.com/apache/iotdb-client-go v1.3.3 h1:qj1sr0trU8RITVtbdDBV/ZXeBZ8UnDyO8IIWPnOgano= github.com/apache/iotdb-client-go v1.3.3/go.mod h1:3D6QYkqRmASS/4HsjU+U/3fscyc5M9xKRfywZsKuoZY= github.com/apache/thrift v0.15.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= @@ -1387,8 +1387,8 @@ github.com/google/cel-go v0.23.0 h1:knsnzeUOcREUFo0ZFJqZI8Rk6uEVyobAlir7GEbf5v0= github.com/google/cel-go v0.23.0/go.mod h1:52Pb6QsDbC5kvgxvZhiL9QX1oZEkcUF/ZqaPx1J5Wwo= github.com/google/flatbuffers v1.12.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= -github.com/google/flatbuffers v24.3.25+incompatible h1:CX395cjN9Kke9mmalRoL3d81AtFUxJM+yDthflgJGkI= -github.com/google/flatbuffers v24.3.25+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v24.12.23+incompatible h1:ubBKR94NR4pXUCY/MUsRVzd9umNW7ht7EG9hHfS9FX8= +github.com/google/flatbuffers v24.12.23+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/gnxi v0.0.0-20231026134436-d82d9936af15 h1:EETGSLGKBReUUYZdztSp45EzTE6CHw2qMKIfyPrgp6c= diff --git a/plugins/inputs/sql/drivers.go b/plugins/inputs/sql/drivers.go index 1dfbdd3d6..8ce42b85a 100644 --- a/plugins/inputs/sql/drivers.go +++ b/plugins/inputs/sql/drivers.go @@ -5,7 +5,7 @@ import ( _ "github.com/ClickHouse/clickhouse-go/v2" _ "github.com/IBM/nzgo/v12" _ "github.com/SAP/go-hdb/driver" - _ "github.com/apache/arrow/go/v18/arrow/flight/flightsql/driver" + _ "github.com/apache/arrow-go/v18/arrow/flight/flightsql/driver" _ "github.com/go-sql-driver/mysql" _ "github.com/jackc/pgx/v4/stdlib" _ "github.com/microsoft/go-mssqldb" diff --git a/plugins/outputs/parquet/README.md b/plugins/outputs/parquet/README.md index 8015900f1..97dc9ec1c 100644 --- a/plugins/outputs/parquet/README.md +++ b/plugins/outputs/parquet/README.md @@ -100,7 +100,7 @@ consider the options below: The Arrow repo contains a Go CLI tool to read and parse Parquet files: ```s -go install github.com/apache/arrow/go/v18/parquet/cmd/parquet_reader@latest +go install github.com/apache/arrow-go/v18/parquet/cmd/parquet_reader@latest parquet_reader ``` diff --git a/plugins/outputs/parquet/parquet.go b/plugins/outputs/parquet/parquet.go index 99872a1e9..9c9c7c9bb 100644 --- a/plugins/outputs/parquet/parquet.go +++ b/plugins/outputs/parquet/parquet.go @@ -9,11 +9,11 @@ import ( "strconv" "time" - "github.com/apache/arrow/go/v18/arrow" - "github.com/apache/arrow/go/v18/arrow/array" - "github.com/apache/arrow/go/v18/arrow/memory" - "github.com/apache/arrow/go/v18/parquet" - "github.com/apache/arrow/go/v18/parquet/pqarrow" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" + "github.com/apache/arrow-go/v18/parquet" + "github.com/apache/arrow-go/v18/parquet/pqarrow" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/plugins/outputs" diff --git a/plugins/outputs/parquet/parquet_test.go b/plugins/outputs/parquet/parquet_test.go index e4ab820d3..43119172c 100644 --- a/plugins/outputs/parquet/parquet_test.go +++ b/plugins/outputs/parquet/parquet_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v18/parquet/file" + "github.com/apache/arrow-go/v18/parquet/file" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/testutil" diff --git a/plugins/parsers/parquet/columns.go b/plugins/parsers/parquet/columns.go index cb03f0e68..dcfdfc69f 100644 --- a/plugins/parsers/parquet/columns.go +++ b/plugins/parsers/parquet/columns.go @@ -3,8 +3,8 @@ package parquet import ( "reflect" - "github.com/apache/arrow/go/v18/parquet" - "github.com/apache/arrow/go/v18/parquet/file" + "github.com/apache/arrow-go/v18/parquet" + "github.com/apache/arrow-go/v18/parquet/file" ) func newColumnParser(reader file.ColumnChunkReader) *columnParser { diff --git a/plugins/parsers/parquet/parser.go b/plugins/parsers/parquet/parser.go index 894c656b1..f36b31fd6 100644 --- a/plugins/parsers/parquet/parser.go +++ b/plugins/parsers/parquet/parser.go @@ -7,7 +7,7 @@ import ( "slices" "time" - "github.com/apache/arrow/go/v18/parquet/file" + "github.com/apache/arrow-go/v18/parquet/file" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal"