Skip to content

Commit a55da3d

Browse files
candiduslynxcandiduslynx
authored
feat(deps): Upgrade to Apache Arrow v13 (latest cqmain) (#10605)
Requires: * cloudquery/filetypes#153 * cloudquery/plugin-sdk#852
1 parent 32cc904 commit a55da3d

File tree

303 files changed

+1702
-1921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+1702
-1921
lines changed

‎cli/go.mod‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ require (
1818
google.golang.org/protobuf v1.30.0
1919
)
2020

21-
// TODO: remove once the changes are merged to upstream
22-
replace github.com/apache/arrow/go/v12 => github.com/cloudquery/arrow/go/v12 v12.0.0-20230411134648-a5b71cd453c8
23-
2421
require (
2522
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
2623
github.com/davecgh/go-spew v1.1.1 // indirect

‎plugins/destination/azblob/client/client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"github.com/cloudquery/filetypes/v2"
1010

1111
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
12+
"github.com/cloudquery/plugin-pb-go/specs"
1213
"github.com/cloudquery/plugin-sdk/v2/plugins/destination"
13-
"github.com/cloudquery/plugin-sdk/v2/specs"
1414
"github.com/rs/zerolog"
1515
)
1616

‎plugins/destination/azblob/client/client_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"testing"
55

66
"github.com/cloudquery/filetypes/v2"
7+
"github.com/cloudquery/plugin-pb-go/specs"
78
"github.com/cloudquery/plugin-sdk/v2/plugins/destination"
8-
"github.com/cloudquery/plugin-sdk/v2/specs"
99
)
1010

1111
const storage_account = "cqdestinationazblob"

‎plugins/destination/azblob/client/read.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"io"
88

9-
"github.com/apache/arrow/go/v12/arrow"
9+
"github.com/apache/arrow/go/v13/arrow"
1010
"github.com/cloudquery/plugin-sdk/v2/schema"
1111
)
1212

‎plugins/destination/azblob/client/write.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"io"
88

9-
"github.com/apache/arrow/go/v12/arrow"
9+
"github.com/apache/arrow/go/v13/arrow"
1010
"github.com/cloudquery/plugin-sdk/v2/schema"
1111
"github.com/google/uuid"
1212
)

‎plugins/destination/azblob/go.mod‎

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,69 +5,65 @@ go 1.19
55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.2
77
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0
8-
github.com/apache/arrow/go/v12 v12.0.0-20230430004532-0ea1a103dfc2
9-
github.com/cloudquery/filetypes/v2 v2.0.4
10-
github.com/cloudquery/plugin-sdk/v2 v2.5.1
8+
github.com/apache/arrow/go/v13 v13.0.0-20230509093403-7f3e87d2d5e6
9+
github.com/cloudquery/filetypes/v2 v2.1.0
10+
github.com/cloudquery/plugin-pb-go v1.0.5
11+
github.com/cloudquery/plugin-sdk/v2 v2.7.0
1112
github.com/google/uuid v1.3.0
12-
github.com/rs/zerolog v1.29.0
13+
github.com/rs/zerolog v1.29.1
1314
)
1415

15-
replace github.com/apache/arrow/go/v12 => github.com/cloudquery/arrow/go/v12 v12.0.0-20230419074556-00ceafa3b033
16+
// TODO: remove once all updates are merged
17+
replace github.com/apache/arrow/go/v13 => github.com/cloudquery/arrow/go/v13 v13.0.0-20230509053643-898a79b1d3c8
1618

