Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update versions for 17-SNAPSHOT #2470

Merged
merged 3 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -759,3 +759,46 @@
- **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)

## ADBC Libraries 16 (2025-01-17)

### Versions

- C/C++/GLib/Go/Python/Ruby: 1.4.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are also the ADBC protocol version?

Could this be the reason loading a Go driver from Rust (dynamically) triggers version check errors?

Error: Error { message: "Unknown ADBC version: 1.4.0", status: InvalidArguments, vendor_code: 0, sqlstate: [0, 0, 0, 0, 0], details: None }

@zeroshade @lidavidm

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's interesting. The actual protocol version is separate, it's currently 1.1.0.

Something is sending 1.4.0 when it shouldn't be... or Rust is validating the wrong thing

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, the wrong string must've gotten changed somewhere...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, @felipecrv can you please open new issues instead of necroing older threads if possible?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I think we need a backtrace. That appears to be from FromStr<AdbcVersion> so I think the Rust code appears to be parsing the driver version somewhere at a first glance. But it's hard to tell without any context.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I figured what was the problem now! My environment had ADBC_SNOWFLAKE_ADBC_VERSION defined to 1.4.0. :/

BTW, @felipecrv can you please open new issues instead of necroing older threads if possible?

I wanted to confirm if there was an actual problem first and got here through git blame.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're happy to take questions over issues too!

- C#: 0.16.0
- Java: 0.16.0
- R: 0.16.0
- Rust: 0.16.0

### Breaking Changes

