From f9d6b1853619c937183d89f31dedd8c220c47d9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 19:25:23 -0500 Subject: [PATCH 01/11] chore(go/adbc): bump google.golang.org/grpc from 1.67.1 to 1.68.0 in /go/adbc (#2316) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.67.1 to 1.68.0. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David Li --- .env | 2 +- go/adbc/go.mod | 7 +++---- go/adbc/go.sum | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.env b/.env index d7ff7ad64d..068727961b 100644 --- a/.env +++ b/.env @@ -33,7 +33,7 @@ MANYLINUX=2-28 MAVEN=3.6.3 PLATFORM=linux/amd64 PYTHON=3.9 -GO=1.22.4 +GO=1.22.9 ARROW_MAJOR_VERSION=14 DOTNET=8.0 diff --git a/go/adbc/go.mod b/go/adbc/go.mod index f457c9c5e6..6f239621e2 100644 --- a/go/adbc/go.mod +++ b/go/adbc/go.mod @@ -17,10 +17,9 @@ module github.com/apache/arrow-adbc/go/adbc -go 1.22.0 +go 1.22.7 -// TODO(https://github.com/apache/arrow-adbc/issues/2021): unpin go -toolchain go1.22.4 +toolchain go1.22.9 require ( cloud.google.com/go/bigquery v1.64.0 @@ -36,7 +35,7 @@ require ( golang.org/x/sync v0.9.0 golang.org/x/tools v0.27.0 google.golang.org/api v0.204.0 - google.golang.org/grpc v1.67.1 + google.golang.org/grpc v1.68.0 google.golang.org/protobuf v1.35.1 ) diff --git a/go/adbc/go.sum b/go/adbc/go.sum index 0ca28e2cd4..f6539697f3 100644 --- a/go/adbc/go.sum +++ b/go/adbc/go.sum @@ -314,8 +314,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= -google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= +google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0= +google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From 4999dcd5ab78602a471441f2854c4084ed18c86c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 20:10:02 -0500 Subject: [PATCH 02/11] chore(go/adbc): bump google.golang.org/api from 0.204.0 to 0.205.0 in /go/adbc (#2318) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.204.0 to 0.205.0. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go/adbc/go.mod | 4 ++-- go/adbc/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go/adbc/go.mod b/go/adbc/go.mod index 6f239621e2..6241cc5a9f 100644 --- a/go/adbc/go.mod +++ b/go/adbc/go.mod @@ -34,14 +34,14 @@ require ( golang.org/x/oauth2 v0.24.0 golang.org/x/sync v0.9.0 golang.org/x/tools v0.27.0 - google.golang.org/api v0.204.0 + google.golang.org/api v0.205.0 google.golang.org/grpc v1.68.0 google.golang.org/protobuf v1.35.1 ) require ( cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.10.0 // indirect + cloud.google.com/go/auth v0.10.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.2.1 // indirect diff --git a/go/adbc/go.sum b/go/adbc/go.sum index f6539697f3..1412995d71 100644 --- a/go/adbc/go.sum +++ b/go/adbc/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE= cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U= -cloud.google.com/go/auth v0.10.0 h1:tWlkvFAh+wwTOzXIjrwM64karR1iTBZ/GRr0S/DULYo= -cloud.google.com/go/auth v0.10.0/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= +cloud.google.com/go/auth v0.10.1 h1:TnK46qldSfHWt2a0b/hciaiVJsmDXWy9FqyUan0uYiI= +cloud.google.com/go/auth v0.10.1/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk= cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= cloud.google.com/go/bigquery v1.64.0 h1:vSSZisNyhr2ioJE1OuYBQrnrpB7pIhRQm4jfjc7E/js= @@ -296,8 +296,8 @@ golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhS golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= 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/api v0.204.0 h1:3PjmQQEDkR/ENVZZwIYB4W/KzYtN8OrqnNcHWpeR8E4= -google.golang.org/api v0.204.0/go.mod h1:69y8QSoKIbL9F94bWgWAq6wGqGwyjBgi2y8rAK8zLag= +google.golang.org/api v0.205.0 h1:LFaxkAIpDb/GsrWV20dMMo5MR0h8UARTbn24LmD+0Pg= +google.golang.org/api v0.205.0/go.mod h1:NrK1EMqO8Xk6l6QwRAmrXXg2v6dzukhlOyvkYtnvUuc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= From 5c6c865c861f2ac5c49821523b4d2d8dc3b7c051 Mon Sep 17 00:00:00 2001 From: David Li Date: Tue, 12 Nov 2024 22:00:52 -0500 Subject: [PATCH 03/11] chore(dev/release): chmod +x Rust release script (#2322) --- dev/release/post-08-rust.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 dev/release/post-08-rust.sh diff --git a/dev/release/post-08-rust.sh b/dev/release/post-08-rust.sh old mode 100644 new mode 100755 From b0bbbc0a95bb7d7ee9e54aacad9f24cfbe05b715 Mon Sep 17 00:00:00 2001 From: David Li Date: Wed, 13 Nov 2024 02:21:50 -0500 Subject: [PATCH 04/11] chore(dev/release): tweak blog post template (#2324) As suggested at https://github.com/apache/arrow-site/pull/557. --- dev/release/post-12-website.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dev/release/post-12-website.sh b/dev/release/post-12-website.sh index 63d5c99f4f..950ac46f44 100755 --- a/dev/release/post-12-website.sh +++ b/dev/release/post-12-website.sh @@ -66,13 +66,13 @@ limitations under the License. {% endcomment %} --> -The Apache Arrow team is pleased to announce the ${RELEASE} release of -the Apache Arrow ADBC libraries. This covers includes [**${RESOLVED_ISSUES} +The Apache Arrow team is pleased to announce the version ${RELEASE} release of +the Apache Arrow ADBC libraries. This release includes [**${RESOLVED_ISSUES} resolved issues**][1] from [**${contributors} distinct contributors**][2]. -This is a release of the **libraries**, which are at version -${RELEASE}. The **API specification** is versioned separately and is -at version ${spec_version}. +This is a release of the **libraries**, which are at version ${RELEASE}. The +[**API specification**][specification] is versioned separately and is at +version ${spec_version}. The subcomponents are versioned independently: @@ -112,6 +112,7 @@ or the [Arrow mailing lists][5]. [3]: https://github.com/apache/arrow-adbc/blob/apache-arrow-adbc-${RELEASE}/CHANGELOG.md [4]: https://github.com/apache/arrow-adbc/issues [5]: {% link community.md %} +[specification]: https://arrow.apache.org/adbc/${RELEASE}/format/specification.html EOF } From bacc57feadd4d61974a52e7e9c911a7a7e6e7d62 Mon Sep 17 00:00:00 2001 From: Matt Topol Date: Wed, 13 Nov 2024 10:13:14 -0500 Subject: [PATCH 05/11] fix(go/adbc/driver/snowflake): update default values for fetch params (#2325) fixes #2123 --- go/adbc/driver/snowflake/connection.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/adbc/driver/snowflake/connection.go b/go/adbc/driver/snowflake/connection.go index d8371beb7c..04addb1a93 100644 --- a/go/adbc/driver/snowflake/connection.go +++ b/go/adbc/driver/snowflake/connection.go @@ -40,8 +40,8 @@ import ( ) const ( - defaultStatementQueueSize = 200 - defaultPrefetchConcurrency = 10 + defaultStatementQueueSize = 100 + defaultPrefetchConcurrency = 5 queryTemplateGetObjectsAll = "get_objects_all.sql" queryTemplateGetObjectsDbSchemas = "get_objects_dbschemas.sql" From 58e690bfed60804961a85b3d4f9ddac01a84d30f Mon Sep 17 00:00:00 2001 From: David Li Date: Wed, 13 Nov 2024 22:29:34 -0500 Subject: [PATCH 06/11] chore: bump versions for 16 (#2323) --- CHANGELOG.md | 60 +++++++++++++++++++ c/cmake_modules/AdbcVersion.cmake | 2 +- c/meson.build | 2 +- ci/conda/meta.yaml | 3 +- ci/linux-packages/debian/control | 22 +++---- ...ll => libadbc-driver-flightsql104.install} | 0 ...tall => libadbc-driver-manager104.install} | 0 ...l => libadbc-driver-postgresql104.install} | 0 ...ll => libadbc-driver-snowflake104.install} | 0 ...stall => libadbc-driver-sqlite104.install} | 0 csharp/Directory.Build.props | 2 +- dev/release/versions.env | 18 +++--- docs/source/conf.py | 2 +- glib/meson.build | 2 +- java/core/pom.xml | 2 +- java/driver-manager/pom.xml | 2 +- java/driver/flight-sql-validation/pom.xml | 2 +- java/driver/flight-sql/pom.xml | 2 +- java/driver/jdbc-validation-derby/pom.xml | 2 +- .../jdbc-validation-mssqlserver/pom.xml | 2 +- .../driver/jdbc-validation-postgresql/pom.xml | 2 +- java/driver/jdbc/pom.xml | 2 +- java/driver/validation/pom.xml | 2 +- java/pom.xml | 2 +- java/sql/pom.xml | 2 +- .../adbc_driver_bigquery/_static_version.py | 2 +- .../adbc_driver_flightsql/_static_version.py | 2 +- .../adbc_driver_manager/_static_version.py | 2 +- .../adbc_driver_postgresql/_static_version.py | 2 +- .../adbc_driver_snowflake/_static_version.py | 2 +- .../adbc_driver_sqlite/_static_version.py | 2 +- r/adbcbigquery/DESCRIPTION | 2 +- r/adbcdrivermanager/DESCRIPTION | 2 +- r/adbcflightsql/DESCRIPTION | 2 +- r/adbcpostgresql/DESCRIPTION | 2 +- r/adbcsnowflake/DESCRIPTION | 2 +- r/adbcsqlite/DESCRIPTION | 2 +- ruby/lib/adbc/version.rb | 2 +- rust/Cargo.lock | 6 +- rust/Cargo.toml | 2 +- 40 files changed, 114 insertions(+), 55 deletions(-) rename ci/linux-packages/debian/{libadbc-driver-flightsql103.install => libadbc-driver-flightsql104.install} (100%) rename ci/linux-packages/debian/{libadbc-driver-manager103.install => libadbc-driver-manager104.install} (100%) rename ci/linux-packages/debian/{libadbc-driver-postgresql103.install => libadbc-driver-postgresql104.install} (100%) rename ci/linux-packages/debian/{libadbc-driver-snowflake103.install => libadbc-driver-snowflake104.install} (100%) rename ci/linux-packages/debian/{libadbc-driver-sqlite103.install => libadbc-driver-sqlite104.install} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2805d519f6..eb3a26b093 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -699,3 +699,63 @@ - **ci**: update website_build.sh for new versioning scheme (#1972) - **dev/release**: update C# tag (#1973) - **c/vendor/nanoarrow**: Fix -Wreorder warning (#1966) + +## ADBC Libraries 15 (2024-11-08) + +### Versions + +- C/C++/GLib/Go/Python/Ruby: 1.3.0 +- C#: 0.15.0 +- Java: 0.15.0 +- R: 0.15.0 +- Rust: 0.15.0 + +### Feat + +- **c/driver/postgresql**: Enable basic connect/query workflow for Redshift (#2219) +- **rust/drivers/datafusion**: add support for bulk ingest (#2279) +- **csharp/src/Drivers/Apache**: convert Double to Float for Apache Spark on scalar conversion (#2296) +- **go/adbc/driver/snowflake**: update to the latest 1.12.0 gosnowflake driver (#2298) +- **csharp/src/Drivers/BigQuery**: support max stream count setting when creating read session (#2289) +- **rust/drivers**: adbc driver for datafusion (#2267) +- **go/adbc/driver/snowflake**: improve GetObjects performance and semantics (#2254) +- **c**: Implement ingestion and testing for float16, string_view, and binary_view (#2234) +- **r**: Add R BigQuery driver wrapper (#2235) +- **csharp/src/Drivers/Apache/Spark**: add request_timeout_ms option to allow longer HTTP request length (#2218) +- **go/adbc/driver/snowflake**: add support for a client config file (#2197) +- **csharp/src/Client**: Additional parameter support for DbCommand (#2195) +- **csharp/src/Drivers/Apache/Spark**: add option to ignore TLS/SSL certificate exceptions (#2188) +- **csharp/src/Drivers/Apache/Spark**: Perform scalar data type conversion for Spark over HTTP (#2152) +- **csharp/src/Drivers/Apache/Spark**: Azure HDInsight Spark Documentation (#2164) +- **c/driver/postgresql**: Implement ingestion of list types for PostgreSQL (#2153) +- **csharp/src/Drivers/Apache/Spark**: poc - Support for Apache Spark over HTTP (non-Arrow) (#2018) +- **c/driver/postgresql**: add `arrow.opaque` type metadata (#2122) + +### Fix + +- **csharp/src/Drivers/Apache**: fix float data type handling for tests on Databricks Spark (#2283) +- **go/adbc/driver/internal/driverbase**: proper unmarshalling for ConstraintColumnNames (#2285) +- **csharp/src/Drivers/Apache**: fix to workaround concurrency issue (#2282) +- **csharp/src/Drivers/Apache**: correctly handle empty response and add Client tests (#2275) +- **csharp/src/Drivers/Apache**: remove interleaved async look-ahead code (#2273) +- **c/driver_manager**: More robust error reporting for errors that occur before AdbcDatabaseInit() (#2266) +- **rust**: implement database/connection constructors without options (#2242) +- **csharp/src/Drivers**: update System.Text.Json to version 8.0.5 because of known vulnerability (#2238) +- **csharp/src/Drivers/Apache/Spark**: correct batch handling for the HiveServer2Reader (#2215) +- **go/adbc/driver/snowflake**: call GetObjects with null catalog at catalog depth (#2194) +- **csharp/src/Drivers/Apache/Spark**: correct BatchSize implementation for base reader (#2199) +- **csharp/src/Drivers/Apache/Spark**: correct precision/scale handling with zeros in fractional portion (#2198) +- **csharp/src/Drivers/BigQuery**: Fixed GBQ driver issue when results.TableReference is null (#2165) +- **go/adbc/driver/snowflake**: fix setting database and schema context after initial connection (#2169) +- **csharp/src/Drivers/Interop/Snowflake**: add test to demonstrate DEFAULT_ROLE behavior (#2151) +- **c/driver/postgresql**: Improve error reporting for queries that error before the COPY header is sent (#2134) + +### Refactor + +- **c/driver/postgresql**: cleanups for result_helper signatures (#2261) +- **c/driver/postgresql**: Use GetObjectsHelper from framework to build objects (#2189) +- **csharp/src/Drivers/Apache/Spark**: use UTF8 string for data conversion, instead of .NET String (#2192) +- **c/driver/postgresql**: Use Status for error handling in BindStream (#2187) +- **c/driver/postgresql**: Use Status instead of AdbcStatusCode/AdbcError in result helper (#2178) +- **c/driver**: Use non-objects framework components in Postgres driver (#2166) +- **c/driver/postgresql**: Use copy writer in BindStream for parameter binding (#2157) diff --git a/c/cmake_modules/AdbcVersion.cmake b/c/cmake_modules/AdbcVersion.cmake index 4b0c3147ed..fcb67c08c5 100644 --- a/c/cmake_modules/AdbcVersion.cmake +++ b/c/cmake_modules/AdbcVersion.cmake @@ -21,7 +21,7 @@ # ------------------------------------------------------------ # Version definitions -set(ADBC_VERSION "1.3.0-SNAPSHOT") +set(ADBC_VERSION "1.4.0-SNAPSHOT") string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" ADBC_BASE_VERSION "${ADBC_VERSION}") string(REPLACE "." ";" _adbc_version_list "${ADBC_BASE_VERSION}") list(GET _adbc_version_list 0 ADBC_VERSION_MAJOR) diff --git a/c/meson.build b/c/meson.build index 98da3a4618..b5b9fbce70 100644 --- a/c/meson.build +++ b/c/meson.build @@ -18,7 +18,7 @@ project( 'arrow-adbc', 'c', 'cpp', - version: '1.3.0-SNAPSHOT', + version: '1.4.0-SNAPSHOT', license: 'Apache-2.0', meson_version: '>=1.3.0', default_options: [ diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml index 9ccab00c35..ac109997a2 100644 --- a/ci/conda/meta.yaml +++ b/ci/conda/meta.yaml @@ -17,8 +17,7 @@ package: name: arrow-adbc-split - # TODO: this needs to get bumped by the release process - version: 1.3.0 + version: 1.4.0 source: path: ../../ diff --git a/ci/linux-packages/debian/control b/ci/linux-packages/debian/control index 72159dde27..04e09dd685 100644 --- a/ci/linux-packages/debian/control +++ b/ci/linux-packages/debian/control @@ -34,7 +34,7 @@ Build-Depends: Standards-Version: 4.5.0 Homepage: https://arrow.apache.org/adbc/ -Package: libadbc-driver-manager103 +Package: libadbc-driver-manager104 Section: libs Architecture: any Multi-Arch: same @@ -52,12 +52,12 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libadbc-driver-manager103 (= ${binary:Version}) + libadbc-driver-manager104 (= ${binary:Version}) Description: Apache Arrow Database Connectivity (ADBC) driver manager . This package provides C++ header files. -Package: libadbc-driver-postgresql103 +Package: libadbc-driver-postgresql104 Section: libs Architecture: any Multi-Arch: same @@ -75,12 +75,12 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libadbc-driver-postgresql103 (= ${binary:Version}) + libadbc-driver-postgresql104 (= ${binary:Version}) Description: Apache Arrow Database Connectivity (ADBC) PostgreSQL driver . This package provides CMake package, pkg-config package and so on. -Package: libadbc-driver-sqlite103 +Package: libadbc-driver-sqlite104 Section: libs Architecture: any Multi-Arch: same @@ -98,12 +98,12 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libadbc-driver-sqlite103 (= ${binary:Version}) + libadbc-driver-sqlite104 (= ${binary:Version}) Description: Apache Arrow Database Connectivity (ADBC) SQLite driver . This package provides CMake package, pkg-config package and so on. -Package: libadbc-driver-flightsql103 +Package: libadbc-driver-flightsql104 Section: libs Architecture: any Multi-Arch: same @@ -121,12 +121,12 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libadbc-driver-flightsql103 (= ${binary:Version}) + libadbc-driver-flightsql104 (= ${binary:Version}) Description: Apache Arrow Database Connectivity (ADBC) Flight SQL driver . This package provides CMake package, pkg-config package and so on. -Package: libadbc-driver-snowflake103 +Package: libadbc-driver-snowflake104 Section: libs Architecture: any Multi-Arch: same @@ -144,7 +144,7 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libadbc-driver-snowflake103 (= ${binary:Version}) + libadbc-driver-snowflake104 (= ${binary:Version}) Description: Apache Arrow Database Connectivity (ADBC) Snowflake driver . This package provides CMake package, pkg-config package and so on. @@ -158,7 +158,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, - libadbc-driver-manager103 (= ${binary:Version}) + libadbc-driver-manager104 (= ${binary:Version}) Description: Apache Arrow Database Connectivity (ADBC) driver manager . This package provides GLib based library files. diff --git a/ci/linux-packages/debian/libadbc-driver-flightsql103.install b/ci/linux-packages/debian/libadbc-driver-flightsql104.install similarity index 100% rename from ci/linux-packages/debian/libadbc-driver-flightsql103.install rename to ci/linux-packages/debian/libadbc-driver-flightsql104.install diff --git a/ci/linux-packages/debian/libadbc-driver-manager103.install b/ci/linux-packages/debian/libadbc-driver-manager104.install similarity index 100% rename from ci/linux-packages/debian/libadbc-driver-manager103.install rename to ci/linux-packages/debian/libadbc-driver-manager104.install diff --git a/ci/linux-packages/debian/libadbc-driver-postgresql103.install b/ci/linux-packages/debian/libadbc-driver-postgresql104.install similarity index 100% rename from ci/linux-packages/debian/libadbc-driver-postgresql103.install rename to ci/linux-packages/debian/libadbc-driver-postgresql104.install diff --git a/ci/linux-packages/debian/libadbc-driver-snowflake103.install b/ci/linux-packages/debian/libadbc-driver-snowflake104.install similarity index 100% rename from ci/linux-packages/debian/libadbc-driver-snowflake103.install rename to ci/linux-packages/debian/libadbc-driver-snowflake104.install diff --git a/ci/linux-packages/debian/libadbc-driver-sqlite103.install b/ci/linux-packages/debian/libadbc-driver-sqlite104.install similarity index 100% rename from ci/linux-packages/debian/libadbc-driver-sqlite103.install rename to ci/linux-packages/debian/libadbc-driver-sqlite104.install diff --git a/csharp/Directory.Build.props b/csharp/Directory.Build.props index 63bd4af6dc..c771bc43b8 100644 --- a/csharp/Directory.Build.props +++ b/csharp/Directory.Build.props @@ -29,7 +29,7 @@ Apache Arrow ADBC library Copyright 2022-2024 The Apache Software Foundation The Apache Software Foundation - 0.15.0 + 0.16.0 SNAPSHOT diff --git a/dev/release/versions.env b/dev/release/versions.env index 0a873a8eab..8021f118e2 100644 --- a/dev/release/versions.env +++ b/dev/release/versions.env @@ -17,18 +17,18 @@ # The release as a whole has a counter-based identifier (as in, 12 is the # 12th release of ADBC). This is used to identify tags, branches, and so on. -RELEASE="15" -PREVIOUS_RELEASE="14" +RELEASE="16" +PREVIOUS_RELEASE="15" # Individual components will have a SemVer. -VERSION_CSHARP="0.15.0" -VERSION_JAVA="0.15.0" +VERSION_CSHARP="0.16.0" +VERSION_JAVA="0.16.0" # Because C++/GLib/Go/Python/Ruby are effectively tied at the hip, they share # a single version number. Also covers Conda/Linux packages. -VERSION_NATIVE="1.3.0" -VERSION_R="0.15.0" -VERSION_RUST="0.15.0" +VERSION_NATIVE="1.4.0" +VERSION_R="0.16.0" +VERSION_RUST="0.16.0" # Required by the version bump script -PREVIOUS_VERSION_NATIVE="1.2.0" -PREVIOUS_VERSION_R="0.14.0" +PREVIOUS_VERSION_NATIVE="1.3.0" +PREVIOUS_VERSION_R="0.15.0" diff --git a/docs/source/conf.py b/docs/source/conf.py index 18779ced9d..86bb6371e2 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -30,7 +30,7 @@ registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.""" author = "the Apache Arrow Developers" -release = "15 (dev)" +release = "16 (dev)" # Needed to generate version switcher version = release diff --git a/glib/meson.build b/glib/meson.build index 6198996eb2..a9ab66267b 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -23,7 +23,7 @@ project('adbc-glib', 'c_std=c99', ], license: 'Apache-2.0', - version: '1.3.0-SNAPSHOT') + version: '1.4.0-SNAPSHOT') version_numbers = meson.project_version().split('-')[0].split('.') version_major = version_numbers[0].to_int() diff --git a/java/core/pom.xml b/java/core/pom.xml index 8fb158cd3a..241e70b966 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -22,7 +22,7 @@ org.apache.arrow.adbc arrow-adbc-java-root - 0.15.0-SNAPSHOT + 0.16.0-SNAPSHOT adbc-core diff --git a/java/driver-manager/pom.xml b/java/driver-manager/pom.xml index 9a2e1d9664..db0470d51a 100644 --- a/java/driver-manager/pom.xml +++ b/java/driver-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.arrow.adbc arrow-adbc-java-root - 0.15.0-SNAPSHOT + 0.16.0-SNAPSHOT adbc-driver-manager diff --git a/java/driver/flight-sql-validation/pom.xml b/java/driver/flight-sql-validation/pom.xml index 9cf92bc189..623a35a4f1 100644 --- a/java/driver/flight-sql-validation/pom.xml +++ b/java/driver/flight-sql-validation/pom.xml @@ -22,7 +22,7 @@ org.apache.arrow.adbc arrow-adbc-java-root - 0.15.0-SNAPSHOT + 0.16.0-SNAPSHOT ../../pom.xml diff --git a/java/driver/flight-sql/pom.xml b/java/driver/flight-sql/pom.xml index 49d79b114d..683371435f 100644 --- a/java/driver/flight-sql/pom.xml +++ b/java/driver/flight-sql/pom.xml @@ -22,7 +22,7 @@ org.apache.arrow.adbc arrow-adbc-java-root - 0.15.0-SNAPSHOT + 0.16.0-SNAPSHOT ../../pom.xml diff --git a/java/driver/jdbc-validation-derby/pom.xml b/java/driver/jdbc-validation-derby/pom.xml index 7b9c60bfa9..608127b43c 100644 --- a/java/driver/jdbc-validation-derby/pom.xml +++ b/java/driver/jdbc-validation-derby/pom.xml @@ -22,7 +22,7 @@ org.apache.arrow.adbc arrow-adbc-java-root - 0.15.0-SNAPSHOT + 0.16.0-SNAPSHOT ../../pom.xml diff --git a/java/driver/jdbc-validation-mssqlserver/pom.xml b/java/driver/jdbc-validation-mssqlserver/pom.xml index 3a23709249..b50a88ad02 100644 --- a/java/driver/jdbc-validation-mssqlserver/pom.xml +++ b/java/driver/jdbc-validation-mssqlserver/pom.xml @@ -22,7 +22,7 @@ org.apache.arrow.adbc arrow-adbc-java-root - 0.15.0-SNAPSHOT + 0.16.0-SNAPSHOT ../../pom.xml diff --git a/java/driver/jdbc-validation-postgresql/pom.xml b/java/driver/jdbc-validation-postgresql/pom.xml index 85cd0f0591..c7b4f021c0 100644 --- a/java/driver/jdbc-validation-postgresql/pom.xml +++ b/java/driver/jdbc-validation-postgresql/pom.xml @@ -22,7 +22,7 @@ org.apache.arrow.adbc arrow-adbc-java-root - 0.15.0-SNAPSHOT + 0.16.0-SNAPSHOT ../../pom.xml diff --git a/java/driver/jdbc/pom.xml b/java/driver/jdbc/pom.xml index 8803989598..01e25ef59d 100644 --- a/java/driver/jdbc/pom.xml +++ b/java/driver/jdbc/pom.xml @@ -22,7 +22,7 @@ org.apache.arrow.adbc arrow-adbc-java-root - 0.15.0-SNAPSHOT + 0.16.0-SNAPSHOT ../../pom.xml diff --git a/java/driver/validation/pom.xml b/java/driver/validation/pom.xml index 9f25bfbd5d..8abda03716 100644 --- a/java/driver/validation/pom.xml +++ b/java/driver/validation/pom.xml @@ -22,7 +22,7 @@ org.apache.arrow.adbc arrow-adbc-java-root - 0.15.0-SNAPSHOT + 0.16.0-SNAPSHOT ../../pom.xml diff --git a/java/pom.xml b/java/pom.xml index 3f4aee32ef..e8422309d6 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -28,7 +28,7 @@ org.apache.arrow.adbc arrow-adbc-java-root - 0.15.0-SNAPSHOT + 0.16.0-SNAPSHOT pom Apache Arrow ADBC Java Root POM diff --git a/java/sql/pom.xml b/java/sql/pom.xml index 6863046bb8..f91d1b0dd6 100644 --- a/java/sql/pom.xml +++ b/java/sql/pom.xml @@ -22,7 +22,7 @@ org.apache.arrow.adbc arrow-adbc-java-root - 0.15.0-SNAPSHOT + 0.16.0-SNAPSHOT adbc-sql diff --git a/python/adbc_driver_bigquery/adbc_driver_bigquery/_static_version.py b/python/adbc_driver_bigquery/adbc_driver_bigquery/_static_version.py index 40da5e6719..dbae819ca2 100644 --- a/python/adbc_driver_bigquery/adbc_driver_bigquery/_static_version.py +++ b/python/adbc_driver_bigquery/adbc_driver_bigquery/_static_version.py @@ -20,7 +20,7 @@ # This file is part of 'miniver': https://github.com/jbweston/miniver -version = "1.3.0dev" +version = "1.4.0dev" # These values are only set if the distribution was created with 'git archive' # NOTE: must add an export-subst to .gitattributes! diff --git a/python/adbc_driver_flightsql/adbc_driver_flightsql/_static_version.py b/python/adbc_driver_flightsql/adbc_driver_flightsql/_static_version.py index 40da5e6719..dbae819ca2 100644 --- a/python/adbc_driver_flightsql/adbc_driver_flightsql/_static_version.py +++ b/python/adbc_driver_flightsql/adbc_driver_flightsql/_static_version.py @@ -20,7 +20,7 @@ # This file is part of 'miniver': https://github.com/jbweston/miniver -version = "1.3.0dev" +version = "1.4.0dev" # These values are only set if the distribution was created with 'git archive' # NOTE: must add an export-subst to .gitattributes! diff --git a/python/adbc_driver_manager/adbc_driver_manager/_static_version.py b/python/adbc_driver_manager/adbc_driver_manager/_static_version.py index 40da5e6719..dbae819ca2 100644 --- a/python/adbc_driver_manager/adbc_driver_manager/_static_version.py +++ b/python/adbc_driver_manager/adbc_driver_manager/_static_version.py @@ -20,7 +20,7 @@ # This file is part of 'miniver': https://github.com/jbweston/miniver -version = "1.3.0dev" +version = "1.4.0dev" # These values are only set if the distribution was created with 'git archive' # NOTE: must add an export-subst to .gitattributes! diff --git a/python/adbc_driver_postgresql/adbc_driver_postgresql/_static_version.py b/python/adbc_driver_postgresql/adbc_driver_postgresql/_static_version.py index 40da5e6719..dbae819ca2 100644 --- a/python/adbc_driver_postgresql/adbc_driver_postgresql/_static_version.py +++ b/python/adbc_driver_postgresql/adbc_driver_postgresql/_static_version.py @@ -20,7 +20,7 @@ # This file is part of 'miniver': https://github.com/jbweston/miniver -version = "1.3.0dev" +version = "1.4.0dev" # These values are only set if the distribution was created with 'git archive' # NOTE: must add an export-subst to .gitattributes! diff --git a/python/adbc_driver_snowflake/adbc_driver_snowflake/_static_version.py b/python/adbc_driver_snowflake/adbc_driver_snowflake/_static_version.py index 40da5e6719..dbae819ca2 100644 --- a/python/adbc_driver_snowflake/adbc_driver_snowflake/_static_version.py +++ b/python/adbc_driver_snowflake/adbc_driver_snowflake/_static_version.py @@ -20,7 +20,7 @@ # This file is part of 'miniver': https://github.com/jbweston/miniver -version = "1.3.0dev" +version = "1.4.0dev" # These values are only set if the distribution was created with 'git archive' # NOTE: must add an export-subst to .gitattributes! diff --git a/python/adbc_driver_sqlite/adbc_driver_sqlite/_static_version.py b/python/adbc_driver_sqlite/adbc_driver_sqlite/_static_version.py index 40da5e6719..dbae819ca2 100644 --- a/python/adbc_driver_sqlite/adbc_driver_sqlite/_static_version.py +++ b/python/adbc_driver_sqlite/adbc_driver_sqlite/_static_version.py @@ -20,7 +20,7 @@ # This file is part of 'miniver': https://github.com/jbweston/miniver -version = "1.3.0dev" +version = "1.4.0dev" # These values are only set if the distribution was created with 'git archive' # NOTE: must add an export-subst to .gitattributes! diff --git a/r/adbcbigquery/DESCRIPTION b/r/adbcbigquery/DESCRIPTION index cdfdb71348..56fbe2de03 100644 --- a/r/adbcbigquery/DESCRIPTION +++ b/r/adbcbigquery/DESCRIPTION @@ -1,6 +1,6 @@ Package: adbcbigquery Title: 'Arrow' Database Connectivity ('ADBC') 'BigQuery' Driver -Version: 0.14.0.9000 +Version: 0.15.0.9000 Authors@R: c( person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9415-4582")), diff --git a/r/adbcdrivermanager/DESCRIPTION b/r/adbcdrivermanager/DESCRIPTION index d57c0b49c0..fe79fb035e 100644 --- a/r/adbcdrivermanager/DESCRIPTION +++ b/r/adbcdrivermanager/DESCRIPTION @@ -1,6 +1,6 @@ Package: adbcdrivermanager Title: 'Arrow' Database Connectivity ('ADBC') Driver Manager -Version: 0.14.0.9000 +Version: 0.15.0.9000 Authors@R: c( person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9415-4582")), diff --git a/r/adbcflightsql/DESCRIPTION b/r/adbcflightsql/DESCRIPTION index 4480fbf141..9ec865b126 100644 --- a/r/adbcflightsql/DESCRIPTION +++ b/r/adbcflightsql/DESCRIPTION @@ -1,6 +1,6 @@ Package: adbcflightsql Title: 'Arrow' Database Connectivity ('ADBC') 'FlightSQL' Driver -Version: 0.14.0.9000 +Version: 0.15.0.9000 Authors@R: c( person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9415-4582")), diff --git a/r/adbcpostgresql/DESCRIPTION b/r/adbcpostgresql/DESCRIPTION index a7fd93da41..fdc0fee4ee 100644 --- a/r/adbcpostgresql/DESCRIPTION +++ b/r/adbcpostgresql/DESCRIPTION @@ -1,6 +1,6 @@ Package: adbcpostgresql Title: 'Arrow' Database Connectivity ('ADBC') 'PostgreSQL' Driver -Version: 0.14.0.9000 +Version: 0.15.0.9000 Authors@R: c( person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9415-4582")), diff --git a/r/adbcsnowflake/DESCRIPTION b/r/adbcsnowflake/DESCRIPTION index 6676378dfe..9788fdd3e4 100644 --- a/r/adbcsnowflake/DESCRIPTION +++ b/r/adbcsnowflake/DESCRIPTION @@ -1,6 +1,6 @@ Package: adbcsnowflake Title: Arrow Database Connectivity ('ADBC') 'Snowflake' Driver -Version: 0.14.0.9000 +Version: 0.15.0.9000 Authors@R: c( person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9415-4582")), diff --git a/r/adbcsqlite/DESCRIPTION b/r/adbcsqlite/DESCRIPTION index 55d53d8f31..405863326d 100644 --- a/r/adbcsqlite/DESCRIPTION +++ b/r/adbcsqlite/DESCRIPTION @@ -1,6 +1,6 @@ Package: adbcsqlite Title: 'Arrow' Database Connectivity ('ADBC') 'SQLite' Driver -Version: 0.14.0.9000 +Version: 0.15.0.9000 Authors@R: c( person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9415-4582")), diff --git a/ruby/lib/adbc/version.rb b/ruby/lib/adbc/version.rb index f99e8c1ece..fba2eed3cb 100644 --- a/ruby/lib/adbc/version.rb +++ b/ruby/lib/adbc/version.rb @@ -16,7 +16,7 @@ # under the License. module ADBC - VERSION = "1.3.0-SNAPSHOT" + VERSION = "1.4.0-SNAPSHOT" module Version MAJOR, MINOR, MICRO, TAG = VERSION.split(".").collect(&:to_i) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index f67151e71f..7339324fa0 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "adbc_core" -version = "0.15.0" +version = "0.16.0" dependencies = [ "arrow-array", "arrow-schema", @@ -15,7 +15,7 @@ dependencies = [ [[package]] name = "adbc_datafusion" -version = "0.15.0" +version = "0.16.0" dependencies = [ "adbc_core", "arrow-array", @@ -30,7 +30,7 @@ dependencies = [ [[package]] name = "adbc_dummy" -version = "0.15.0" +version = "0.16.0" dependencies = [ "adbc_core", "arrow-array", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 31174d19a8..c314b6c449 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -20,7 +20,7 @@ members = ["core", "drivers/*"] resolver = "2" [workspace.package] -version = "0.15.0" +version = "0.16.0" description = "Rust implementation of Arrow Database Connectivity (ADBC)" edition = "2021" authors = ["Apache Arrow "] From 2244dd8b53b1256c81fe19d3df5e20cf75f7bc46 Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 14 Nov 2024 21:14:14 -0500 Subject: [PATCH 07/11] chore(c): fix some warnings reported by MSVC (#2327) Noted in https://github.com/conda-forge/arrow-adbc-split-feedstock/pull/17 --- c/cmake_modules/AdbcDefines.cmake | 2 + c/driver/framework/base_driver.h | 6 ++- c/driver/framework/utility.cc | 1 - c/driver/postgresql/connection.cc | 3 +- c/driver/postgresql/database.cc | 8 +-- c/driver/postgresql/result_helper.cc | 6 +-- c/driver/postgresql/result_reader.cc | 4 +- c/driver/postgresql/statement.cc | 13 ++--- c/driver/sqlite/sqlite.cc | 6 +-- c/driver/sqlite/statement_reader.c | 26 +++++----- go/adbc/drivermgr/adbc_driver_manager.cc | 63 +++++++++++++++++++----- 11 files changed, 92 insertions(+), 46 deletions(-) diff --git a/c/cmake_modules/AdbcDefines.cmake b/c/cmake_modules/AdbcDefines.cmake index 6c83cca54c..d27cb8fb3d 100644 --- a/c/cmake_modules/AdbcDefines.cmake +++ b/c/cmake_modules/AdbcDefines.cmake @@ -93,7 +93,9 @@ if(MSVC) # Don't warn about padding added after members add_compile_options(/wd4820) add_compile_options(/wd5027) + add_compile_options(/wd5039) add_compile_options(/wd5045) + add_compile_options(/wd5246) elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") diff --git a/c/driver/framework/base_driver.h b/c/driver/framework/base_driver.h index eecb506ee2..f379121b66 100644 --- a/c/driver/framework/base_driver.h +++ b/c/driver/framework/base_driver.h @@ -116,8 +116,9 @@ class Option { "': trailing data", value); } return parsed; + } else { + return status::InvalidArgument("Invalid integer value ", this->Format()); } - return status::InvalidArgument("Invalid integer value ", this->Format()); }, value_); } @@ -129,8 +130,9 @@ class Option { using T = std::decay_t; if constexpr (std::is_same_v) { return value; + } else { + return status::InvalidArgument("Invalid string value ", this->Format()); } - return status::InvalidArgument("Invalid string value ", this->Format()); }, value_); } diff --git a/c/driver/framework/utility.cc b/c/driver/framework/utility.cc index cbcd8bb54b..d281776e59 100644 --- a/c/driver/framework/utility.cc +++ b/c/driver/framework/utility.cc @@ -163,7 +163,6 @@ Status MakeGetInfoStream(const std::vector& infos, ArrowArrayStream* } else { static_assert(!sizeof(T), "info value type not implemented"); } - return status::Ok(); }, info.value)); UNWRAP_ERRNO(Internal, ArrowArrayFinishElement(array.get())); diff --git a/c/driver/postgresql/connection.cc b/c/driver/postgresql/connection.cc index b5f12ca73f..0f46fff0d7 100644 --- a/c/driver/postgresql/connection.cc +++ b/c/driver/postgresql/connection.cc @@ -300,7 +300,8 @@ class PostgresGetObjectsHelper : public adbc::driver::GetObjectsHelper { Column col; col.column_name = next_column_[0].value(); - UNWRAP_RESULT(col.ordinal_position, next_column_[1].ParseInteger()); + UNWRAP_RESULT(int64_t ordinal_position, next_column_[1].ParseInteger()); + col.ordinal_position = static_cast(ordinal_position); if (!next_column_[2].is_null) { col.remarks = next_column_[2].value(); } diff --git a/c/driver/postgresql/database.cc b/c/driver/postgresql/database.cc index cdbad7535f..1bd7444884 100644 --- a/c/driver/postgresql/database.cc +++ b/c/driver/postgresql/database.cc @@ -294,7 +294,7 @@ static Status InsertPgAttributeResult( UNWRAP_RESULT(int64_t col_oid, item[2].ParseInteger()); if (type_oid != current_type_oid && !columns.empty()) { - resolver->InsertClass(current_type_oid, columns); + resolver->InsertClass(static_cast(current_type_oid), columns); columns.clear(); current_type_oid = type_oid; } @@ -347,12 +347,12 @@ static Status InsertPgTypeResult(const PqResultHelper& result, type_item.class_oid = static_cast(typrelid); type_item.base_oid = static_cast(typbasetype); - int result = resolver->Insert(type_item, nullptr); + int insert_result = resolver->Insert(type_item, nullptr); // If there's an array type and the insert succeeded, add that now too - if (result == NANOARROW_OK && typarray != 0) { + if (insert_result == NANOARROW_OK && typarray != 0) { std::string array_typname = "_" + std::string(typname); - type_item.oid = typarray; + type_item.oid = static_cast(typarray); type_item.typname = array_typname.c_str(); type_item.typreceive = "array_recv"; type_item.child_oid = static_cast(oid); diff --git a/c/driver/postgresql/result_helper.cc b/c/driver/postgresql/result_helper.cc index 6dd7527a0e..48c6804883 100644 --- a/c/driver/postgresql/result_helper.cc +++ b/c/driver/postgresql/result_helper.cc @@ -46,7 +46,7 @@ Status PqResultHelper::PrepareInternal(int n_params, const Oid* param_oids) cons Status PqResultHelper::Prepare() const { return PrepareInternal(0, nullptr); } Status PqResultHelper::Prepare(const std::vector& param_oids) const { - return PrepareInternal(param_oids.size(), param_oids.data()); + return PrepareInternal(static_cast(param_oids.size()), param_oids.data()); } Status PqResultHelper::DescribePrepared() { @@ -90,8 +90,8 @@ Status PqResultHelper::Execute(const std::vector& params, } ClearResult(); - result_ = PQexecParams(conn_, query_.c_str(), param_values.size(), param_oids_ptr, - param_values.data(), param_lengths.data(), + result_ = PQexecParams(conn_, query_.c_str(), static_cast(param_values.size()), + param_oids_ptr, param_values.data(), param_lengths.data(), param_formats.data(), static_cast(output_format_)); } diff --git a/c/driver/postgresql/result_reader.cc b/c/driver/postgresql/result_reader.cc index 464bad74a7..61d17bb038 100644 --- a/c/driver/postgresql/result_reader.cc +++ b/c/driver/postgresql/result_reader.cc @@ -100,8 +100,8 @@ int PqResultArrayReader::GetNext(struct ArrowArray* out) { item.size_bytes = pg_item.len; } - NANOARROW_RETURN_NOT_OK( - field_readers_[i]->Read(&item, item.size_bytes, tmp->children[i], &na_error_)); + NANOARROW_RETURN_NOT_OK(field_readers_[i]->Read( + &item, static_cast(item.size_bytes), tmp->children[i], &na_error_)); } } diff --git a/c/driver/postgresql/statement.cc b/c/driver/postgresql/statement.cc index 129ddebff8..9518e378eb 100644 --- a/c/driver/postgresql/statement.cc +++ b/c/driver/postgresql/statement.cc @@ -546,22 +546,23 @@ AdbcStatusCode PostgresStatement::ExecuteSchema(struct ArrowSchema* schema, PqResultHelper helper(connection_->conn(), query_); if (bind_.release) { - nanoarrow::UniqueSchema schema; + nanoarrow::UniqueSchema param_schema; struct ArrowError na_error; ArrowErrorInit(&na_error); - CHECK_NA_DETAIL(INTERNAL, ArrowArrayStreamGetSchema(&bind_, schema.get(), &na_error), + CHECK_NA_DETAIL(INTERNAL, + ArrowArrayStreamGetSchema(&bind_, param_schema.get(), &na_error), &na_error, error); - if (std::string(schema->format) != "+s") { + if (std::string(param_schema->format) != "+s") { SetError(error, "%s", "[libpq] Bind parameters must have type STRUCT"); return ADBC_STATUS_INVALID_STATE; } - std::vector param_oids(schema->n_children); - for (int64_t i = 0; i < schema->n_children; i++) { + std::vector param_oids(param_schema->n_children); + for (int64_t i = 0; i < param_schema->n_children; i++) { PostgresType pg_type; CHECK_NA_DETAIL(INTERNAL, - PostgresType::FromSchema(*type_resolver_, schema->children[i], + PostgresType::FromSchema(*type_resolver_, param_schema->children[i], &pg_type, &na_error), &na_error, error); param_oids[i] = pg_type.oid(); diff --git a/c/driver/sqlite/sqlite.cc b/c/driver/sqlite/sqlite.cc index a5186d00b7..6348b5ce31 100644 --- a/c/driver/sqlite/sqlite.cc +++ b/c/driver/sqlite/sqlite.cc @@ -150,7 +150,7 @@ class SqliteQuery { return Close(rc); } - Status Close(int rc) { + Status Close(int last_rc) { if (stmt_) { int rc = sqlite3_finalize(stmt_); stmt_ = nullptr; @@ -158,7 +158,7 @@ class SqliteQuery { return status::fmt::Internal("failed to execute: {}\nquery was: {}", sqlite3_errmsg(conn_), query_); } - } else if (rc != SQLITE_OK) { + } else if (last_rc != SQLITE_OK) { return status::fmt::Internal("failed to execute: {}\nquery was: {}", sqlite3_errmsg(conn_), query_); } @@ -192,7 +192,7 @@ class SqliteQuery { UNWRAP_RESULT(bool has_row, q.Next()); if (!has_row) break; - int rc = std::forward(row_func)(q.stmt_); + rc = std::forward(row_func)(q.stmt_); if (rc != SQLITE_OK) break; } return q.Close(); diff --git a/c/driver/sqlite/statement_reader.c b/c/driver/sqlite/statement_reader.c index f73151673d..69f90ebd68 100644 --- a/c/driver/sqlite/statement_reader.c +++ b/c/driver/sqlite/statement_reader.c @@ -334,8 +334,8 @@ AdbcStatusCode AdbcSqliteBinderBindNext(struct AdbcSqliteBinder* binder, sqlite3 case NANOARROW_TYPE_BINARY_VIEW: { struct ArrowBufferView value = ArrowArrayViewGetBytesUnsafe(binder->batch.children[col], binder->next_row); - status = sqlite3_bind_blob(stmt, col + 1, value.data.as_char, value.size_bytes, - SQLITE_STATIC); + status = sqlite3_bind_blob(stmt, col + 1, value.data.as_char, + (int)value.size_bytes, SQLITE_STATIC); break; } case NANOARROW_TYPE_BOOL: @@ -377,8 +377,8 @@ AdbcStatusCode AdbcSqliteBinderBindNext(struct AdbcSqliteBinder* binder, sqlite3 case NANOARROW_TYPE_STRING_VIEW: { struct ArrowBufferView value = ArrowArrayViewGetBytesUnsafe(binder->batch.children[col], binder->next_row); - status = sqlite3_bind_text(stmt, col + 1, value.data.as_char, value.size_bytes, - SQLITE_STATIC); + status = sqlite3_bind_text(stmt, col + 1, value.data.as_char, + (int)value.size_bytes, SQLITE_STATIC); break; } case NANOARROW_TYPE_DICTIONARY: { @@ -391,7 +391,7 @@ AdbcStatusCode AdbcSqliteBinderBindNext(struct AdbcSqliteBinder* binder, sqlite3 struct ArrowBufferView value = ArrowArrayViewGetBytesUnsafe( binder->batch.children[col]->dictionary, value_index); status = sqlite3_bind_text(stmt, col + 1, value.data.as_char, - value.size_bytes, SQLITE_STATIC); + (int)value.size_bytes, SQLITE_STATIC); } break; } @@ -411,16 +411,16 @@ AdbcStatusCode AdbcSqliteBinderBindNext(struct AdbcSqliteBinder* binder, sqlite3 RAISE_ADBC(ArrowDate32ToIsoString((int32_t)value, &tsstr, error)); // SQLITE_TRANSIENT ensures the value is copied during bind - status = - sqlite3_bind_text(stmt, col + 1, tsstr, strlen(tsstr), SQLITE_TRANSIENT); + status = sqlite3_bind_text(stmt, col + 1, tsstr, (int)strlen(tsstr), + SQLITE_TRANSIENT); free(tsstr); break; } case NANOARROW_TYPE_TIMESTAMP: { struct ArrowSchemaView bind_schema_view; - RAISE_ADBC(ArrowSchemaViewInit(&bind_schema_view, binder->schema.children[col], - &arrow_error)); + RAISE_NA(ArrowSchemaViewInit(&bind_schema_view, binder->schema.children[col], + &arrow_error)); enum ArrowTimeUnit unit = bind_schema_view.time_unit; int64_t value = ArrowArrayViewGetIntUnsafe(binder->batch.children[col], binder->next_row); @@ -429,8 +429,8 @@ AdbcStatusCode AdbcSqliteBinderBindNext(struct AdbcSqliteBinder* binder, sqlite3 RAISE_ADBC(ArrowTimestampToIsoString(value, unit, &tsstr, error)); // SQLITE_TRANSIENT ensures the value is copied during bind - status = - sqlite3_bind_text(stmt, col + 1, tsstr, strlen(tsstr), SQLITE_TRANSIENT); + status = sqlite3_bind_text(stmt, col + 1, tsstr, (int)strlen(tsstr), + SQLITE_TRANSIENT); free((char*)tsstr); break; } @@ -844,7 +844,7 @@ AdbcStatusCode StatementReaderUpcastInt64ToDouble(struct ArrowBuffer* data, size_t num_elements = data->size_bytes / sizeof(int64_t); const int64_t* elements = (const int64_t*)data->data; for (size_t i = 0; i < num_elements; i++) { - double value = elements[i]; + double value = (double)elements[i]; ArrowBufferAppendUnsafe(&doubles, &value, sizeof(double)); } ArrowBufferReset(data); @@ -1133,7 +1133,7 @@ AdbcStatusCode AdbcSqliteExportReader(sqlite3* db, sqlite3_stmt* stmt, memset(reader, 0, sizeof(struct StatementReader)); reader->db = db; reader->stmt = stmt; - reader->batch_size = batch_size; + reader->batch_size = (int)batch_size; stream->private_data = reader; stream->release = StatementReaderRelease; diff --git a/go/adbc/drivermgr/adbc_driver_manager.cc b/go/adbc/drivermgr/adbc_driver_manager.cc index 44c3d9f98f..0ce173a888 100644 --- a/go/adbc/drivermgr/adbc_driver_manager.cc +++ b/go/adbc/drivermgr/adbc_driver_manager.cc @@ -84,6 +84,36 @@ void SetError(struct AdbcError* error, const std::string& message) { error->release = ReleaseError; } +// Copies src_error into error and releases src_error +void SetError(struct AdbcError* error, struct AdbcError* src_error) { + if (!error) return; + if (error->release) error->release(error); + + if (src_error->message) { + size_t message_size = strlen(src_error->message); + error->message = new char[message_size]; + std::memcpy(error->message, src_error->message, message_size); + error->message[message_size] = '\0'; + } else { + error->message = nullptr; + } + + error->release = ReleaseError; + if (src_error->release) { + src_error->release(src_error); + } +} + +struct OwnedError { + struct AdbcError error = ADBC_ERROR_INIT; + + ~OwnedError() { + if (error.release) { + error.release(&error); + } + } +}; + // Driver state /// A driver DLL. @@ -666,7 +696,7 @@ std::string AdbcDriverManagerDefaultEntrypoint(const std::string& driver) { int AdbcErrorGetDetailCount(const struct AdbcError* error) { if (error->vendor_code == ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA && error->private_data && - error->private_driver) { + error->private_driver && error->private_driver->ErrorGetDetailCount) { return error->private_driver->ErrorGetDetailCount(error); } return 0; @@ -674,7 +704,7 @@ int AdbcErrorGetDetailCount(const struct AdbcError* error) { struct AdbcErrorDetail AdbcErrorGetDetail(const struct AdbcError* error, int index) { if (error->vendor_code == ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA && error->private_data && - error->private_driver) { + error->private_driver && error->private_driver->ErrorGetDetail) { return error->private_driver->ErrorGetDetail(error, index); } return {nullptr, nullptr, 0}; @@ -900,6 +930,7 @@ AdbcStatusCode AdbcDatabaseInit(struct AdbcDatabase* database, struct AdbcError* status = AdbcLoadDriver(args->driver.c_str(), nullptr, ADBC_VERSION_1_1_0, database->private_driver, error); } + if (status != ADBC_STATUS_OK) { // Restore private_data so it will be released by AdbcDatabaseRelease database->private_data = args; @@ -910,10 +941,18 @@ AdbcStatusCode AdbcDatabaseInit(struct AdbcDatabase* database, struct AdbcError* database->private_driver = nullptr; return status; } - status = database->private_driver->DatabaseNew(database, error); + + // Errors that occur during AdbcDatabaseXXX() refer to the driver via + // the private_driver member; however, after we return we have released + // the driver and inspecting the error might segfault. Here, we scope + // the driver-produced error to this function and make a copy if necessary. + OwnedError driver_error; + + status = database->private_driver->DatabaseNew(database, &driver_error.error); if (status != ADBC_STATUS_OK) { if (database->private_driver->release) { - database->private_driver->release(database->private_driver, error); + SetError(error, &driver_error.error); + database->private_driver->release(database->private_driver, nullptr); } delete database->private_driver; database->private_driver = nullptr; @@ -927,33 +966,34 @@ AdbcStatusCode AdbcDatabaseInit(struct AdbcDatabase* database, struct AdbcError* INIT_ERROR(error, database); for (const auto& option : options) { - status = database->private_driver->DatabaseSetOption(database, option.first.c_str(), - option.second.c_str(), error); + status = database->private_driver->DatabaseSetOption( + database, option.first.c_str(), option.second.c_str(), &driver_error.error); if (status != ADBC_STATUS_OK) break; } for (const auto& option : bytes_options) { status = database->private_driver->DatabaseSetOptionBytes( database, option.first.c_str(), reinterpret_cast(option.second.data()), option.second.size(), - error); + &driver_error.error); if (status != ADBC_STATUS_OK) break; } for (const auto& option : int_options) { status = database->private_driver->DatabaseSetOptionInt( - database, option.first.c_str(), option.second, error); + database, option.first.c_str(), option.second, &driver_error.error); if (status != ADBC_STATUS_OK) break; } for (const auto& option : double_options) { status = database->private_driver->DatabaseSetOptionDouble( - database, option.first.c_str(), option.second, error); + database, option.first.c_str(), option.second, &driver_error.error); if (status != ADBC_STATUS_OK) break; } if (status != ADBC_STATUS_OK) { // Release the database - std::ignore = database->private_driver->DatabaseRelease(database, error); + std::ignore = database->private_driver->DatabaseRelease(database, nullptr); if (database->private_driver->release) { - database->private_driver->release(database->private_driver, error); + SetError(error, &driver_error.error); + database->private_driver->release(database->private_driver, nullptr); } delete database->private_driver; database->private_driver = nullptr; @@ -962,6 +1002,7 @@ AdbcStatusCode AdbcDatabaseInit(struct AdbcDatabase* database, struct AdbcError* database->private_data = nullptr; return status; } + return database->private_driver->DatabaseInit(database, error); } From 3d4f9e3ddadd4643fbdb7425372582e898fe78f2 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Fri, 15 Nov 2024 13:48:28 +0100 Subject: [PATCH 08/11] chore: bump last instance of `actions/*-artifact` to v4 (#2329) This instance was merged a day after everything else was bumped and as the dependabot PR was closed it's ignoring it. --- .github/workflows/packaging.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index fc5cd5edb0..2cda890e12 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -132,8 +132,9 @@ jobs: popd - name: Upload Go binaries - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: + name: go-${{ matrix.os }} retention-days: 7 path: | adbc/go/adbc/pkg/libadbc_driver_flightsql.* @@ -167,13 +168,15 @@ jobs: echo "schedule: ${{ github.event.schedule }}" >> $GITHUB_STEP_SUMMARY echo "ref: ${{ github.ref }}" >> $GITHUB_STEP_SUMMARY - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: + pattern: go-* path: adbc/go/adbc/pkg + merge-multiple: true - name: Copy Go binaries run: | - pushd adbc/go/adbc/pkg/artifact + pushd adbc/go/adbc/pkg/ cp *.dll ../ cp *.so ../ cp *.dylib ../ From 2830774cbd0529096d81ccb5febc9d40219dd9be Mon Sep 17 00:00:00 2001 From: Julian Brandrick <127887814+Julian-Brandrick@users.noreply.github.com> Date: Sat, 16 Nov 2024 23:18:01 -0800 Subject: [PATCH 09/11] ci: Introduce the option to pack csharp without building (#2330) Modifying the csharp_pack.ps1 script to allow for packing without building. This unlocks scenarios where we can build and sign the binaries, then pack without having them be overwritten by an implicit build. Updated the csharp_pack.sh script for parity. --- ci/scripts/csharp_pack.ps1 | 9 +++++++-- ci/scripts/csharp_pack.sh | 7 ++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ci/scripts/csharp_pack.ps1 b/ci/scripts/csharp_pack.ps1 index 8d135cef9a..1b34c9bf52 100644 --- a/ci/scripts/csharp_pack.ps1 +++ b/ci/scripts/csharp_pack.ps1 @@ -13,10 +13,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +[CmdletBinding(PositionalBinding=$false)] param ( [string]$destination=$null, - [string]$versionSuffix=$null + [string]$versionSuffix=$null, + [switch]$noBuild ) $csharpFolder = [IO.Path]::Combine($PSScriptRoot, "..", "..", "csharp") | Resolve-Path @@ -35,5 +36,9 @@ if ($versionSuffix) { Write-Host " * Version Suffix: $versionSuffix" $packArgs["-version-suffix"] = $versionSuffix } +if ($noBuild) { + Write-Host " * Pack without building" + $packArgs["-no-build"] = $true +} dotnet pack @packArgs diff --git a/ci/scripts/csharp_pack.sh b/ci/scripts/csharp_pack.sh index c1390efecb..3ee701901a 100755 --- a/ci/scripts/csharp_pack.sh +++ b/ci/scripts/csharp_pack.sh @@ -23,10 +23,7 @@ source_dir=${1}/csharp pushd ${source_dir} -if [ -z ${2-} ]; then - dotnet pack -c Release; -else - dotnet pack -c Release --version-suffix ${2}; -fi +shift +dotnet pack -c Release "$@"; popd From 7ecd2710fa981441395f8f4f54c0a7abb24e0973 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:57:22 -0500 Subject: [PATCH 10/11] chore(go/adbc): bump google.golang.org/protobuf from 1.35.1 to 1.35.2 in /go/adbc (#2331) Bumps google.golang.org/protobuf from 1.35.1 to 1.35.2. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go/adbc/go.mod | 2 +- go/adbc/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/adbc/go.mod b/go/adbc/go.mod index 6241cc5a9f..58015da7fb 100644 --- a/go/adbc/go.mod +++ b/go/adbc/go.mod @@ -36,7 +36,7 @@ require ( golang.org/x/tools v0.27.0 google.golang.org/api v0.205.0 google.golang.org/grpc v1.68.0 - google.golang.org/protobuf v1.35.1 + google.golang.org/protobuf v1.35.2 ) require ( diff --git a/go/adbc/go.sum b/go/adbc/go.sum index 1412995d71..8123c1a55c 100644 --- a/go/adbc/go.sum +++ b/go/adbc/go.sum @@ -325,8 +325,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= From bac4fc6c2c95ef899626260f3b0464220e1b12d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 21:22:32 -0500 Subject: [PATCH 11/11] chore(go/adbc): bump google.golang.org/api from 0.205.0 to 0.206.0 in /go/adbc (#2332) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.205.0 to 0.206.0. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go/adbc/go.mod | 16 ++++++++-------- go/adbc/go.sum | 40 ++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/go/adbc/go.mod b/go/adbc/go.mod index 58015da7fb..357ed14076 100644 --- a/go/adbc/go.mod +++ b/go/adbc/go.mod @@ -34,17 +34,17 @@ require ( golang.org/x/oauth2 v0.24.0 golang.org/x/sync v0.9.0 golang.org/x/tools v0.27.0 - google.golang.org/api v0.205.0 + google.golang.org/api v0.206.0 google.golang.org/grpc v1.68.0 google.golang.org/protobuf v1.35.2 ) require ( cloud.google.com/go v0.116.0 // indirect - cloud.google.com/go/auth v0.10.1 // indirect + cloud.google.com/go/auth v0.10.2 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect - cloud.google.com/go/iam v1.2.1 // indirect + cloud.google.com/go/iam v1.2.2 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect @@ -84,7 +84,7 @@ require ( github.com/google/flatbuffers v24.3.25+incompatible // indirect github.com/google/s2a-go v0.1.8 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect - github.com/googleapis/gax-go/v2 v2.13.0 // indirect + github.com/googleapis/gax-go/v2 v2.14.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/klauspost/asmfmt v1.3.2 // indirect @@ -114,11 +114,11 @@ require ( golang.org/x/sys v0.27.0 // indirect golang.org/x/term v0.26.0 // indirect golang.org/x/text v0.20.0 // indirect - golang.org/x/time v0.7.0 // indirect + golang.org/x/time v0.8.0 // indirect golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect - google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect + google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect modernc.org/libc v1.45.3 // indirect diff --git a/go/adbc/go.sum b/go/adbc/go.sum index 8123c1a55c..709f690468 100644 --- a/go/adbc/go.sum +++ b/go/adbc/go.sum @@ -1,20 +1,20 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE= cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U= -cloud.google.com/go/auth v0.10.1 h1:TnK46qldSfHWt2a0b/hciaiVJsmDXWy9FqyUan0uYiI= -cloud.google.com/go/auth v0.10.1/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= +cloud.google.com/go/auth v0.10.2 h1:oKF7rgBfSHdp/kuhXtqU/tNDr0mZqhYbEh+6SiqzkKo= +cloud.google.com/go/auth v0.10.2/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI= cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk= cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8= cloud.google.com/go/bigquery v1.64.0 h1:vSSZisNyhr2ioJE1OuYBQrnrpB7pIhRQm4jfjc7E/js= cloud.google.com/go/bigquery v1.64.0/go.mod h1:gy8Ooz6HF7QmA+TRtX8tZmXBKH5mCFBwUApGAb3zI7Y= cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo= cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k= -cloud.google.com/go/datacatalog v1.22.1 h1:i0DyKb/o7j+0vgaFtimcRFjYsD6wFw1jpnODYUyiYRs= -cloud.google.com/go/datacatalog v1.22.1/go.mod h1:MscnJl9B2lpYlFoxRjicw19kFTwEke8ReKL5Y/6TWg8= -cloud.google.com/go/iam v1.2.1 h1:QFct02HRb7H12J/3utj0qf5tobFh9V4vR6h9eX5EBRU= -cloud.google.com/go/iam v1.2.1/go.mod h1:3VUIJDPpwT6p/amXRC5GY8fCCh70lxPygguVtI0Z4/g= -cloud.google.com/go/longrunning v0.6.1 h1:lOLTFxYpr8hcRtcwWir5ITh1PAKUD/sG2lKrTSYjyMc= -cloud.google.com/go/longrunning v0.6.1/go.mod h1:nHISoOZpBcmlwbJmiVk5oDRz0qG/ZxPynEGs1iZ79s0= +cloud.google.com/go/datacatalog v1.22.2 h1:9Bi8YO+WBE0YSSQL1tX62Gy/KcdNGLufyVlEJ0eYMrc= +cloud.google.com/go/datacatalog v1.22.2/go.mod h1:9Wamq8TDfL2680Sav7q3zEhBJSPBrDxJU8WtPJ25dBM= +cloud.google.com/go/iam v1.2.2 h1:ozUSofHUGf/F4tCNy/mu9tHLTaxZFLOUiKzjcgWHGIA= +cloud.google.com/go/iam v1.2.2/go.mod h1:0Ys8ccaZHdI1dEUilwzqng/6ps2YB6vRsjIe00/+6JY= +cloud.google.com/go/longrunning v0.6.2 h1:xjDfh1pQcWPEvnfjZmwjKQEcHnpz6lHjfy7Fo0MK+hc= +cloud.google.com/go/longrunning v0.6.2/go.mod h1:k/vIs83RN4bE3YCswdXC5PFfWVILjm3hpEUlSko4PiI= cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs= cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= @@ -156,8 +156,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gTgghdIA6Stxb52D5RnLI1SLyw= github.com/googleapis/enterprise-certificate-proxy v0.3.4/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA= -github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDPT0hH1s= -github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A= +github.com/googleapis/gax-go/v2 v2.14.0 h1:f+jMrjBPl+DL9nI4IQzLUxMq7XrAqFYB7hBPqMNIe8o= +github.com/googleapis/gax-go/v2 v2.14.0/go.mod h1:lhBCnjdLrWRaPvLWhmc8IS24m9mr07qSYnHncrgo+zk= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= @@ -282,8 +282,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= -golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= -golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= +golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -296,19 +296,19 @@ golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhS golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= 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/api v0.205.0 h1:LFaxkAIpDb/GsrWV20dMMo5MR0h8UARTbn24LmD+0Pg= -google.golang.org/api v0.205.0/go.mod h1:NrK1EMqO8Xk6l6QwRAmrXXg2v6dzukhlOyvkYtnvUuc= +google.golang.org/api v0.206.0 h1:A27GClesCSheW5P2BymVHjpEeQ2XHH8DI8Srs2HI2L8= +google.golang.org/api v0.206.0/go.mod h1:BtB8bfjTYIrai3d8UyvPmV9REGgox7coh+ZRwm0b+W8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38 h1:Q3nlH8iSQSRUwOskjbcSMcF2jiYMNiQYZ0c2KEJLKKU= -google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38/go.mod h1:xBI+tzfqGGN2JBeSebfKXFSdBpWVQ7sLW40PTupVRm4= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28 h1:KJjNNclfpIkVqrZlTWcgOOaVQ00LdBnoEaRfkUx760s= +google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:mt9/MofW7AWQ+Gy179ChOnvmJatV8YHUmrcedo9CIFI= +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= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=