1719
require (
20+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.4.0 // indirect
21+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.2.0 // indirect
22+
github.com/AzureAD/microsoft-authentication-library-for-go v0.9.0 // indirect
1823
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
1924
github.com/andybalholm/brotli v1.0.5 // indirect
25+
github.com/apache/thrift v0.18.1 // indirect
2026
github.com/davecgh/go-spew v1.1.1 // indirect
2127
github.com/dnaeon/go-vcr v1.2.0 // indirect
22-
github.com/goccy/go-json v0.10.2 // indirect
23-
github.com/google/flatbuffers v23.3.3+incompatible // indirect
24-
github.com/klauspost/asmfmt v1.3.2 // indirect
25-
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
26-
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
27-
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
28-
github.com/pmezard/go-difflib v1.0.0 // indirect
29-
github.com/stretchr/testify v1.8.2 // indirect
30-
github.com/zeebo/xxh3 v1.0.2 // indirect
31-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
32-
golang.org/x/mod v0.9.0 // indirect
33-
golang.org/x/tools v0.7.0 // indirect
34-
gopkg.in/yaml.v3 v3.0.1 // indirect
35-
)
36-
37-
require (
38-
github.com/apache/thrift v0.18.1 // indirect
39-
github.com/golang/snappy v0.0.4 // indirect
40-
github.com/klauspost/compress v1.16.3 // indirect
41-
github.com/pierrec/lz4/v4 v4.1.17 // indirect
42-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect; indirect // indirect
43-
)
44-
45-
require (
46-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.4.0 // indirect; indirect // indirect // indirect
47-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.2.0 // indirect; indirect // indirect
48-
github.com/AzureAD/microsoft-authentication-library-for-go v0.9.0 // indirect
4928
github.com/getsentry/sentry-go v0.20.0 // indirect
5029
github.com/ghodss/yaml v1.0.0 // indirect
51-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect; indirect // indirect
30+
github.com/goccy/go-json v0.10.2 // indirect
31+
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
5232
github.com/golang/protobuf v1.5.3 // indirect
33+
github.com/golang/snappy v0.0.4 // indirect
34+
github.com/google/flatbuffers v23.3.3+incompatible // indirect
5335
github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.3 // indirect
5436
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 // indirect
5537
github.com/inconshreveable/mousetrap v1.1.0 // indirect
38+
github.com/klauspost/asmfmt v1.3.2 // indirect
39+
github.com/klauspost/compress v1.16.5 // indirect
40+
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
5641
github.com/kylelemons/godebug v1.1.0 // indirect
5742
github.com/mattn/go-colorable v0.1.13 // indirect
5843
github.com/mattn/go-isatty v0.0.18 // indirect
59-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect; indirect // indirect
44+
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
45+
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
46+
github.com/pierrec/lz4/v4 v4.1.17 // indirect
47+
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
48+
github.com/pmezard/go-difflib v1.0.0 // indirect
6049
github.com/spf13/cast v1.5.0 // indirect
6150
github.com/spf13/cobra v1.6.1 // indirect
6251
github.com/spf13/pflag v1.0.5 // indirect
63-
github.com/thoas/go-funk v0.9.3 // indirect; indirect // indirect
52+
github.com/stretchr/testify v1.8.2 // indirect
53+
github.com/thoas/go-funk v0.9.3 // indirect
54+
github.com/zeebo/xxh3 v1.0.2 // indirect
6455
golang.org/x/crypto v0.7.0 // indirect
65-
golang.org/x/net v0.9.0 // indirect; indirect // indirect
66-
golang.org/x/sync v0.1.0 // indirect
67-
golang.org/x/sys v0.7.0 // indirect
56+
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 // indirect
57+
golang.org/x/mod v0.10.0 // indirect
58+
golang.org/x/net v0.10.0 // indirect
59+
golang.org/x/sync v0.2.0 // indirect
60+
golang.org/x/sys v0.8.0 // indirect
6861
golang.org/x/text v0.9.0 // indirect
69-
google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633 // indirect; indirect // indirect
70-
google.golang.org/grpc v1.54.0 // indirect
62+
golang.org/x/tools v0.9.0 // indirect
63+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
64+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
65+
google.golang.org/grpc v1.55.0 // indirect
7166
google.golang.org/protobuf v1.30.0 // indirect
7267
gopkg.in/yaml.v2 v2.4.0 // indirect
68+
gopkg.in/yaml.v3 v3.0.1 // indirect
7369
)

0 commit comments

Comments
 (0)