You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ze...@apache.org on 2023/06/08 15:07:21 UTC
[arrow-adbc] branch main updated: chore(go/adbc): upgrade to arrow v13 (development) (#741)
This is an automated email from the ASF dual-hosted git repository.
zeroshade pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new a2c9ebfe chore(go/adbc): upgrade to arrow v13 (development) (#741)
a2c9ebfe is described below
commit a2c9ebfe078a00c05bdc0a2500d64beec0e464d5
Author: David Li <li...@gmail.com>
AuthorDate: Thu Jun 8 11:07:16 2023 -0400
chore(go/adbc): upgrade to arrow v13 (development) (#741)
Fixes #717.
---
go/adbc/adbc.go | 4 ++--
go/adbc/driver/flightsql/flightsql_adbc.go | 14 +++++++-------
go/adbc/driver/flightsql/flightsql_adbc_test.go | 14 +++++++-------
go/adbc/driver/flightsql/flightsql_statement.go | 10 +++++-----
go/adbc/driver/flightsql/record_reader.go | 10 +++++-----
go/adbc/driver/flightsql/record_reader_test.go | 12 ++++++------
go/adbc/driver/internal/shared_utils.go | 6 +++---
go/adbc/driver/panicdummy/panicdummy_adbc.go | 6 +++---
go/adbc/driver/snowflake/connection.go | 4 ++--
go/adbc/driver/snowflake/driver.go | 2 +-
go/adbc/driver/snowflake/driver_test.go | 6 +++---
go/adbc/driver/snowflake/record_reader.go | 10 +++++-----
go/adbc/driver/snowflake/statement.go | 6 +++---
go/adbc/drivermgr/wrapper.go | 22 +++++++++++++++-------
go/adbc/drivermgr/wrapper_sqlite_test.go | 6 +++---
go/adbc/go.mod | 5 ++---
go/adbc/go.sum | 5 ++---
go/adbc/pkg/_tmpl/driver.go.tmpl | 13 ++++++++-----
go/adbc/pkg/flightsql/driver.go | 11 +++++++----
go/adbc/pkg/panicdummy/driver.go | 11 +++++++----
go/adbc/pkg/snowflake/driver.go | 11 +++++++----
go/adbc/sqldriver/driver.go | 10 +++++-----
go/adbc/sqldriver/driver_internals_test.go | 6 +++---
go/adbc/sqldriver/flightsql/flightsql_test.go | 8 ++++----
go/adbc/standard_schemas.go | 2 +-
go/adbc/utils/utils.go | 2 +-
go/adbc/validation/validation.go | 6 +++---
27 files changed, 120 insertions(+), 102 deletions(-)
diff --git a/go/adbc/adbc.go b/go/adbc/adbc.go
index 2ecd4154..92df909b 100644
--- a/go/adbc/adbc.go
+++ b/go/adbc/adbc.go
@@ -40,8 +40,8 @@ import (
"context"
"fmt"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
)
//go:generate go run golang.org/x/tools/cmd/stringer -type Status -linecomment
diff --git a/go/adbc/driver/flightsql/flightsql_adbc.go b/go/adbc/driver/flightsql/flightsql_adbc.go
index c714f553..03bdefac 100644
--- a/go/adbc/driver/flightsql/flightsql_adbc.go
+++ b/go/adbc/driver/flightsql/flightsql_adbc.go
@@ -49,13 +49,13 @@ import (
"github.com/apache/arrow-adbc/go/adbc"
"github.com/apache/arrow-adbc/go/adbc/driver/internal"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/flight"
- "github.com/apache/arrow/go/v12/arrow/flight/flightsql"
- "github.com/apache/arrow/go/v12/arrow/flight/flightsql/schema_ref"
- "github.com/apache/arrow/go/v12/arrow/ipc"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/flight"
+ "github.com/apache/arrow/go/v13/arrow/flight/flightsql"
+ "github.com/apache/arrow/go/v13/arrow/flight/flightsql/schema_ref"
+ "github.com/apache/arrow/go/v13/arrow/ipc"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/bluele/gcache"
"golang.org/x/exp/maps"
"google.golang.org/grpc"
diff --git a/go/adbc/driver/flightsql/flightsql_adbc_test.go b/go/adbc/driver/flightsql/flightsql_adbc_test.go
index 11d74f2f..f8ae8469 100644
--- a/go/adbc/driver/flightsql/flightsql_adbc_test.go
+++ b/go/adbc/driver/flightsql/flightsql_adbc_test.go
@@ -40,12 +40,12 @@ import (
"github.com/apache/arrow-adbc/go/adbc"
driver "github.com/apache/arrow-adbc/go/adbc/driver/flightsql"
"github.com/apache/arrow-adbc/go/adbc/validation"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/flight"
- "github.com/apache/arrow/go/v12/arrow/flight/flightsql"
- "github.com/apache/arrow/go/v12/arrow/flight/flightsql/example"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/flight"
+ "github.com/apache/arrow/go/v13/arrow/flight/flightsql"
+ "github.com/apache/arrow/go/v13/arrow/flight/flightsql/example"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"google.golang.org/grpc"
@@ -252,7 +252,7 @@ func (s *FlightSQLQuirks) GetMetadata(code adbc.InfoCode) interface{} {
case adbc.InfoVendorVersion:
return "sqlite 3"
case adbc.InfoVendorArrowVersion:
- return "12.0.0-SNAPSHOT"
+ return "13.0.0-SNAPSHOT"
}
return nil
diff --git a/go/adbc/driver/flightsql/flightsql_statement.go b/go/adbc/driver/flightsql/flightsql_statement.go
index 3d051ef6..c7f074a8 100644
--- a/go/adbc/driver/flightsql/flightsql_statement.go
+++ b/go/adbc/driver/flightsql/flightsql_statement.go
@@ -24,11 +24,11 @@ import (
"strings"
"github.com/apache/arrow-adbc/go/adbc"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/flight"
- "github.com/apache/arrow/go/v12/arrow/flight/flightsql"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/flight"
+ "github.com/apache/arrow/go/v13/arrow/flight/flightsql"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/bluele/gcache"
"google.golang.org/grpc"
"google.golang.org/grpc/metadata"
diff --git a/go/adbc/driver/flightsql/record_reader.go b/go/adbc/driver/flightsql/record_reader.go
index 017faa24..6bcb7791 100644
--- a/go/adbc/driver/flightsql/record_reader.go
+++ b/go/adbc/driver/flightsql/record_reader.go
@@ -24,11 +24,11 @@ import (
"github.com/apache/arrow-adbc/go/adbc"
"github.com/apache/arrow-adbc/go/adbc/utils"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/flight"
- "github.com/apache/arrow/go/v12/arrow/flight/flightsql"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/flight"
+ "github.com/apache/arrow/go/v13/arrow/flight/flightsql"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/bluele/gcache"
"golang.org/x/sync/errgroup"
"google.golang.org/grpc"
diff --git a/go/adbc/driver/flightsql/record_reader_test.go b/go/adbc/driver/flightsql/record_reader_test.go
index 0c0cec53..1bb7b3ad 100644
--- a/go/adbc/driver/flightsql/record_reader_test.go
+++ b/go/adbc/driver/flightsql/record_reader_test.go
@@ -24,12 +24,12 @@ import (
"testing"
"github.com/apache/arrow-adbc/go/adbc"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/flight"
- "github.com/apache/arrow/go/v12/arrow/flight/flightsql"
- "github.com/apache/arrow/go/v12/arrow/ipc"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/flight"
+ "github.com/apache/arrow/go/v13/arrow/flight/flightsql"
+ "github.com/apache/arrow/go/v13/arrow/ipc"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/bluele/gcache"
"github.com/stretchr/testify/suite"
"google.golang.org/grpc"
diff --git a/go/adbc/driver/internal/shared_utils.go b/go/adbc/driver/internal/shared_utils.go
index b2b0c634..92a8a8e4 100644
--- a/go/adbc/driver/internal/shared_utils.go
+++ b/go/adbc/driver/internal/shared_utils.go
@@ -24,9 +24,9 @@ import (
"strings"
"github.com/apache/arrow-adbc/go/adbc"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/memory"
)
type CatalogAndSchema struct {
diff --git a/go/adbc/driver/panicdummy/panicdummy_adbc.go b/go/adbc/driver/panicdummy/panicdummy_adbc.go
index e9dcc1c9..57d8b993 100644
--- a/go/adbc/driver/panicdummy/panicdummy_adbc.go
+++ b/go/adbc/driver/panicdummy/panicdummy_adbc.go
@@ -25,9 +25,9 @@ import (
"os"
"github.com/apache/arrow-adbc/go/adbc"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/memory"
)
func maybePanic(fname string) {
diff --git a/go/adbc/driver/snowflake/connection.go b/go/adbc/driver/snowflake/connection.go
index 0437e8b1..8f965597 100644
--- a/go/adbc/driver/snowflake/connection.go
+++ b/go/adbc/driver/snowflake/connection.go
@@ -28,8 +28,8 @@ import (
"github.com/apache/arrow-adbc/go/adbc"
"github.com/apache/arrow-adbc/go/adbc/driver/internal"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
"github.com/snowflakedb/gosnowflake"
)
diff --git a/go/adbc/driver/snowflake/driver.go b/go/adbc/driver/snowflake/driver.go
index 8f7d8beb..fbc9f3c8 100644
--- a/go/adbc/driver/snowflake/driver.go
+++ b/go/adbc/driver/snowflake/driver.go
@@ -31,7 +31,7 @@ import (
"time"
"github.com/apache/arrow-adbc/go/adbc"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/snowflakedb/gosnowflake"
"golang.org/x/exp/maps"
)
diff --git a/go/adbc/driver/snowflake/driver_test.go b/go/adbc/driver/snowflake/driver_test.go
index fd5d34dd..7ac1f27f 100644
--- a/go/adbc/driver/snowflake/driver_test.go
+++ b/go/adbc/driver/snowflake/driver_test.go
@@ -28,9 +28,9 @@ import (
"github.com/apache/arrow-adbc/go/adbc"
driver "github.com/apache/arrow-adbc/go/adbc/driver/snowflake"
"github.com/apache/arrow-adbc/go/adbc/validation"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/google/uuid"
"github.com/snowflakedb/gosnowflake"
"github.com/stretchr/testify/require"
diff --git a/go/adbc/driver/snowflake/record_reader.go b/go/adbc/driver/snowflake/record_reader.go
index c9bcac93..b3041ddd 100644
--- a/go/adbc/driver/snowflake/record_reader.go
+++ b/go/adbc/driver/snowflake/record_reader.go
@@ -25,11 +25,11 @@ import (
"time"
"github.com/apache/arrow-adbc/go/adbc"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/compute"
- "github.com/apache/arrow/go/v12/arrow/ipc"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/compute"
+ "github.com/apache/arrow/go/v13/arrow/ipc"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/snowflakedb/gosnowflake"
"golang.org/x/sync/errgroup"
)
diff --git a/go/adbc/driver/snowflake/statement.go b/go/adbc/driver/snowflake/statement.go
index 9b9868c3..481e7f7c 100644
--- a/go/adbc/driver/snowflake/statement.go
+++ b/go/adbc/driver/snowflake/statement.go
@@ -25,9 +25,9 @@ import (
"strings"
"github.com/apache/arrow-adbc/go/adbc"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/snowflakedb/gosnowflake"
"golang.org/x/exp/constraints"
)
diff --git a/go/adbc/drivermgr/wrapper.go b/go/adbc/drivermgr/wrapper.go
index 3514bf4b..161ff608 100644
--- a/go/adbc/drivermgr/wrapper.go
+++ b/go/adbc/drivermgr/wrapper.go
@@ -37,9 +37,9 @@ import (
"unsafe"
"github.com/apache/arrow-adbc/go/adbc"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/cdata"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/cdata"
)
type option struct {
@@ -176,8 +176,12 @@ func (d *Database) Open(context.Context) (adbc.Connection, error) {
return &cnxn{conn: &c}, nil
}
-func getRdr(out *C.struct_ArrowArrayStream) array.RecordReader {
- return cdata.ImportCArrayStream((*cdata.CArrowArrayStream)(unsafe.Pointer(out)), nil).(array.RecordReader)
+func getRdr(out *C.struct_ArrowArrayStream) (array.RecordReader, error) {
+ rdr, err := cdata.ImportCRecordReader((*cdata.CArrowArrayStream)(unsafe.Pointer(out)), nil)
+ if err != nil {
+ return nil, err
+ }
+ return rdr.(array.RecordReader), nil
}
type cnxn struct {
@@ -198,7 +202,7 @@ func (c *cnxn) GetInfo(_ context.Context, infoCodes []adbc.InfoCode) (array.Reco
return nil, toAdbcError(code, &err)
}
- return getRdr(&out), nil
+ return getRdr(&out)
}
func (c *cnxn) GetObjects(_ context.Context, depth adbc.ObjectDepth, catalog, dbSchema, tableName, columnName *string, tableType []string) (array.RecordReader, error) {
@@ -301,7 +305,11 @@ func (s *stmt) ExecuteQuery(context.Context) (array.RecordReader, int64, error)
return nil, 0, toAdbcError(code, &err)
}
- return getRdr(&out), int64(affected), nil
+ rdr, goerr := getRdr(&out)
+ if goerr != nil {
+ return nil, int64(affected), goerr
+ }
+ return rdr, int64(affected), nil
}
func (s *stmt) ExecuteUpdate(context.Context) (int64, error) {
diff --git a/go/adbc/drivermgr/wrapper_sqlite_test.go b/go/adbc/drivermgr/wrapper_sqlite_test.go
index 1b4795bd..81c7d5b2 100644
--- a/go/adbc/drivermgr/wrapper_sqlite_test.go
+++ b/go/adbc/drivermgr/wrapper_sqlite_test.go
@@ -27,9 +27,9 @@ import (
"github.com/apache/arrow-adbc/go/adbc"
"github.com/apache/arrow-adbc/go/adbc/drivermgr"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
diff --git a/go/adbc/go.mod b/go/adbc/go.mod
index 3c3a2445..eb4048f4 100644
--- a/go/adbc/go.mod
+++ b/go/adbc/go.mod
@@ -20,7 +20,7 @@ module github.com/apache/arrow-adbc/go/adbc
go 1.18
require (
- github.com/apache/arrow/go/v12 v12.0.0
+ github.com/apache/arrow/go/v13 v13.0.0-20230607193106-16328f0ccc73
github.com/bluele/gcache v0.0.2
github.com/google/uuid v1.3.0
github.com/snowflakedb/gosnowflake v1.6.21
@@ -40,6 +40,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0 // indirect
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
github.com/andybalholm/brotli v1.0.5 // indirect
+ github.com/apache/arrow/go/v12 v12.0.0 // indirect
github.com/apache/thrift v0.16.0 // indirect
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
@@ -71,7 +72,6 @@ require (
github.com/klauspost/asmfmt v1.3.2 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
- github.com/kr/text v0.2.0 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
@@ -89,7 +89,6 @@ require (
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
- gonum.org/v1/gonum v0.12.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/uint128 v1.3.0 // indirect
diff --git a/go/adbc/go.sum b/go/adbc/go.sum
index 236c1542..137017c2 100644
--- a/go/adbc/go.sum
+++ b/go/adbc/go.sum
@@ -16,6 +16,8 @@ github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/
github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
github.com/apache/arrow/go/v12 v12.0.0-20230428025921-06d49ee63e26 h1:30dVB4xxWsw05PFJnTTpebmxdpDJeEbX7xDwUMCFwDk=
github.com/apache/arrow/go/v12 v12.0.0-20230428025921-06d49ee63e26/go.mod h1:weuTY7JvTG/HDPtMQxEUp7pU73vkLWMLpY67QwZ/WWw=
+github.com/apache/arrow/go/v13 v13.0.0-20230607193106-16328f0ccc73 h1:79Fwc612EjEqduW6RRZLKst80Wh9tLV1j21d1E7qHYo=
+github.com/apache/arrow/go/v13 v13.0.0-20230607193106-16328f0ccc73/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc=
github.com/apache/thrift v0.16.0 h1:qEy6UW60iVOlUy+b9ZR0d5WzUWYGOo4HfopoyBaNmoY=
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
github.com/aws/aws-sdk-go-v2 v1.18.0 h1:882kkTpSFhdgYRKVZ/VCgf7sd0ru57p2JCxz4/oN5RY=
@@ -58,7 +60,6 @@ github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8=
github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -110,7 +111,6 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
@@ -187,7 +187,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o=
-gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY=
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag=
diff --git a/go/adbc/pkg/_tmpl/driver.go.tmpl b/go/adbc/pkg/_tmpl/driver.go.tmpl
index 85a9dde7..fbc80aab 100644
--- a/go/adbc/pkg/_tmpl/driver.go.tmpl
+++ b/go/adbc/pkg/_tmpl/driver.go.tmpl
@@ -42,9 +42,9 @@ import (
"unsafe"
"github.com/apache/arrow-adbc/go/adbc"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/cdata"
- "github.com/apache/arrow/go/v12/arrow/memory/mallocator"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/cdata"
+ "github.com/apache/arrow/go/v13/arrow/memory/mallocator"
)
// Must use malloc() to respect CGO rules
@@ -748,8 +748,11 @@ func {{.Prefix}}StatementBindStream(stmt *C.struct_AdbcStatement, stream *C.stru
return C.ADBC_STATUS_INVALID_STATE
}
- rdr := cdata.ImportCArrayStream(toCdataStream(stream), nil)
- return C.AdbcStatusCode(errToAdbcErr(err, st.BindStream(context.Background(), rdr.(array.RecordReader))))
+ rdr, e := cdata.ImportCRecordReader(toCdataStream(stream), nil)
+ if e != nil {
+ return C.AdbcStatusCode(errToAdbcErr(err, e))
+ }
+ return C.AdbcStatusCode(errToAdbcErr(err, st.BindStream(context.Background(), rdr.(array.RecordReader))))
}
//export {{.Prefix}}StatementGetParameterSchema
diff --git a/go/adbc/pkg/flightsql/driver.go b/go/adbc/pkg/flightsql/driver.go
index 09d26622..976c28e1 100644
--- a/go/adbc/pkg/flightsql/driver.go
+++ b/go/adbc/pkg/flightsql/driver.go
@@ -45,9 +45,9 @@ import (
"github.com/apache/arrow-adbc/go/adbc"
"github.com/apache/arrow-adbc/go/adbc/driver/flightsql"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/cdata"
- "github.com/apache/arrow/go/v12/arrow/memory/mallocator"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/cdata"
+ "github.com/apache/arrow/go/v13/arrow/memory/mallocator"
)
// Must use malloc() to respect CGO rules
@@ -752,7 +752,10 @@ func FlightSQLStatementBindStream(stmt *C.struct_AdbcStatement, stream *C.struct
return C.ADBC_STATUS_INVALID_STATE
}
- rdr := cdata.ImportCArrayStream(toCdataStream(stream), nil)
+ rdr, e := cdata.ImportCRecordReader(toCdataStream(stream), nil)
+ if e != nil {
+ return C.AdbcStatusCode(errToAdbcErr(err, e))
+ }
return C.AdbcStatusCode(errToAdbcErr(err, st.BindStream(context.Background(), rdr.(array.RecordReader))))
}
diff --git a/go/adbc/pkg/panicdummy/driver.go b/go/adbc/pkg/panicdummy/driver.go
index 390bc4ad..915e70d2 100644
--- a/go/adbc/pkg/panicdummy/driver.go
+++ b/go/adbc/pkg/panicdummy/driver.go
@@ -45,9 +45,9 @@ import (
"github.com/apache/arrow-adbc/go/adbc"
"github.com/apache/arrow-adbc/go/adbc/driver/panicdummy"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/cdata"
- "github.com/apache/arrow/go/v12/arrow/memory/mallocator"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/cdata"
+ "github.com/apache/arrow/go/v13/arrow/memory/mallocator"
)
// Must use malloc() to respect CGO rules
@@ -752,7 +752,10 @@ func PanicDummyStatementBindStream(stmt *C.struct_AdbcStatement, stream *C.struc
return C.ADBC_STATUS_INVALID_STATE
}
- rdr := cdata.ImportCArrayStream(toCdataStream(stream), nil)
+ rdr, e := cdata.ImportCRecordReader(toCdataStream(stream), nil)
+ if e != nil {
+ return C.AdbcStatusCode(errToAdbcErr(err, e))
+ }
return C.AdbcStatusCode(errToAdbcErr(err, st.BindStream(context.Background(), rdr.(array.RecordReader))))
}
diff --git a/go/adbc/pkg/snowflake/driver.go b/go/adbc/pkg/snowflake/driver.go
index 906584ff..4e7e5f6f 100644
--- a/go/adbc/pkg/snowflake/driver.go
+++ b/go/adbc/pkg/snowflake/driver.go
@@ -45,9 +45,9 @@ import (
"github.com/apache/arrow-adbc/go/adbc"
"github.com/apache/arrow-adbc/go/adbc/driver/snowflake"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/cdata"
- "github.com/apache/arrow/go/v12/arrow/memory/mallocator"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/cdata"
+ "github.com/apache/arrow/go/v13/arrow/memory/mallocator"
)
// Must use malloc() to respect CGO rules
@@ -752,7 +752,10 @@ func SnowflakeStatementBindStream(stmt *C.struct_AdbcStatement, stream *C.struct
return C.ADBC_STATUS_INVALID_STATE
}
- rdr := cdata.ImportCArrayStream(toCdataStream(stream), nil)
+ rdr, e := cdata.ImportCRecordReader(toCdataStream(stream), nil)
+ if e != nil {
+ return C.AdbcStatusCode(errToAdbcErr(err, e))
+ }
return C.AdbcStatusCode(errToAdbcErr(err, st.BindStream(context.Background(), rdr.(array.RecordReader))))
}
diff --git a/go/adbc/sqldriver/driver.go b/go/adbc/sqldriver/driver.go
index 44184032..ce008e19 100644
--- a/go/adbc/sqldriver/driver.go
+++ b/go/adbc/sqldriver/driver.go
@@ -30,11 +30,11 @@ import (
"unsafe"
"github.com/apache/arrow-adbc/go/adbc"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/decimal128"
- "github.com/apache/arrow/go/v12/arrow/decimal256"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/decimal128"
+ "github.com/apache/arrow/go/v13/arrow/decimal256"
+ "github.com/apache/arrow/go/v13/arrow/memory"
)
func getIsolationlevel(lvl sql.IsolationLevel) adbc.OptionIsolationLevel {
diff --git a/go/adbc/sqldriver/driver_internals_test.go b/go/adbc/sqldriver/driver_internals_test.go
index d35035ed..b8bb7563 100644
--- a/go/adbc/sqldriver/driver_internals_test.go
+++ b/go/adbc/sqldriver/driver_internals_test.go
@@ -25,9 +25,9 @@ import (
"time"
"github.com/apache/arrow-adbc/go/adbc"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/go/adbc/sqldriver/flightsql/flightsql_test.go b/go/adbc/sqldriver/flightsql/flightsql_test.go
index 86fdee37..0df60e6b 100644
--- a/go/adbc/sqldriver/flightsql/flightsql_test.go
+++ b/go/adbc/sqldriver/flightsql/flightsql_test.go
@@ -23,10 +23,10 @@ import (
"testing"
_ "github.com/apache/arrow-adbc/go/adbc/sqldriver/flightsql"
- "github.com/apache/arrow/go/v12/arrow/flight"
- "github.com/apache/arrow/go/v12/arrow/flight/flightsql"
- "github.com/apache/arrow/go/v12/arrow/flight/flightsql/example"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow/flight"
+ "github.com/apache/arrow/go/v13/arrow/flight/flightsql"
+ "github.com/apache/arrow/go/v13/arrow/flight/flightsql/example"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/stretchr/testify/suite"
"google.golang.org/grpc"
)
diff --git a/go/adbc/standard_schemas.go b/go/adbc/standard_schemas.go
index eb3d61fd..b5ca7d42 100644
--- a/go/adbc/standard_schemas.go
+++ b/go/adbc/standard_schemas.go
@@ -17,7 +17,7 @@
package adbc
-import "github.com/apache/arrow/go/v12/arrow"
+import "github.com/apache/arrow/go/v13/arrow"
var (
GetInfoSchema = arrow.NewSchema([]arrow.Field{
diff --git a/go/adbc/utils/utils.go b/go/adbc/utils/utils.go
index 84ba0f00..1a34e662 100644
--- a/go/adbc/utils/utils.go
+++ b/go/adbc/utils/utils.go
@@ -17,7 +17,7 @@
package utils
-import "github.com/apache/arrow/go/v12/arrow"
+import "github.com/apache/arrow/go/v13/arrow"
func RemoveSchemaMetadata(schema *arrow.Schema) *arrow.Schema {
fields := make([]arrow.Field, len(schema.Fields()))
diff --git a/go/adbc/validation/validation.go b/go/adbc/validation/validation.go
index bc6e3689..ffc9e93d 100644
--- a/go/adbc/validation/validation.go
+++ b/go/adbc/validation/validation.go
@@ -28,9 +28,9 @@ import (
"github.com/apache/arrow-adbc/go/adbc"
"github.com/apache/arrow-adbc/go/adbc/utils"
- "github.com/apache/arrow/go/v12/arrow"
- "github.com/apache/arrow/go/v12/arrow/array"
- "github.com/apache/arrow/go/v12/arrow/memory"
+ "github.com/apache/arrow/go/v13/arrow"
+ "github.com/apache/arrow/go/v13/arrow/array"
+ "github.com/apache/arrow/go/v13/arrow/memory"
"github.com/stretchr/testify/suite"
)