- ⚠️ **rust/driver/snowflake**: return a `Result` from `Builder::from_env` when parsing fails (#2334)

### New Features

- **csharp/src/Client**: parse custom properties from connection string (#2352)
- **csharp/src/Drivers**: introduce Interop.FlightSql driver (#2214)
- **csharp/src/Drivers/Apache**: add connect and query timeout options (#2312)
- **csharp/src/Drivers/Apache**: make Apache driver tests inheritable (#2341)
- **rust/driver/snowflake**: add `adbc_snowflake` crate with Go driver wrapper (#2207)
- ⚠️ **rust/driver/snowflake**: return a `Result` from `Builder::from_env` when parsing fails (#2334)

### Bugfixes

- **c/driver/postgresql**: don't unnecessarily COMMIT (#2412)
- **c/driver/postgresql**: return unknown OIDs as opaque (#2450)
- **ci**: ensure wheels are built with older manylinux (#2351)
- **csharp/src/Apache.Arrow.Adbc/C**: export statement_execute_schema correctly (#2409)
- **csharp/src/Drivers/Apache**: detect sever error when polling for response (#2355)
- **csharp/src/Drivers/BigQuery**: Use job reference instead of job id to get job to avoid interference between different locations (#2433)
- **csharp/src/Drivers/BigQuery**: ensure BigQuery DATE type is Date32 Arrow type (#2446)
- **csharp/src/Drivers/BigQuery**: remove details to have type names match ODBC (#2431)
- **go/adbc/driver/bigquery**: set default project and dataset for new statements (#2342)
- **go/adbc/driver/snowflake**: update default values for fetch params (#2325)
- **java/driver-manager**: typo (#2336)

### Documentation Improvements

- add related work (#2333)
- change Flight SQL driver usage to executable example (#2395)
- remove crosslinking to Arrow Javadocs (#2455)
2 changes: 1 addition & 1 deletion c/cmake_modules/AdbcVersion.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# ------------------------------------------------------------
# Version definitions

set(ADBC_VERSION "1.4.0-SNAPSHOT")
set(ADBC_VERSION "1.5.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)
Expand Down
2 changes: 1 addition & 1 deletion c/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
project(
'arrow-adbc',
'c', 'cpp',
version: '1.4.0-SNAPSHOT',
version: '1.5.0-SNAPSHOT',
license: 'Apache-2.0',
meson_version: '>=1.3.0',
default_options: [
Expand Down
2 changes: 1 addition & 1 deletion ci/conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package:
name: arrow-adbc-split
version: 1.4.0
version: 1.5.0

source:
path: ../../
Expand Down
22 changes: 11 additions & 11 deletions ci/linux-packages/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Build-Depends:
Standards-Version: 4.5.0
Homepage: https://arrow.apache.org/adbc/

Package: libadbc-driver-manager104
Package: libadbc-driver-manager105
Section: libs
Architecture: any
Multi-Arch: same
Expand All @@ -52,12 +52,12 @@ Architecture: any
Multi-Arch: same
Depends:
${misc:Depends},
libadbc-driver-manager104 (= ${binary:Version})
libadbc-driver-manager105 (= ${binary:Version})
Description: Apache Arrow Database Connectivity (ADBC) driver manager
.
This package provides C++ header files.

Package: libadbc-driver-postgresql104
Package: libadbc-driver-postgresql105
Section: libs
Architecture: any
Multi-Arch: same
Expand All @@ -75,12 +75,12 @@ Architecture: any
Multi-Arch: same
Depends:
${misc:Depends},
libadbc-driver-postgresql104 (= ${binary:Version})
libadbc-driver-postgresql105 (= ${binary:Version})
Description: Apache Arrow Database Connectivity (ADBC) PostgreSQL driver
.
This package provides CMake package, pkg-config package and so on.

Package: libadbc-driver-sqlite104
Package: libadbc-driver-sqlite105
Section: libs
Architecture: any
Multi-Arch: same
Expand All @@ -98,12 +98,12 @@ Architecture: any
Multi-Arch: same
Depends:
${misc:Depends},
libadbc-driver-sqlite104 (= ${binary:Version})
libadbc-driver-sqlite105 (= ${binary:Version})
Description: Apache Arrow Database Connectivity (ADBC) SQLite driver
.
This package provides CMake package, pkg-config package and so on.

Package: libadbc-driver-flightsql104
Package: libadbc-driver-flightsql105
Section: libs
Architecture: any
Multi-Arch: same
Expand All @@ -121,12 +121,12 @@ Architecture: any
Multi-Arch: same
Depends:
${misc:Depends},
libadbc-driver-flightsql104 (= ${binary:Version})
libadbc-driver-flightsql105 (= ${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-snowflake104
Package: libadbc-driver-snowflake105
Section: libs
Architecture: any
Multi-Arch: same
Expand All @@ -144,7 +144,7 @@ Architecture: any
Multi-Arch: same
Depends:
${misc:Depends},
libadbc-driver-snowflake104 (= ${binary:Version})
libadbc-driver-snowflake105 (= ${binary:Version})
Description: Apache Arrow Database Connectivity (ADBC) Snowflake driver
.
This package provides CMake package, pkg-config package and so on.
Expand All @@ -158,7 +158,7 @@ Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends},
libadbc-driver-manager104 (= ${binary:Version})
libadbc-driver-manager105 (= ${binary:Version})
Description: Apache Arrow Database Connectivity (ADBC) driver manager
.
This package provides GLib based library files.
Expand Down
2 changes: 1 addition & 1 deletion csharp/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<Product>Apache Arrow ADBC library</Product>
<Copyright>Copyright 2022-2024 The Apache Software Foundation</Copyright>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we update the copyright years as a separate change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops. Yes, let me follow up with another PR.

<Company>The Apache Software Foundation</Company>
<VersionPrefix>0.16.0</VersionPrefix>
<VersionPrefix>0.17.0</VersionPrefix>
<VersionSuffix>SNAPSHOT</VersionSuffix>
</PropertyGroup>

Expand Down
18 changes: 9 additions & 9 deletions dev/release/versions.env
Original file line number Diff line number Diff line change
Expand Up @@ -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="16"
PREVIOUS_RELEASE="15"
RELEASE="17"
PREVIOUS_RELEASE="16"

# Individual components will have a SemVer.
VERSION_CSHARP="0.16.0"
VERSION_JAVA="0.16.0"
VERSION_CSHARP="0.17.0"
VERSION_JAVA="0.17.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.4.0"
VERSION_R="0.16.0"
VERSION_RUST="0.16.0"
VERSION_NATIVE="1.5.0"
VERSION_R="0.17.0"
VERSION_RUST="0.17.0"

# Required by the version bump script
PREVIOUS_VERSION_NATIVE="1.3.0"
PREVIOUS_VERSION_R="0.15.0"
PREVIOUS_VERSION_NATIVE="1.4.0"
PREVIOUS_VERSION_R="0.16.0"
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
registered trademarks or trademarks of The Apache Software Foundation in the
United States and other countries."""
author = "the Apache Arrow Developers"
release = "16 (dev)"
release = "17 (dev)"
# Needed to generate version switcher
version = release

Expand Down
2 changes: 1 addition & 1 deletion glib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ project('adbc-glib',
'c_std=c99',
],
license: 'Apache-2.0',
version: '1.4.0-SNAPSHOT')
version: '1.5.0-SNAPSHOT')

version_numbers = meson.project_version().split('-')[0].split('.')
version_major = version_numbers[0].to_int()
Expand Down
2 changes: 1 addition & 1 deletion java/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.arrow.adbc</groupId>
<artifactId>arrow-adbc-java-root</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
</parent>

<artifactId>adbc-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion java/driver-manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.arrow.adbc</groupId>
<artifactId>arrow-adbc-java-root</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
</parent>

<artifactId>adbc-driver-manager</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion java/driver/flight-sql-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.arrow.adbc</groupId>
<artifactId>arrow-adbc-java-root</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion java/driver/flight-sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.arrow.adbc</groupId>
<artifactId>arrow-adbc-java-root</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion java/driver/jdbc-validation-derby/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.arrow.adbc</groupId>
<artifactId>arrow-adbc-java-root</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion java/driver/jdbc-validation-mssqlserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.arrow.adbc</groupId>
<artifactId>arrow-adbc-java-root</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion java/driver/jdbc-validation-postgresql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.arrow.adbc</groupId>
<artifactId>arrow-adbc-java-root</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion java/driver/jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.arrow.adbc</groupId>
<artifactId>arrow-adbc-java-root</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion java/driver/validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.arrow.adbc</groupId>
<artifactId>arrow-adbc-java-root</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<groupId>org.apache.arrow.adbc</groupId>
<artifactId>arrow-adbc-java-root</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Apache Arrow ADBC Java Root POM</name>
Expand Down
2 changes: 1 addition & 1 deletion java/sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.arrow.adbc</groupId>
<artifactId>arrow-adbc-java-root</artifactId>
<version>0.16.0-SNAPSHOT</version>
<version>0.17.0-SNAPSHOT</version>
</parent>

<artifactId>adbc-sql</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# This file is part of 'miniver': https://github.com/jbweston/miniver

version = "1.4.0dev"
version = "1.5.0dev"

# These values are only set if the distribution was created with 'git archive'
# NOTE: must add an export-subst to .gitattributes!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# This file is part of 'miniver': https://github.com/jbweston/miniver

version = "1.4.0dev"
version = "1.5.0dev"

# These values are only set if the distribution was created with 'git archive'
# NOTE: must add an export-subst to .gitattributes!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# This file is part of 'miniver': https://github.com/jbweston/miniver

version = "1.4.0dev"
version = "1.5.0dev"

# These values are only set if the distribution was created with 'git archive'
# NOTE: must add an export-subst to .gitattributes!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# This file is part of 'miniver': https://github.com/jbweston/miniver

version = "1.4.0dev"
version = "1.5.0dev"

# These values are only set if the distribution was created with 'git archive'
# NOTE: must add an export-subst to .gitattributes!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# This file is part of 'miniver': https://github.com/jbweston/miniver

version = "1.4.0dev"
version = "1.5.0dev"

# These values are only set if the distribution was created with 'git archive'
# NOTE: must add an export-subst to .gitattributes!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# This file is part of 'miniver': https://github.com/jbweston/miniver

version = "1.4.0dev"
version = "1.5.0dev"

# These values are only set if the distribution was created with 'git archive'
# NOTE: must add an export-subst to .gitattributes!
Expand Down
2 changes: 1 addition & 1 deletion r/adbcbigquery/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: adbcbigquery
Title: 'Arrow' Database Connectivity ('ADBC') 'BigQuery' Driver
Version: 0.15.0.9000
Version: 0.16.0.9000
Authors@R: c(
person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-9415-4582")),
Expand Down
2 changes: 1 addition & 1 deletion r/adbcdrivermanager/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: adbcdrivermanager
Title: 'Arrow' Database Connectivity ('ADBC') Driver Manager
Version: 0.15.0.9000
Version: 0.16.0.9000
Authors@R: c(
person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-9415-4582")),
Expand Down
2 changes: 1 addition & 1 deletion r/adbcflightsql/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: adbcflightsql
Title: 'Arrow' Database Connectivity ('ADBC') 'FlightSQL' Driver
Version: 0.15.0.9000
Version: 0.16.0.9000
Authors@R: c(
person("Dewey", "Dunnington", , "dewey@dunnington.ca", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-9415-4582")),
Expand Down
Loading
Loading