From 4cb4ed2367f8af2bf7c6989648eb3afff1b2a88c Mon Sep 17 00:00:00 2001 From: erezrokah Date: Mon, 9 Dec 2024 10:16:39 +0000 Subject: [PATCH 1/3] feat: Update to Arrow v18 --- docs/generator_test.go | 2 +- examples/simple_plugin/go.mod | 6 +-- examples/simple_plugin/go.sum | 32 +++++++++++----- examples/simple_plugin/plugin/client.go | 2 +- examples/simple_plugin/services/test.go | 2 +- go.mod | 8 ++-- go.sum | 37 ++++++++++++++----- internal/batch/slice.go | 4 +- internal/batch/slice_test.go | 2 +- internal/clients/state/v3/state.go | 8 ++-- internal/memdb/memdb.go | 4 +- internal/pk/pk.go | 2 +- .../reversertransformer.go | 6 +-- .../reversertransformer_test.go | 6 +-- .../servers/destination/v0/destinations.go | 4 +- .../servers/destination/v0/schemav2tov3.go | 6 +-- internal/servers/destination/v1/convert.go | 4 +- .../destination/v1/destination_test.go | 6 +-- .../servers/destination/v1/destinations.go | 6 +-- internal/servers/plugin/v3/plugin.go | 2 +- internal/servers/plugin/v3/plugin_test.go | 6 +-- message/sync_message.go | 2 +- message/write_message.go | 2 +- plugin/diff.go | 6 +-- plugin/nulls.go | 6 +-- plugin/nulls_test.go | 4 +- plugin/plugin.go | 2 +- plugin/plugin_destination.go | 2 +- plugin/plugin_read.go | 2 +- plugin/plugin_test.go | 2 +- plugin/plugin_transformer.go | 2 +- plugin/sort.go | 4 +- plugin/testing_write.go | 2 +- plugin/testing_write_delete.go | 6 +-- plugin/testing_write_insert.go | 6 +-- plugin/testing_write_migrate.go | 2 +- plugin/testing_write_upsert.go | 6 +-- scalar/binary.go | 2 +- scalar/bool.go | 2 +- scalar/date32.go | 2 +- scalar/date32_test.go | 2 +- scalar/date64.go | 2 +- scalar/decimal.go | 6 +-- scalar/decimal_test.go | 6 +-- scalar/duration.go | 2 +- scalar/duration_test.go | 2 +- scalar/errors.go | 2 +- scalar/float.go | 2 +- scalar/inet.go | 2 +- scalar/int.go | 2 +- scalar/interval.go | 2 +- scalar/json.go | 2 +- scalar/list.go | 2 +- scalar/list_test.go | 2 +- scalar/mac.go | 2 +- scalar/scalar.go | 8 ++-- scalar/scalar_test.go | 6 +-- scalar/string.go | 4 +- scalar/struct.go | 2 +- scalar/struct_test.go | 6 +-- scalar/time.go | 2 +- scalar/timestamp.go | 2 +- scalar/timestamp_test.go | 6 +-- scalar/uint.go | 2 +- scalar/uuid.go | 2 +- scheduler/batch.go | 4 +- scheduler/scheduler_test.go | 4 +- schema/arrow.go | 2 +- schema/arrow_test.go | 4 +- schema/column.go | 2 +- schema/errors.go | 2 +- schema/meta.go | 2 +- schema/table.go | 2 +- schema/table_test.go | 2 +- schema/testdata.go | 6 +-- schema/validators.go | 2 +- schema/validators_test.go | 6 +-- serve/destination_v0_test.go | 4 +- serve/destination_v1_test.go | 8 ++-- serve/plugin_test.go | 8 ++-- transformers/struct.go | 2 +- transformers/struct_test.go | 2 +- transformers/type.go | 2 +- types/extensions.go | 2 +- types/extensions_test.go | 6 +-- types/inet.go | 4 +- types/inet_test.go | 4 +- types/json.go | 4 +- types/json_test.go | 4 +- types/mac.go | 4 +- types/mac_test.go | 4 +- types/register.go | 2 +- types/uuid.go | 4 +- types/uuid_test.go | 4 +- writers/batchwriter/batchwriter_test.go | 6 +-- .../mixedbatchwriter/mixedbatchwriter_test.go | 6 +-- .../streamingbatchwriter_test.go | 6 +-- writers/writers_test.go | 6 +-- 98 files changed, 227 insertions(+), 198 deletions(-) diff --git a/docs/generator_test.go b/docs/generator_test.go index 8bb69a00c3..5285f313ed 100644 --- a/docs/generator_test.go +++ b/docs/generator_test.go @@ -7,7 +7,7 @@ import ( "path" "testing" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/bradleyjkemp/cupaloy/v2" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/cloudquery/plugin-sdk/v4/types" diff --git a/examples/simple_plugin/go.mod b/examples/simple_plugin/go.mod index dba25edd1a..6914fc137b 100644 --- a/examples/simple_plugin/go.mod +++ b/examples/simple_plugin/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/plugin-sdk/examples/simple_plugin go 1.22.7 require ( - github.com/apache/arrow/go/v17 v17.0.0 + github.com/apache/arrow-go/v18 v18.0.0 github.com/cloudquery/plugin-sdk/v4 v4.71.1 github.com/rs/zerolog v1.33.0 ) @@ -31,7 +31,7 @@ require ( github.com/buger/jsonparser v1.1.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cloudquery/cloudquery-api-go v1.13.4 // indirect - github.com/cloudquery/plugin-pb-go v1.25.6 // indirect + github.com/cloudquery/plugin-pb-go v1.25.7-0.20241206174104-883b0c2d1a75 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/ghodss/yaml v1.0.0 // indirect @@ -46,7 +46,7 @@ require ( github.com/hashicorp/go-retryablehttp v0.7.7 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/invopop/jsonschema v0.12.0 // indirect - github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect diff --git a/examples/simple_plugin/go.sum b/examples/simple_plugin/go.sum index 4f566c4afb..be4028cadf 100644 --- a/examples/simple_plugin/go.sum +++ b/examples/simple_plugin/go.sum @@ -1,10 +1,14 @@ github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= +github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= +github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= +github.com/apache/arrow-go/v18 v18.0.0 h1:1dBDaSbH3LtulTyOVYaBCHO3yVRwjV+TZaqn3g6V7ZM= +github.com/apache/arrow-go/v18 v18.0.0/go.mod h1:t6+cWRSmKgdQ6HsxisQjok+jBpKGhRDiqcf3p0p/F+A= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -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.21.0 h1:tdPmh/ptjE1IJnhbhrcl2++TauVjy242rkV/UzJChnE= +github.com/apache/thrift v0.21.0/go.mod h1:W1H8aR/QRtYNvrPeFXBtobyRkd0/YVhTc6i07XIAgDw= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= github.com/aws/aws-sdk-go-v2 v1.32.5 h1:U8vdWJuY7ruAkzaOdD7guwJjD06YSKmnKCJs7s3IkIo= @@ -48,8 +52,8 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cloudquery/cloudquery-api-go v1.13.4 h1:8xj16iU1LcN0uLUHeHhDjc5nJDtzdxan07HiVAgJz1Q= github.com/cloudquery/cloudquery-api-go v1.13.4/go.mod h1:nbc7ROHjJAnLGP306pCrpNwBCNLjUyNd5u6Y/+QsmKw= -github.com/cloudquery/plugin-pb-go v1.25.6 h1:qujsj2APXtWTOLjImzIpSEJ3KpJc/N+W85ui9xGSEpo= -github.com/cloudquery/plugin-pb-go v1.25.6/go.mod h1:El9MseE0kD+MbuoY/Elf65vuEDO79cLbCkOfcUzyHDM= +github.com/cloudquery/plugin-pb-go v1.25.7-0.20241206174104-883b0c2d1a75 h1:M0LGZa4gOkVZjYbGG7St4i1tekuwmsIBUpScU6C0shA= +github.com/cloudquery/plugin-pb-go v1.25.7-0.20241206174104-883b0c2d1a75/go.mod h1:PxKigoP/uZ3awwWM3TjRLQBSdR1MVXv60HjR9v1xwYQ= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -75,6 +79,8 @@ github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= 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/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -91,16 +97,16 @@ github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB1 github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= -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/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI= github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4= +github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -115,6 +121,10 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/ github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs= +github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= +github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI= +github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro= github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= @@ -137,6 +147,8 @@ github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3k github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= +github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= +github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -196,8 +208,8 @@ golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o= golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= -gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= +gonum.org/v1/gonum v0.15.1 h1:FNy7N6OUZVUaWG9pTiD+jlhdQ3lMP+/LcTpJ6+a8sQ0= +gonum.org/v1/gonum v0.15.1/go.mod h1:eZTZuRFrzu5pcyjN5wJhcIhnUdNijYxX1T2IcrOGY0o= google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g= google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= diff --git a/examples/simple_plugin/plugin/client.go b/examples/simple_plugin/plugin/client.go index 72bb5131dc..6e69725761 100644 --- a/examples/simple_plugin/plugin/client.go +++ b/examples/simple_plugin/plugin/client.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/examples/simple_plugin/client" "github.com/cloudquery/plugin-sdk/examples/simple_plugin/services" "github.com/cloudquery/plugin-sdk/v4/message" diff --git a/examples/simple_plugin/services/test.go b/examples/simple_plugin/services/test.go index 119c368949..cf96b2171b 100644 --- a/examples/simple_plugin/services/test.go +++ b/examples/simple_plugin/services/test.go @@ -3,7 +3,7 @@ package services import ( "context" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/examples/simple_plugin/client" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/go.mod b/go.mod index 2eeea633ba..d95456d4ca 100644 --- a/go.mod +++ b/go.mod @@ -5,14 +5,14 @@ go 1.22.7 toolchain go1.23.3 require ( - github.com/apache/arrow/go/v17 v17.0.0 + github.com/apache/arrow-go/v18 v18.0.0 github.com/aws/aws-sdk-go-v2 v1.32.5 github.com/aws/aws-sdk-go-v2/config v1.28.5 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.29.6 github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.25.6 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 github.com/cloudquery/cloudquery-api-go v1.13.4 - github.com/cloudquery/plugin-pb-go v1.25.6 + github.com/cloudquery/plugin-pb-go v1.25.7-0.20241206174104-883b0c2d1a75 github.com/cloudquery/plugin-sdk/v2 v2.7.0 github.com/goccy/go-json v0.10.3 github.com/golang/mock v1.6.0 @@ -71,9 +71,8 @@ require ( github.com/google/flatbuffers v24.3.25+incompatible // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/huandu/xstrings v1.4.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect @@ -82,6 +81,7 @@ require ( github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/stoewer/go-strcase v1.3.0 // indirect github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect diff --git a/go.sum b/go.sum index a8d71fcdfc..74d70607df 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,14 @@ github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= +github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= +github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= +github.com/apache/arrow-go/v18 v18.0.0 h1:1dBDaSbH3LtulTyOVYaBCHO3yVRwjV+TZaqn3g6V7ZM= +github.com/apache/arrow-go/v18 v18.0.0/go.mod h1:t6+cWRSmKgdQ6HsxisQjok+jBpKGhRDiqcf3p0p/F+A= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -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.21.0 h1:tdPmh/ptjE1IJnhbhrcl2++TauVjy242rkV/UzJChnE= +github.com/apache/thrift v0.21.0/go.mod h1:W1H8aR/QRtYNvrPeFXBtobyRkd0/YVhTc6i07XIAgDw= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= github.com/aws/aws-sdk-go-v2 v1.32.5 h1:U8vdWJuY7ruAkzaOdD7guwJjD06YSKmnKCJs7s3IkIo= @@ -48,8 +52,8 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cloudquery/cloudquery-api-go v1.13.4 h1:8xj16iU1LcN0uLUHeHhDjc5nJDtzdxan07HiVAgJz1Q= github.com/cloudquery/cloudquery-api-go v1.13.4/go.mod h1:nbc7ROHjJAnLGP306pCrpNwBCNLjUyNd5u6Y/+QsmKw= -github.com/cloudquery/plugin-pb-go v1.25.6 h1:qujsj2APXtWTOLjImzIpSEJ3KpJc/N+W85ui9xGSEpo= -github.com/cloudquery/plugin-pb-go v1.25.6/go.mod h1:El9MseE0kD+MbuoY/Elf65vuEDO79cLbCkOfcUzyHDM= +github.com/cloudquery/plugin-pb-go v1.25.7-0.20241206174104-883b0c2d1a75 h1:M0LGZa4gOkVZjYbGG7St4i1tekuwmsIBUpScU6C0shA= +github.com/cloudquery/plugin-pb-go v1.25.7-0.20241206174104-883b0c2d1a75/go.mod h1:PxKigoP/uZ3awwWM3TjRLQBSdR1MVXv60HjR9v1xwYQ= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -75,6 +79,8 @@ github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= 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/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -91,16 +97,16 @@ github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB1 github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= -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/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI= github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4= +github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -115,6 +121,10 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/ github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs= +github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= +github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI= +github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro= github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= @@ -137,12 +147,19 @@ github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3k github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= +github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= +github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/thoas/go-funk v0.9.3 h1:7+nAEx3kn5ZJcnDm2Bh23N2yOtweO14bi//dvRtgLpw= @@ -223,8 +240,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= -gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= +gonum.org/v1/gonum v0.15.1 h1:FNy7N6OUZVUaWG9pTiD+jlhdQ3lMP+/LcTpJ6+a8sQ0= +gonum.org/v1/gonum v0.15.1/go.mod h1:eZTZuRFrzu5pcyjN5wJhcIhnUdNijYxX1T2IcrOGY0o= google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g= google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= diff --git a/internal/batch/slice.go b/internal/batch/slice.go index 28cc45af9d..4a023fe593 100644 --- a/internal/batch/slice.go +++ b/internal/batch/slice.go @@ -1,8 +1,8 @@ package batch import ( - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/util" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/util" ) type ( diff --git a/internal/batch/slice_test.go b/internal/batch/slice_test.go index b434018e2d..966e64bfee 100644 --- a/internal/batch/slice_test.go +++ b/internal/batch/slice_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v17/arrow/util" + "github.com/apache/arrow-go/v18/arrow/util" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/stretchr/testify/assert" ) diff --git a/internal/clients/state/v3/state.go b/internal/clients/state/v3/state.go index 211c6c1220..42ab5e52b1 100644 --- a/internal/clients/state/v3/state.go +++ b/internal/clients/state/v3/state.go @@ -6,10 +6,10 @@ import ( "io" "sync" - "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" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/ipc" + "github.com/apache/arrow-go/v18/arrow/memory" pb "github.com/cloudquery/plugin-pb-go/pb/plugin/v3" "github.com/cloudquery/plugin-sdk/v4/schema" "google.golang.org/grpc" diff --git a/internal/memdb/memdb.go b/internal/memdb/memdb.go index 5874e1c9b2..60af1ee694 100644 --- a/internal/memdb/memdb.go +++ b/internal/memdb/memdb.go @@ -5,8 +5,8 @@ import ( "fmt" "sync" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/cloudquery/plugin-sdk/v4/schema" diff --git a/internal/pk/pk.go b/internal/pk/pk.go index 0132942dc0..727e630b7a 100644 --- a/internal/pk/pk.go +++ b/internal/pk/pk.go @@ -3,7 +3,7 @@ package pk import ( "strings" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/internal/reversertransformer/reversertransformer.go b/internal/reversertransformer/reversertransformer.go index 0932900796..e7183e896a 100644 --- a/internal/reversertransformer/reversertransformer.go +++ b/internal/reversertransformer/reversertransformer.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/rs/zerolog" ) diff --git a/internal/reversertransformer/reversertransformer_test.go b/internal/reversertransformer/reversertransformer_test.go index 9750ed729c..5cff4bb432 100644 --- a/internal/reversertransformer/reversertransformer_test.go +++ b/internal/reversertransformer/reversertransformer_test.go @@ -5,9 +5,9 @@ import ( "io" "testing" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" pb "github.com/cloudquery/plugin-pb-go/pb/plugin/v3" internalPlugin "github.com/cloudquery/plugin-sdk/v4/internal/servers/plugin/v3" "github.com/cloudquery/plugin-sdk/v4/plugin" diff --git a/internal/servers/destination/v0/destinations.go b/internal/servers/destination/v0/destinations.go index bfe1e658d4..aae00e42b6 100644 --- a/internal/servers/destination/v0/destinations.go +++ b/internal/servers/destination/v0/destinations.go @@ -6,8 +6,8 @@ import ( "io" "sync" - "github.com/apache/arrow/go/v17/arrow/array" - "github.com/apache/arrow/go/v17/arrow/memory" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" pbBase "github.com/cloudquery/plugin-pb-go/pb/base/v0" pb "github.com/cloudquery/plugin-pb-go/pb/destination/v0" "github.com/cloudquery/plugin-pb-go/specs" diff --git a/internal/servers/destination/v0/schemav2tov3.go b/internal/servers/destination/v0/schemav2tov3.go index 1b22652f7a..c4770eb95c 100644 --- a/internal/servers/destination/v0/schemav2tov3.go +++ b/internal/servers/destination/v0/schemav2tov3.go @@ -4,9 +4,9 @@ import ( "encoding/json" "strings" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" schemav2 "github.com/cloudquery/plugin-sdk/v2/schema" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/cloudquery/plugin-sdk/v4/types" diff --git a/internal/servers/destination/v1/convert.go b/internal/servers/destination/v1/convert.go index b6273ed333..d35dfd6785 100644 --- a/internal/servers/destination/v1/convert.go +++ b/internal/servers/destination/v1/convert.go @@ -3,8 +3,8 @@ package destination import ( "bytes" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/ipc" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/ipc" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/internal/servers/destination/v1/destination_test.go b/internal/servers/destination/v1/destination_test.go index aaa39bc4dc..a1575b9e21 100644 --- a/internal/servers/destination/v1/destination_test.go +++ b/internal/servers/destination/v1/destination_test.go @@ -6,9 +6,9 @@ import ( "io" "testing" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" pb "github.com/cloudquery/plugin-pb-go/pb/destination/v1" pbSource "github.com/cloudquery/plugin-pb-go/pb/source/v2" "github.com/cloudquery/plugin-pb-go/specs" diff --git a/internal/servers/destination/v1/destinations.go b/internal/servers/destination/v1/destinations.go index efb1e4f4ba..2f6928c55c 100644 --- a/internal/servers/destination/v1/destinations.go +++ b/internal/servers/destination/v1/destinations.go @@ -7,9 +7,9 @@ import ( "io" "sync" - "github.com/apache/arrow/go/v17/arrow/array" - "github.com/apache/arrow/go/v17/arrow/ipc" - "github.com/apache/arrow/go/v17/arrow/memory" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/ipc" + "github.com/apache/arrow-go/v18/arrow/memory" pb "github.com/cloudquery/plugin-pb-go/pb/destination/v1" "github.com/cloudquery/plugin-pb-go/specs" "github.com/cloudquery/plugin-sdk/v4/message" diff --git a/internal/servers/plugin/v3/plugin.go b/internal/servers/plugin/v3/plugin.go index 6d941eb9cb..ad136750f7 100644 --- a/internal/servers/plugin/v3/plugin.go +++ b/internal/servers/plugin/v3/plugin.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" pb "github.com/cloudquery/plugin-pb-go/pb/plugin/v3" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/plugin" diff --git a/internal/servers/plugin/v3/plugin_test.go b/internal/servers/plugin/v3/plugin_test.go index ac32af2091..b6cf41302a 100644 --- a/internal/servers/plugin/v3/plugin_test.go +++ b/internal/servers/plugin/v3/plugin_test.go @@ -5,9 +5,9 @@ import ( "io" "testing" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" pb "github.com/cloudquery/plugin-pb-go/pb/plugin/v3" "github.com/cloudquery/plugin-sdk/v4/internal/memdb" "github.com/cloudquery/plugin-sdk/v4/plugin" diff --git a/message/sync_message.go b/message/sync_message.go index bc953e6e3b..1be85f2999 100644 --- a/message/sync_message.go +++ b/message/sync_message.go @@ -3,7 +3,7 @@ package message import ( "slices" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/message/write_message.go b/message/write_message.go index a20ee6ed97..f586e0b1cc 100644 --- a/message/write_message.go +++ b/message/write_message.go @@ -4,7 +4,7 @@ import ( "slices" "time" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/plugin/diff.go b/plugin/diff.go index dbdcfd43c1..deff697945 100644 --- a/plugin/diff.go +++ b/plugin/diff.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" ) func RecordsDiff(sc *arrow.Schema, have, want []arrow.Record) string { diff --git a/plugin/nulls.go b/plugin/nulls.go index 21dfa82726..4e99484f63 100644 --- a/plugin/nulls.go +++ b/plugin/nulls.go @@ -1,9 +1,9 @@ package plugin import ( - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" ) func stripNullsFromLists(list array.ListLike) array.ListLike { diff --git a/plugin/nulls_test.go b/plugin/nulls_test.go index 5c0d0b9a1f..1cb475a7c5 100644 --- a/plugin/nulls_test.go +++ b/plugin/nulls_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/plugin/plugin.go b/plugin/plugin.go index f15b42ff1c..9815be2557 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" cqapi "github.com/cloudquery/cloudquery-api-go" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/schema" diff --git a/plugin/plugin_destination.go b/plugin/plugin_destination.go index 3bf6dc925f..a6db85efe7 100644 --- a/plugin/plugin_destination.go +++ b/plugin/plugin_destination.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/plugin/plugin_read.go b/plugin/plugin_read.go index f709fd9b21..4bbb27b2c4 100644 --- a/plugin/plugin_read.go +++ b/plugin/plugin_read.go @@ -3,7 +3,7 @@ package plugin import ( "context" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/plugin/plugin_test.go b/plugin/plugin_test.go index 22d20d5a25..7968b9a825 100644 --- a/plugin/plugin_test.go +++ b/plugin/plugin_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/rs/zerolog" diff --git a/plugin/plugin_transformer.go b/plugin/plugin_transformer.go index ff87055a44..fbe8f19aed 100644 --- a/plugin/plugin_transformer.go +++ b/plugin/plugin_transformer.go @@ -3,7 +3,7 @@ package plugin import ( "context" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type TransformerClient interface { diff --git a/plugin/sort.go b/plugin/sort.go index 1974c1032e..0d886e6f43 100644 --- a/plugin/sort.go +++ b/plugin/sort.go @@ -3,8 +3,8 @@ package plugin import ( "sort" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/plugin/testing_write.go b/plugin/testing_write.go index a46b95d662..dca0e9cca0 100644 --- a/plugin/testing_write.go +++ b/plugin/testing_write.go @@ -5,7 +5,7 @@ import ( "math/rand" "testing" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/plugin/testing_write_delete.go b/plugin/testing_write_delete.go index 2e8b704fa8..aa94fe9574 100644 --- a/plugin/testing_write_delete.go +++ b/plugin/testing_write_delete.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/stretchr/testify/require" diff --git a/plugin/testing_write_insert.go b/plugin/testing_write_insert.go index 91ebacc3a9..40d72c3d82 100644 --- a/plugin/testing_write_insert.go +++ b/plugin/testing_write_insert.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/plugin/testing_write_migrate.go b/plugin/testing_write_migrate.go index de1d1283f0..9d4e22d2cb 100644 --- a/plugin/testing_write_migrate.go +++ b/plugin/testing_write_migrate.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/cloudquery/plugin-sdk/v4/types" diff --git a/plugin/testing_write_upsert.go b/plugin/testing_write_upsert.go index 5ecce28541..9b13d22f5b 100644 --- a/plugin/testing_write_upsert.go +++ b/plugin/testing_write_upsert.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/scalar/binary.go b/scalar/binary.go index 206fe3013b..bab8e890b4 100644 --- a/scalar/binary.go +++ b/scalar/binary.go @@ -3,7 +3,7 @@ package scalar import ( "bytes" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type Binary struct { diff --git a/scalar/bool.go b/scalar/bool.go index 12c50ca8e6..dd9d77e071 100644 --- a/scalar/bool.go +++ b/scalar/bool.go @@ -3,7 +3,7 @@ package scalar import ( "strconv" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type Bool struct { diff --git a/scalar/date32.go b/scalar/date32.go index 1a37450910..6c8a0be236 100644 --- a/scalar/date32.go +++ b/scalar/date32.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type Date32 struct { diff --git a/scalar/date32_test.go b/scalar/date32_test.go index feb5671a7d..01d9f1696d 100644 --- a/scalar/date32_test.go +++ b/scalar/date32_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) func TestDate32Set(t *testing.T) { diff --git a/scalar/date64.go b/scalar/date64.go index cf6920c5e3..d485259458 100644 --- a/scalar/date64.go +++ b/scalar/date64.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type Date64 struct { diff --git a/scalar/decimal.go b/scalar/decimal.go index 4958565f1f..e2bcaadc48 100644 --- a/scalar/decimal.go +++ b/scalar/decimal.go @@ -1,9 +1,9 @@ package scalar import ( - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/decimal128" - "github.com/apache/arrow/go/v17/arrow/decimal256" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/decimal128" + "github.com/apache/arrow-go/v18/arrow/decimal256" ) type Decimal256 struct { diff --git a/scalar/decimal_test.go b/scalar/decimal_test.go index 783086f189..d838ab0784 100644 --- a/scalar/decimal_test.go +++ b/scalar/decimal_test.go @@ -3,9 +3,9 @@ package scalar import ( "testing" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/decimal128" - "github.com/apache/arrow/go/v17/arrow/decimal256" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/decimal128" + "github.com/apache/arrow-go/v18/arrow/decimal256" "github.com/stretchr/testify/require" ) diff --git a/scalar/duration.go b/scalar/duration.go index 5d6b110b17..68b76dd17a 100644 --- a/scalar/duration.go +++ b/scalar/duration.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type Duration struct { diff --git a/scalar/duration_test.go b/scalar/duration_test.go index aabda20c0b..50b10adcf4 100644 --- a/scalar/duration_test.go +++ b/scalar/duration_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/stretchr/testify/assert" ) diff --git a/scalar/errors.go b/scalar/errors.go index 9cb4261145..a439920476 100644 --- a/scalar/errors.go +++ b/scalar/errors.go @@ -3,7 +3,7 @@ package scalar import ( "fmt" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) const ( diff --git a/scalar/float.go b/scalar/float.go index 78713ee0d8..fda2856a68 100644 --- a/scalar/float.go +++ b/scalar/float.go @@ -4,7 +4,7 @@ import ( "math" "strconv" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type Float struct { diff --git a/scalar/inet.go b/scalar/inet.go index b7f3a1f13a..6a9911561c 100644 --- a/scalar/inet.go +++ b/scalar/inet.go @@ -6,7 +6,7 @@ import ( "net" "strings" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/types" ) diff --git a/scalar/int.go b/scalar/int.go index 02734501f9..4d0f22bf45 100644 --- a/scalar/int.go +++ b/scalar/int.go @@ -4,7 +4,7 @@ import ( "math" "strconv" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type Int struct { diff --git a/scalar/interval.go b/scalar/interval.go index d939fe2ef7..21848b98de 100644 --- a/scalar/interval.go +++ b/scalar/interval.go @@ -3,7 +3,7 @@ package scalar import ( "encoding/json" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type MonthInterval struct { diff --git a/scalar/json.go b/scalar/json.go index d56558ff98..fd3d0254ad 100644 --- a/scalar/json.go +++ b/scalar/json.go @@ -5,7 +5,7 @@ import ( "encoding/json" "reflect" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/types" ) diff --git a/scalar/list.go b/scalar/list.go index 7d543ff5d6..52e30e15d1 100644 --- a/scalar/list.go +++ b/scalar/list.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type List struct { diff --git a/scalar/list_test.go b/scalar/list_test.go index 26c3a2f0f2..7bce4a0821 100644 --- a/scalar/list_test.go +++ b/scalar/list_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/types" ) diff --git a/scalar/mac.go b/scalar/mac.go index 9454d4e890..be67b801f8 100644 --- a/scalar/mac.go +++ b/scalar/mac.go @@ -3,7 +3,7 @@ package scalar import ( "net" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/types" ) diff --git a/scalar/scalar.go b/scalar/scalar.go index e64f067a91..3bb1af700b 100644 --- a/scalar/scalar.go +++ b/scalar/scalar.go @@ -4,10 +4,10 @@ import ( "fmt" "reflect" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/array" - "github.com/apache/arrow/go/v17/arrow/float16" - "github.com/apache/arrow/go/v17/arrow/memory" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/float16" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/types" "golang.org/x/exp/maps" ) diff --git a/scalar/scalar_test.go b/scalar/scalar_test.go index 016ce61b7c..6af03428a2 100644 --- a/scalar/scalar_test.go +++ b/scalar/scalar_test.go @@ -3,9 +3,9 @@ package scalar import ( "testing" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/stretchr/testify/assert" ) diff --git a/scalar/string.go b/scalar/string.go index d569d1cd0e..e16f920db7 100644 --- a/scalar/string.go +++ b/scalar/string.go @@ -3,8 +3,8 @@ package scalar import ( "fmt" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" ) const nullValueStr = array.NullValueStr diff --git a/scalar/struct.go b/scalar/struct.go index 59c2b3fba5..1f2cd8b8c6 100644 --- a/scalar/struct.go +++ b/scalar/struct.go @@ -5,7 +5,7 @@ import ( "encoding/json" "reflect" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type Struct struct { diff --git a/scalar/struct_test.go b/scalar/struct_test.go index 6eac5e6442..8783d839bb 100644 --- a/scalar/struct_test.go +++ b/scalar/struct_test.go @@ -5,9 +5,9 @@ import ( "strconv" "testing" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/scalar/time.go b/scalar/time.go index 2333130109..4207a9c939 100644 --- a/scalar/time.go +++ b/scalar/time.go @@ -1,7 +1,7 @@ package scalar import ( - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type Time struct { diff --git a/scalar/timestamp.go b/scalar/timestamp.go index 9356bd8823..8689308724 100644 --- a/scalar/timestamp.go +++ b/scalar/timestamp.go @@ -6,7 +6,7 @@ import ( "math" "time" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) const ( diff --git a/scalar/timestamp_test.go b/scalar/timestamp_test.go index 976ec6a794..dba12220c3 100644 --- a/scalar/timestamp_test.go +++ b/scalar/timestamp_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/scalar/uint.go b/scalar/uint.go index 8131f1a63e..e5c0455f4a 100644 --- a/scalar/uint.go +++ b/scalar/uint.go @@ -4,7 +4,7 @@ import ( "math" "strconv" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type Uint struct { diff --git a/scalar/uuid.go b/scalar/uuid.go index deb84d7cce..27b43e3cbf 100644 --- a/scalar/uuid.go +++ b/scalar/uuid.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "fmt" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/types" "github.com/google/uuid" ) diff --git a/scheduler/batch.go b/scheduler/batch.go index d740a70d6c..ff2b5c8d79 100644 --- a/scheduler/batch.go +++ b/scheduler/batch.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/apache/arrow/go/v17/arrow/array" - "github.com/apache/arrow/go/v17/arrow/memory" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/scalar" "github.com/cloudquery/plugin-sdk/v4/schema" diff --git a/scheduler/scheduler_test.go b/scheduler/scheduler_test.go index bfd166e9b1..04121eae5c 100644 --- a/scheduler/scheduler_test.go +++ b/scheduler/scheduler_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/scalar" "github.com/cloudquery/plugin-sdk/v4/schema" diff --git a/schema/arrow.go b/schema/arrow.go index 148570a8e8..a12a5b716c 100644 --- a/schema/arrow.go +++ b/schema/arrow.go @@ -1,7 +1,7 @@ package schema import ( - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) const ( diff --git a/schema/arrow_test.go b/schema/arrow_test.go index 71d2d6979c..726cc135e6 100644 --- a/schema/arrow_test.go +++ b/schema/arrow_test.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" ) func RecordDiff(l arrow.Record, r arrow.Record) string { diff --git a/schema/column.go b/schema/column.go index 86a9bd2e01..876c6866bf 100644 --- a/schema/column.go +++ b/schema/column.go @@ -5,7 +5,7 @@ import ( "encoding/json" "strings" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) type ColumnList []Column diff --git a/schema/errors.go b/schema/errors.go index 84f83607e5..183f00e46a 100644 --- a/schema/errors.go +++ b/schema/errors.go @@ -4,7 +4,7 @@ package schema import ( "fmt" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" ) const ( diff --git a/schema/meta.go b/schema/meta.go index 9447d05603..7fc44f7828 100644 --- a/schema/meta.go +++ b/schema/meta.go @@ -3,7 +3,7 @@ package schema import ( "context" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/scalar" "github.com/cloudquery/plugin-sdk/v4/types" ) diff --git a/schema/table.go b/schema/table.go index 64eff31b79..27dc97a330 100644 --- a/schema/table.go +++ b/schema/table.go @@ -7,7 +7,7 @@ import ( "regexp" "slices" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/glob" "github.com/thoas/go-funk" ) diff --git a/schema/table_test.go b/schema/table_test.go index 19f2b2489f..f8f67b74fb 100644 --- a/schema/table_test.go +++ b/schema/table_test.go @@ -3,7 +3,7 @@ package schema import ( "testing" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/types" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" diff --git a/schema/testdata.go b/schema/testdata.go index b1c343ec35..95be520df3 100644 --- a/schema/testdata.go +++ b/schema/testdata.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/types" "github.com/google/uuid" "golang.org/x/exp/rand" diff --git a/schema/validators.go b/schema/validators.go index a2fef32f92..e42dabe8e3 100644 --- a/schema/validators.go +++ b/schema/validators.go @@ -3,7 +3,7 @@ package schema import ( "encoding/json" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/types" ) diff --git a/schema/validators_test.go b/schema/validators_test.go index dfa12cfff2..0ecba01bb1 100644 --- a/schema/validators_test.go +++ b/schema/validators_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/types" "github.com/stretchr/testify/require" ) diff --git a/serve/destination_v0_test.go b/serve/destination_v0_test.go index 07894902e2..cb8ea09a24 100644 --- a/serve/destination_v0_test.go +++ b/serve/destination_v0_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v17/arrow/array" - "github.com/apache/arrow/go/v17/arrow/memory" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" pbBase "github.com/cloudquery/plugin-pb-go/pb/base/v0" pb "github.com/cloudquery/plugin-pb-go/pb/destination/v0" "github.com/cloudquery/plugin-pb-go/specs" diff --git a/serve/destination_v1_test.go b/serve/destination_v1_test.go index 0106cc2e7d..d55a2b5c98 100644 --- a/serve/destination_v1_test.go +++ b/serve/destination_v1_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "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" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/ipc" + "github.com/apache/arrow-go/v18/arrow/memory" pb "github.com/cloudquery/plugin-pb-go/pb/destination/v1" pbSource "github.com/cloudquery/plugin-pb-go/pb/source/v2" "github.com/cloudquery/plugin-pb-go/specs" diff --git a/serve/plugin_test.go b/serve/plugin_test.go index 4577624b59..d322264ffe 100644 --- a/serve/plugin_test.go +++ b/serve/plugin_test.go @@ -7,10 +7,10 @@ import ( "sync" "testing" - "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" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/ipc" + "github.com/apache/arrow-go/v18/arrow/memory" pb "github.com/cloudquery/plugin-pb-go/pb/plugin/v3" "github.com/cloudquery/plugin-sdk/v4/internal/memdb" "github.com/cloudquery/plugin-sdk/v4/plugin" diff --git a/transformers/struct.go b/transformers/struct.go index edb6012161..a85d22aebf 100644 --- a/transformers/struct.go +++ b/transformers/struct.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/cloudquery/plugin-sdk/v4/types" "github.com/thoas/go-funk" diff --git a/transformers/struct_test.go b/transformers/struct_test.go index 47d5ddb15b..81234323ca 100644 --- a/transformers/struct_test.go +++ b/transformers/struct_test.go @@ -8,7 +8,7 @@ import ( "time" "unsafe" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/cloudquery/plugin-sdk/v4/types" "github.com/google/go-cmp/cmp" diff --git a/transformers/type.go b/transformers/type.go index 571fb5cfef..a57fd9044d 100644 --- a/transformers/type.go +++ b/transformers/type.go @@ -6,7 +6,7 @@ import ( "reflect" "time" - "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow-go/v18/arrow" "github.com/cloudquery/plugin-sdk/v4/types" ) diff --git a/types/extensions.go b/types/extensions.go index 3246ce9a2d..d1847c1c94 100644 --- a/types/extensions.go +++ b/types/extensions.go @@ -1,6 +1,6 @@ package types -import "github.com/apache/arrow/go/v17/arrow" +import "github.com/apache/arrow-go/v18/arrow" var ExtensionTypes = struct { UUID arrow.ExtensionType diff --git a/types/extensions_test.go b/types/extensions_test.go index 0e2a503cfb..a530dae11e 100644 --- a/types/extensions_test.go +++ b/types/extensions_test.go @@ -3,9 +3,9 @@ package types import ( "testing" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/types/inet.go b/types/inet.go index 8df93cedbb..e129abac35 100644 --- a/types/inet.go +++ b/types/inet.go @@ -7,8 +7,8 @@ import ( "reflect" "strings" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" "github.com/goccy/go-json" ) diff --git a/types/inet_test.go b/types/inet_test.go index 264f60d48e..15d05d1a51 100644 --- a/types/inet_test.go +++ b/types/inet_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "github.com/apache/arrow/go/v17/arrow/array" - "github.com/apache/arrow/go/v17/arrow/memory" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/stretchr/testify/require" ) diff --git a/types/json.go b/types/json.go index 75d6b8f2f7..7d626bec58 100644 --- a/types/json.go +++ b/types/json.go @@ -8,8 +8,8 @@ import ( "github.com/goccy/go-json" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" ) type JSONBuilder struct { diff --git a/types/json_test.go b/types/json_test.go index 8c19f98b55..f674c401a8 100644 --- a/types/json_test.go +++ b/types/json_test.go @@ -5,8 +5,8 @@ import ( "strconv" "testing" - "github.com/apache/arrow/go/v17/arrow/array" - "github.com/apache/arrow/go/v17/arrow/memory" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/goccy/go-json" "github.com/stretchr/testify/require" ) diff --git a/types/mac.go b/types/mac.go index 3af1d3258e..1f5e4ae551 100644 --- a/types/mac.go +++ b/types/mac.go @@ -7,8 +7,8 @@ import ( "reflect" "strings" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" "github.com/goccy/go-json" ) diff --git a/types/mac_test.go b/types/mac_test.go index 95533d48ce..3fbd22e02a 100644 --- a/types/mac_test.go +++ b/types/mac_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "github.com/apache/arrow/go/v17/arrow/array" - "github.com/apache/arrow/go/v17/arrow/memory" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/stretchr/testify/require" ) diff --git a/types/register.go b/types/register.go index bbf9590313..8d8c37bdc3 100644 --- a/types/register.go +++ b/types/register.go @@ -1,6 +1,6 @@ package types -import "github.com/apache/arrow/go/v17/arrow" +import "github.com/apache/arrow-go/v18/arrow" func RegisterAllExtensions() error { if err := arrow.RegisterExtensionType(&UUIDType{}); err != nil { diff --git a/types/uuid.go b/types/uuid.go index 2dd0fd82f1..e019e8f1f7 100644 --- a/types/uuid.go +++ b/types/uuid.go @@ -8,8 +8,8 @@ import ( "github.com/goccy/go-json" - "github.com/apache/arrow/go/v17/arrow" - "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow-go/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" "github.com/google/uuid" ) diff --git a/types/uuid_test.go b/types/uuid_test.go index c47a9e20d8..bf625977c4 100644 --- a/types/uuid_test.go +++ b/types/uuid_test.go @@ -3,8 +3,8 @@ package types import ( "testing" - "github.com/apache/arrow/go/v17/arrow/array" - "github.com/apache/arrow/go/v17/arrow/memory" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/google/uuid" "github.com/stretchr/testify/require" ) diff --git a/writers/batchwriter/batchwriter_test.go b/writers/batchwriter/batchwriter_test.go index e418c27f6c..d84705ec51 100644 --- a/writers/batchwriter/batchwriter_test.go +++ b/writers/batchwriter/batchwriter_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/writers/mixedbatchwriter/mixedbatchwriter_test.go b/writers/mixedbatchwriter/mixedbatchwriter_test.go index e72dbe1a18..16040ca47d 100644 --- a/writers/mixedbatchwriter/mixedbatchwriter_test.go +++ b/writers/mixedbatchwriter/mixedbatchwriter_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/cloudquery/plugin-sdk/v4/writers" diff --git a/writers/streamingbatchwriter/streamingbatchwriter_test.go b/writers/streamingbatchwriter/streamingbatchwriter_test.go index 08cabbfd1a..b39dcf799a 100644 --- a/writers/streamingbatchwriter/streamingbatchwriter_test.go +++ b/writers/streamingbatchwriter/streamingbatchwriter_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/schema" ) diff --git a/writers/writers_test.go b/writers/writers_test.go index 1936dcab73..2d2b8ceb96 100644 --- a/writers/writers_test.go +++ b/writers/writers_test.go @@ -8,9 +8,9 @@ import ( "strconv" "testing" - "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/v18/arrow" + "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/cloudquery/plugin-sdk/v4/writers" From 4650d015948bc45614afdc7a960daf32415bbd7c Mon Sep 17 00:00:00 2001 From: erezrokah Date: Mon, 9 Dec 2024 10:21:14 +0000 Subject: [PATCH 2/3] fix: New extensions API --- types/extensions_test.go | 16 ++++++++-------- types/inet.go | 9 +++++---- types/inet_test.go | 5 ++--- types/json.go | 9 +++++---- types/json_test.go | 16 ++++++++-------- types/mac.go | 9 +++++---- types/mac_test.go | 5 ++--- types/uuid.go | 9 +++++---- types/uuid_test.go | 5 ++--- 9 files changed, 42 insertions(+), 41 deletions(-) diff --git a/types/extensions_test.go b/types/extensions_test.go index a530dae11e..2ec524934a 100644 --- a/types/extensions_test.go +++ b/types/extensions_test.go @@ -21,7 +21,7 @@ func TestValueStrRoundTrip(t *testing.T) { }{ { arr: func() arrow.Array { - b := NewInetBuilder(array.NewExtensionBuilder(mem, NewInetType())) + b := NewInetBuilder(mem) defer b.Release() b.AppendNull() @@ -32,11 +32,11 @@ func TestValueStrRoundTrip(t *testing.T) { return b.NewInetArray() }(), - builder: NewInetBuilder(array.NewExtensionBuilder(mem, NewInetType())), + builder: NewInetBuilder(mem), }, { arr: func() arrow.Array { - b := NewJSONBuilder(array.NewExtensionBuilder(mem, NewJSONType())) + b := NewJSONBuilder(mem) defer b.Release() b.AppendNull() @@ -49,11 +49,11 @@ func TestValueStrRoundTrip(t *testing.T) { return b.NewJSONArray() }(), - builder: NewJSONBuilder(array.NewExtensionBuilder(mem, NewJSONType())), + builder: NewJSONBuilder(mem), }, { arr: func() arrow.Array { - b := NewMACBuilder(array.NewExtensionBuilder(mem, NewMACType())) + b := NewMACBuilder(mem) defer b.Release() b.AppendNull() @@ -64,11 +64,11 @@ func TestValueStrRoundTrip(t *testing.T) { return b.NewMACArray() }(), - builder: NewMACBuilder(array.NewExtensionBuilder(mem, NewMACType())), + builder: NewMACBuilder(mem), }, { arr: func() arrow.Array { - b := NewUUIDBuilder(array.NewExtensionBuilder(mem, NewUUIDType())) + b := NewUUIDBuilder(mem) defer b.Release() b.AppendNull() @@ -79,7 +79,7 @@ func TestValueStrRoundTrip(t *testing.T) { return b.NewUUIDArray() }(), - builder: NewUUIDBuilder(array.NewExtensionBuilder(mem, NewUUIDType())), + builder: NewUUIDBuilder(mem), }, } diff --git a/types/inet.go b/types/inet.go index e129abac35..5e9a673e2b 100644 --- a/types/inet.go +++ b/types/inet.go @@ -9,6 +9,7 @@ import ( "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/goccy/go-json" ) @@ -16,8 +17,8 @@ type InetBuilder struct { *array.ExtensionBuilder } -func NewInetBuilder(builder *array.ExtensionBuilder) *InetBuilder { - return &InetBuilder{ExtensionBuilder: builder} +func NewInetBuilder(mem memory.Allocator) *InetBuilder { + return &InetBuilder{ExtensionBuilder: array.NewExtensionBuilder(mem, NewInetType())} } func (b *InetBuilder) Append(v *net.IPNet) { @@ -244,6 +245,6 @@ func (u *InetType) ExtensionEquals(other arrow.ExtensionType) bool { return u.ExtensionName() == other.ExtensionName() } -func (*InetType) NewBuilder(bldr *array.ExtensionBuilder) array.Builder { - return NewInetBuilder(bldr) +func (*InetType) NewBuilder(mem memory.Allocator) array.Builder { + return NewInetBuilder(mem) } diff --git a/types/inet_test.go b/types/inet_test.go index 15d05d1a51..83eac34ca2 100644 --- a/types/inet_test.go +++ b/types/inet_test.go @@ -4,7 +4,6 @@ import ( "net" "testing" - "github.com/apache/arrow-go/v18/arrow/array" "github.com/apache/arrow-go/v18/arrow/memory" "github.com/stretchr/testify/require" ) @@ -22,7 +21,7 @@ func TestInetBuilder(t *testing.T) { mem := memory.NewCheckedAllocator(memory.NewGoAllocator()) defer mem.AssertSize(t, 0) - b := NewInetBuilder(array.NewExtensionBuilder(mem, NewInetType())) + b := NewInetBuilder(mem) b.Append(mustParseInet("192.168.0.0/24")) b.AppendNull() @@ -55,7 +54,7 @@ func TestInetBuilder(t *testing.T) { b.Release() a.Release() - b = NewInetBuilder(array.NewExtensionBuilder(mem, NewInetType())) + b = NewInetBuilder(mem) err = b.UnmarshalJSON(st) require.NoError(t, err) diff --git a/types/json.go b/types/json.go index 7d626bec58..e583dd6e97 100644 --- a/types/json.go +++ b/types/json.go @@ -10,14 +10,15 @@ import ( "github.com/apache/arrow-go/v18/arrow" "github.com/apache/arrow-go/v18/arrow/array" + "github.com/apache/arrow-go/v18/arrow/memory" ) type JSONBuilder struct { *array.ExtensionBuilder } -func NewJSONBuilder(builder *array.ExtensionBuilder) *JSONBuilder { - return &JSONBuilder{ExtensionBuilder: builder} +func NewJSONBuilder(mem memory.Allocator) *JSONBuilder { + return &JSONBuilder{ExtensionBuilder: array.NewExtensionBuilder(mem, NewJSONType())} } func (b *JSONBuilder) AppendBytes(v []byte) { @@ -239,6 +240,6 @@ func (e *JSONType) ExtensionEquals(other arrow.ExtensionType) bool { return e.ExtensionName() == other.ExtensionName() } -func (*JSONType) NewBuilder(bldr *array.ExtensionBuilder) array.Builder { - return NewJSONBuilder(bldr) +func (*JSONType) NewBuilder(mem memory.Allocator) array.Builder { + return NewJSONBuilder(mem) } diff --git a/types/json_test.go b/types/json_test.go index f674c401a8..504e4dd24a 100644 --- a/types/json_test.go +++ b/types/json_test.go @@ -15,7 +15,7 @@ func TestJSONBuilder(t *testing.T) { mem := memory.NewCheckedAllocator(memory.NewGoAllocator()) defer mem.AssertSize(t, 0) - b := NewJSONBuilder(array.NewExtensionBuilder(mem, NewJSONType())) + b := NewJSONBuilder(mem) b.Append(map[string]any{"a": 1, "b": 2}) b.AppendNull() b.Append(map[string]any{"c": 3, "d": 4}) @@ -45,7 +45,7 @@ func TestJSONBuilder(t *testing.T) { b.Release() a.Release() - b = NewJSONBuilder(array.NewExtensionBuilder(mem, NewJSONType())) + b = NewJSONBuilder(mem) err = b.UnmarshalJSON(st) require.NoError(t, err) @@ -97,7 +97,7 @@ func TestJSONBuilder_UnmarshalOne(t *testing.T) { t.Run(tc.name, func(t *testing.T) { mem := memory.NewCheckedAllocator(memory.NewGoAllocator()) defer mem.AssertSize(t, 0) - b := NewJSONBuilder(array.NewExtensionBuilder(mem, NewJSONType())) + b := NewJSONBuilder(mem) defer b.Release() dec := json.NewDecoder(bytes.NewReader([]byte(tc.data))) err := b.UnmarshalOne(dec) @@ -154,7 +154,7 @@ func TestJSONArray_GetOneForMarshal(t *testing.T) { t.Run(tc.name, func(t *testing.T) { mem := memory.NewCheckedAllocator(memory.NewGoAllocator()) defer mem.AssertSize(t, 0) - b := NewJSONBuilder(array.NewExtensionBuilder(mem, NewJSONType())) + b := NewJSONBuilder(mem) defer b.Release() dec := json.NewDecoder(bytes.NewReader([]byte(tc.data))) err := b.UnmarshalOne(dec) @@ -215,7 +215,7 @@ func TestJSONArray_ValueStrParse(t *testing.T) { t.Run(tc.name, func(t *testing.T) { mem := memory.NewCheckedAllocator(memory.NewGoAllocator()) defer mem.AssertSize(t, 0) - b := NewJSONBuilder(array.NewExtensionBuilder(mem, NewJSONType())) + b := NewJSONBuilder(mem) defer b.Release() dec := json.NewDecoder(bytes.NewReader([]byte(tc.data))) err := b.UnmarshalOne(dec) @@ -270,7 +270,7 @@ func TestJSONArray_Value(t *testing.T) { t.Run(tc.name, func(t *testing.T) { mem := memory.NewCheckedAllocator(memory.NewGoAllocator()) defer mem.AssertSize(t, 0) - b := NewJSONBuilder(array.NewExtensionBuilder(mem, NewJSONType())) + b := NewJSONBuilder(mem) defer b.Release() dec := json.NewDecoder(bytes.NewReader([]byte(tc.data))) err := b.UnmarshalOne(dec) @@ -327,7 +327,7 @@ func TestJSON_MarshalUnmarshal(t *testing.T) { t.Run(tc.name, func(t *testing.T) { mem := memory.NewCheckedAllocator(memory.NewGoAllocator()) defer mem.AssertSize(t, 0) - b := NewJSONBuilder(array.NewExtensionBuilder(mem, NewJSONType())) + b := NewJSONBuilder(mem) defer b.Release() require.NoError(t, b.UnmarshalJSON([]byte(tc.data))) a := b.NewArray().(*JSONArray) @@ -389,7 +389,7 @@ func TestJSON_FromToString(t *testing.T) { mem := memory.NewCheckedAllocator(memory.NewGoAllocator()) defer mem.AssertSize(t, 0) - b := NewJSONBuilder(array.NewExtensionBuilder(mem, NewJSONType())) + b := NewJSONBuilder(mem) defer b.Release() for _, str := range tc.data { require.NoError(t, b.AppendValueFromString(str)) diff --git a/types/mac.go b/types/mac.go index 1f5e4ae551..28b217fc5b 100644 --- a/types/mac.go +++ b/types/mac.go @@ -9,6 +9,7 @@ import ( "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/goccy/go-json" ) @@ -16,8 +17,8 @@ type MACBuilder struct { *array.ExtensionBuilder } -func NewMACBuilder(builder *array.ExtensionBuilder) *MACBuilder { - return &MACBuilder{ExtensionBuilder: builder} +func NewMACBuilder(mem memory.Allocator) *MACBuilder { + return &MACBuilder{ExtensionBuilder: array.NewExtensionBuilder(mem, NewMACType())} } func (b *MACBuilder) Append(v net.HardwareAddr) { @@ -229,6 +230,6 @@ func (u *MACType) ExtensionEquals(other arrow.ExtensionType) bool { return u.ExtensionName() == other.ExtensionName() } -func (*MACType) NewBuilder(bldr *array.ExtensionBuilder) array.Builder { - return NewMACBuilder(bldr) +func (*MACType) NewBuilder(mem memory.Allocator) array.Builder { + return NewMACBuilder(mem) } diff --git a/types/mac_test.go b/types/mac_test.go index 3fbd22e02a..b956e0f6f8 100644 --- a/types/mac_test.go +++ b/types/mac_test.go @@ -4,7 +4,6 @@ import ( "net" "testing" - "github.com/apache/arrow-go/v18/arrow/array" "github.com/apache/arrow-go/v18/arrow/memory" "github.com/stretchr/testify/require" ) @@ -21,7 +20,7 @@ func TestMACBuilder(t *testing.T) { mem := memory.NewCheckedAllocator(memory.NewGoAllocator()) defer mem.AssertSize(t, 0) - b := NewMACBuilder(array.NewExtensionBuilder(mem, NewMACType())) + b := NewMACBuilder(mem) b.Append(mustParseMAC("00:00:00:00:00:01")) b.AppendNull() @@ -53,7 +52,7 @@ func TestMACBuilder(t *testing.T) { b.Release() a.Release() - b = NewMACBuilder(array.NewExtensionBuilder(mem, NewMACType())) + b = NewMACBuilder(mem) err = b.UnmarshalJSON(st) require.NoError(t, err) diff --git a/types/uuid.go b/types/uuid.go index e019e8f1f7..843503e75b 100644 --- a/types/uuid.go +++ b/types/uuid.go @@ -10,6 +10,7 @@ import ( "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/google/uuid" ) @@ -19,8 +20,8 @@ type UUIDBuilder struct { *array.ExtensionBuilder } -func NewUUIDBuilder(builder *array.ExtensionBuilder) *UUIDBuilder { - return &UUIDBuilder{ExtensionBuilder: builder} +func NewUUIDBuilder(mem memory.Allocator) *UUIDBuilder { + return &UUIDBuilder{ExtensionBuilder: array.NewExtensionBuilder(mem, NewUUIDType())} } func (b *UUIDBuilder) Append(v uuid.UUID) { @@ -231,6 +232,6 @@ func (e *UUIDType) ExtensionEquals(other arrow.ExtensionType) bool { return e.ExtensionName() == other.ExtensionName() } -func (*UUIDType) NewBuilder(bldr *array.ExtensionBuilder) array.Builder { - return NewUUIDBuilder(bldr) +func (*UUIDType) NewBuilder(mem memory.Allocator) array.Builder { + return NewUUIDBuilder(mem) } diff --git a/types/uuid_test.go b/types/uuid_test.go index bf625977c4..f1f5878316 100644 --- a/types/uuid_test.go +++ b/types/uuid_test.go @@ -3,7 +3,6 @@ package types import ( "testing" - "github.com/apache/arrow-go/v18/arrow/array" "github.com/apache/arrow-go/v18/arrow/memory" "github.com/google/uuid" "github.com/stretchr/testify/require" @@ -13,7 +12,7 @@ func TestUUIDBuilder(t *testing.T) { mem := memory.NewCheckedAllocator(memory.NewGoAllocator()) defer mem.AssertSize(t, 0) - b := NewUUIDBuilder(array.NewExtensionBuilder(mem, NewUUIDType())) + b := NewUUIDBuilder(mem) b.Append(uuid.MustParse("00000000-0000-0000-0000-000000000001")) b.AppendNull() @@ -45,7 +44,7 @@ func TestUUIDBuilder(t *testing.T) { b.Release() a.Release() - b = NewUUIDBuilder(array.NewExtensionBuilder(mem, NewUUIDType())) + b = NewUUIDBuilder(mem) err = b.UnmarshalJSON(st) require.NoError(t, err) From 591317b29982f98cd816500a82577f1452e2ec71 Mon Sep 17 00:00:00 2001 From: erezrokah Date: Fri, 13 Dec 2024 09:47:09 +0000 Subject: [PATCH 3/3] chore: Use official plugin-pb-go-version --- examples/simple_plugin/go.mod | 2 +- examples/simple_plugin/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/simple_plugin/go.mod b/examples/simple_plugin/go.mod index 6914fc137b..f5d65156b0 100644 --- a/examples/simple_plugin/go.mod +++ b/examples/simple_plugin/go.mod @@ -31,7 +31,7 @@ require ( github.com/buger/jsonparser v1.1.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cloudquery/cloudquery-api-go v1.13.4 // indirect - github.com/cloudquery/plugin-pb-go v1.25.7-0.20241206174104-883b0c2d1a75 // indirect + github.com/cloudquery/plugin-pb-go v1.26.0 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/ghodss/yaml v1.0.0 // indirect diff --git a/examples/simple_plugin/go.sum b/examples/simple_plugin/go.sum index be4028cadf..40a1765b46 100644 --- a/examples/simple_plugin/go.sum +++ b/examples/simple_plugin/go.sum @@ -52,8 +52,8 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cloudquery/cloudquery-api-go v1.13.4 h1:8xj16iU1LcN0uLUHeHhDjc5nJDtzdxan07HiVAgJz1Q= github.com/cloudquery/cloudquery-api-go v1.13.4/go.mod h1:nbc7ROHjJAnLGP306pCrpNwBCNLjUyNd5u6Y/+QsmKw= -github.com/cloudquery/plugin-pb-go v1.25.7-0.20241206174104-883b0c2d1a75 h1:M0LGZa4gOkVZjYbGG7St4i1tekuwmsIBUpScU6C0shA= -github.com/cloudquery/plugin-pb-go v1.25.7-0.20241206174104-883b0c2d1a75/go.mod h1:PxKigoP/uZ3awwWM3TjRLQBSdR1MVXv60HjR9v1xwYQ= +github.com/cloudquery/plugin-pb-go v1.26.0 h1:Lmhq9zG9xd/cEiJlJ2LQTEEFfV74OcFYVtwB4GPIECc= +github.com/cloudquery/plugin-pb-go v1.26.0/go.mod h1:PxKigoP/uZ3awwWM3TjRLQBSdR1MVXv60HjR9v1xwYQ= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= diff --git a/go.mod b/go.mod index d95456d4ca..1ffe6c94fb 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.25.6 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 github.com/cloudquery/cloudquery-api-go v1.13.4 - github.com/cloudquery/plugin-pb-go v1.25.7-0.20241206174104-883b0c2d1a75 + github.com/cloudquery/plugin-pb-go v1.26.0 github.com/cloudquery/plugin-sdk/v2 v2.7.0 github.com/goccy/go-json v0.10.3 github.com/golang/mock v1.6.0 diff --git a/go.sum b/go.sum index 74d70607df..a6c13ae243 100644 --- a/go.sum +++ b/go.sum @@ -52,8 +52,8 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cloudquery/cloudquery-api-go v1.13.4 h1:8xj16iU1LcN0uLUHeHhDjc5nJDtzdxan07HiVAgJz1Q= github.com/cloudquery/cloudquery-api-go v1.13.4/go.mod h1:nbc7ROHjJAnLGP306pCrpNwBCNLjUyNd5u6Y/+QsmKw= -github.com/cloudquery/plugin-pb-go v1.25.7-0.20241206174104-883b0c2d1a75 h1:M0LGZa4gOkVZjYbGG7St4i1tekuwmsIBUpScU6C0shA= -github.com/cloudquery/plugin-pb-go v1.25.7-0.20241206174104-883b0c2d1a75/go.mod h1:PxKigoP/uZ3awwWM3TjRLQBSdR1MVXv60HjR9v1xwYQ= +github.com/cloudquery/plugin-pb-go v1.26.0 h1:Lmhq9zG9xd/cEiJlJ2LQTEEFfV74OcFYVtwB4GPIECc= +github.com/cloudquery/plugin-pb-go v1.26.0/go.mod h1:PxKigoP/uZ3awwWM3TjRLQBSdR1MVXv60HjR9v1xwYQ= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=