From 5c351d2f4d40d09a5e8ef9b7b20b8c2c5c7a825e Mon Sep 17 00:00:00 2001 From: David Li Date: Tue, 25 Feb 2025 13:16:05 +0900 Subject: [PATCH] chore: bump versions of Go, pre-commit hooks --- .env | 4 ++-- .pre-commit-config.yaml | 17 ++++++++++------- c/driver/bigquery/bigquery_test.cc | 2 ++ c/driver/flightsql/dremio_flightsql_test.cc | 3 +++ c/driver/flightsql/sqlite_flightsql_test.cc | 2 ++ c/driver/framework/objects.cc | 1 + .../copy/postgres_copy_reader_test.cc | 2 ++ .../copy/postgres_copy_writer_test.cc | 3 +++ c/driver/postgresql/database.cc | 1 + c/driver/postgresql/error.cc | 2 +- c/driver/postgresql/postgres_type_test.cc | 2 ++ c/driver/postgresql/postgresql_test.cc | 3 +++ c/driver/postgresql/result_helper.cc | 2 ++ c/driver/postgresql/statement.cc | 1 + c/driver/snowflake/snowflake_test.cc | 10 +++++++--- c/driver/sqlite/sqlite.cc | 5 +++++ c/driver/sqlite/sqlite_test.cc | 2 ++ c/integration/duckdb/duckdb_test.cc | 1 + c/validation/adbc_validation_connection.cc | 4 ++++ c/validation/adbc_validation_statement.cc | 3 +++ c/validation/adbc_validation_util.cc | 5 +++++ ci/docker/golang-flightsql-sqlite.dockerfile | 2 +- go/adbc/go.mod | 4 +--- .../adbc_driver_manager/_blocking_impl.cc | 1 + r/adbcdrivermanager/src/driver_test.cc | 1 + 25 files changed, 66 insertions(+), 17 deletions(-) diff --git a/.env b/.env index 9ea322773e..1c47edf906 100644 --- a/.env +++ b/.env @@ -33,8 +33,8 @@ MANYLINUX=2014 MAVEN=3.6.3 PLATFORM=linux/amd64 PYTHON=3.9 -GO=1.22.9 -ARROW_MAJOR_VERSION=14 +GO=1.23.6 +ARROW_MAJOR_VERSION=18 DOTNET=8.0 # Used through compose.yaml and serves as the default version for the diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6d8bf873cb..f56926f6ad 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # v5.0.0 hooks: - id: check-xml - id: check-yaml @@ -50,39 +50,42 @@ repos: - id: cmake-format args: [--in-place] - repo: https://github.com/cpplint/cpplint - rev: 1.6.1 + rev: f4363d7fc0d5f38c4fd41b658e069e96583da0d5 # 2.0.0 hooks: - id: cpplint + types_or: [c++] args: # From Arrow's config - "--filter=-whitespace/comments,-whitespace/indent,-readability/braces,-readability/casting,-readability/todo,-readability/alt_tokens,-build/header_guard,-build/c++11,-build/include_order,-build/include_subdir,-runtime/references" - "--linelength=90" - "--verbose=2" - repo: https://github.com/golangci/golangci-lint - rev: v1.61.0 + rev: v1.64.5 hooks: - id: golangci-lint entry: bash -c 'cd go/adbc && golangci-lint run --fix --timeout 5m' types_or: [go, go-mod] - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks - rev: v2.13.0 + rev: v2.14.0 hooks: - id: pretty-format-golang + args: [--autofix] + types_or: [go] - id: pretty-format-java args: [--autofix] types_or: [java] - repo: https://github.com/psf/black - rev: 24.4.2 + rev: 25.1.0 hooks: - id: black types_or: [pyi, python] - repo: https://github.com/PyCQA/flake8 - rev: 7.1.0 + rev: 7.1.2 hooks: - id: flake8 types_or: [python] - repo: https://github.com/PyCQA/isort - rev: 5.13.2 + rev: 6.0.0 hooks: - id: isort types_or: [python] diff --git a/c/driver/bigquery/bigquery_test.cc b/c/driver/bigquery/bigquery_test.cc index b80f36336a..e526b511b8 100644 --- a/c/driver/bigquery/bigquery_test.cc +++ b/c/driver/bigquery/bigquery_test.cc @@ -18,7 +18,9 @@ #include #include #include +#include #include +#include #include #include diff --git a/c/driver/flightsql/dremio_flightsql_test.cc b/c/driver/flightsql/dremio_flightsql_test.cc index f18344017b..341845d0e2 100644 --- a/c/driver/flightsql/dremio_flightsql_test.cc +++ b/c/driver/flightsql/dremio_flightsql_test.cc @@ -15,12 +15,15 @@ // specific language governing permissions and limitations // under the License. +#include + #include #include #include #include #include #include + #include "validation/adbc_validation.h" #include "validation/adbc_validation_util.h" diff --git a/c/driver/flightsql/sqlite_flightsql_test.cc b/c/driver/flightsql/sqlite_flightsql_test.cc index 752ce8154f..033467b7f4 100644 --- a/c/driver/flightsql/sqlite_flightsql_test.cc +++ b/c/driver/flightsql/sqlite_flightsql_test.cc @@ -18,7 +18,9 @@ #include #include #include +#include #include +#include #include #include diff --git a/c/driver/framework/objects.cc b/c/driver/framework/objects.cc index 691f6e4145..31197c2d32 100644 --- a/c/driver/framework/objects.cc +++ b/c/driver/framework/objects.cc @@ -18,6 +18,7 @@ #include "driver/framework/objects.h" #include +#include #include "nanoarrow/nanoarrow.hpp" diff --git a/c/driver/postgresql/copy/postgres_copy_reader_test.cc b/c/driver/postgresql/copy/postgres_copy_reader_test.cc index 7b9fe230f8..16f1ca01f9 100644 --- a/c/driver/postgresql/copy/postgres_copy_reader_test.cc +++ b/c/driver/postgresql/copy/postgres_copy_reader_test.cc @@ -15,6 +15,8 @@ // specific language governing permissions and limitations // under the License. +#include + #include #include diff --git a/c/driver/postgresql/copy/postgres_copy_writer_test.cc b/c/driver/postgresql/copy/postgres_copy_writer_test.cc index 5010848cf5..cd8cb30083 100644 --- a/c/driver/postgresql/copy/postgres_copy_writer_test.cc +++ b/c/driver/postgresql/copy/postgres_copy_writer_test.cc @@ -16,8 +16,11 @@ // under the License. #include +#include #include +#include #include +#include #include #include diff --git a/c/driver/postgresql/database.cc b/c/driver/postgresql/database.cc index 1bd7444884..f5652e8fac 100644 --- a/c/driver/postgresql/database.cc +++ b/c/driver/postgresql/database.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/c/driver/postgresql/error.cc b/c/driver/postgresql/error.cc index 173868baf5..d21edb68fe 100644 --- a/c/driver/postgresql/error.cc +++ b/c/driver/postgresql/error.cc @@ -18,7 +18,7 @@ #include "error.h" #include -#include +#include #include #include #include diff --git a/c/driver/postgresql/postgres_type_test.cc b/c/driver/postgresql/postgres_type_test.cc index 2c76f4c1f4..fe14d5db3d 100644 --- a/c/driver/postgresql/postgres_type_test.cc +++ b/c/driver/postgresql/postgres_type_test.cc @@ -15,7 +15,9 @@ // specific language governing permissions and limitations // under the License. +#include #include +#include #include #include diff --git a/c/driver/postgresql/postgresql_test.cc b/c/driver/postgresql/postgresql_test.cc index dbdb7418c0..f9c5121c7d 100644 --- a/c/driver/postgresql/postgresql_test.cc +++ b/c/driver/postgresql/postgresql_test.cc @@ -22,7 +22,10 @@ #include #include #include +#include +#include #include +#include #include #include diff --git a/c/driver/postgresql/result_helper.cc b/c/driver/postgresql/result_helper.cc index bc2fbad2d3..862dd0aacb 100644 --- a/c/driver/postgresql/result_helper.cc +++ b/c/driver/postgresql/result_helper.cc @@ -19,6 +19,8 @@ #include #include +#include +#include #define ADBC_FRAMEWORK_USE_FMT #include "driver/framework/status.h" diff --git a/c/driver/postgresql/statement.cc b/c/driver/postgresql/statement.cc index 9518e378eb..11a01d5be7 100644 --- a/c/driver/postgresql/statement.cc +++ b/c/driver/postgresql/statement.cc @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/c/driver/snowflake/snowflake_test.cc b/c/driver/snowflake/snowflake_test.cc index 262286192a..37ceb83e31 100644 --- a/c/driver/snowflake/snowflake_test.cc +++ b/c/driver/snowflake/snowflake_test.cc @@ -15,15 +15,19 @@ // specific language governing permissions and limitations // under the License. +#include +#include +#include +#include +#include + #include #include #include #include #include #include -#include -#include -#include + #include "validation/adbc_validation.h" #include "validation/adbc_validation_util.h" diff --git a/c/driver/sqlite/sqlite.cc b/c/driver/sqlite/sqlite.cc index 5434289635..2fbe80d39a 100644 --- a/c/driver/sqlite/sqlite.cc +++ b/c/driver/sqlite/sqlite.cc @@ -15,7 +15,12 @@ // specific language governing permissions and limitations // under the License. +#include #include +#include +#include +#include +#include #include #include diff --git a/c/driver/sqlite/sqlite_test.cc b/c/driver/sqlite/sqlite_test.cc index 6f47b8812c..f6ee0c1ab2 100644 --- a/c/driver/sqlite/sqlite_test.cc +++ b/c/driver/sqlite/sqlite_test.cc @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include #include diff --git a/c/integration/duckdb/duckdb_test.cc b/c/integration/duckdb/duckdb_test.cc index 5a8ecaf7b4..d51de9b800 100644 --- a/c/integration/duckdb/duckdb_test.cc +++ b/c/integration/duckdb/duckdb_test.cc @@ -16,6 +16,7 @@ // under the License. #include +#include #include #include diff --git a/c/validation/adbc_validation_connection.cc b/c/validation/adbc_validation_connection.cc index 032f1d328f..0f3c135545 100644 --- a/c/validation/adbc_validation_connection.cc +++ b/c/validation/adbc_validation_connection.cc @@ -17,7 +17,11 @@ #include "adbc_validation.h" +#include #include +#include +#include +#include #include #include diff --git a/c/validation/adbc_validation_statement.cc b/c/validation/adbc_validation_statement.cc index 8c6dd94846..adb7aacb21 100644 --- a/c/validation/adbc_validation_statement.cc +++ b/c/validation/adbc_validation_statement.cc @@ -18,6 +18,9 @@ #include "adbc_validation.h" #include +#include +#include +#include #include #include diff --git a/c/validation/adbc_validation_util.cc b/c/validation/adbc_validation_util.cc index 7d97ad7626..36ba11782d 100644 --- a/c/validation/adbc_validation_util.cc +++ b/c/validation/adbc_validation_util.cc @@ -16,6 +16,11 @@ // under the License. #include "adbc_validation_util.h" + +#include +#include +#include + #include #include "adbc_validation.h" diff --git a/ci/docker/golang-flightsql-sqlite.dockerfile b/ci/docker/golang-flightsql-sqlite.dockerfile index 4c230b70de..963e0b83ab 100644 --- a/ci/docker/golang-flightsql-sqlite.dockerfile +++ b/ci/docker/golang-flightsql-sqlite.dockerfile @@ -20,7 +20,7 @@ FROM golang:${GO} ARG ARROW_MAJOR_VERSION -RUN go install github.com/apache/arrow/go/v${ARROW_MAJOR_VERSION}/arrow/flight/flightsql/example/cmd/sqlite_flightsql_server@latest +RUN go install github.com/apache/arrow-go/v${ARROW_MAJOR_VERSION}/arrow/flight/flightsql/example/cmd/sqlite_flightsql_server@latest EXPOSE 8080 ENTRYPOINT /go/bin/sqlite_flightsql_server -host 0.0.0.0 -port 8080 diff --git a/go/adbc/go.mod b/go/adbc/go.mod index 00cdff5d86..897c737222 100644 --- a/go/adbc/go.mod +++ b/go/adbc/go.mod @@ -17,9 +17,7 @@ module github.com/apache/arrow-adbc/go/adbc -go 1.22.7 - -toolchain go1.22.9 +go 1.23.0 require ( cloud.google.com/go/bigquery v1.66.2 diff --git a/python/adbc_driver_manager/adbc_driver_manager/_blocking_impl.cc b/python/adbc_driver_manager/adbc_driver_manager/_blocking_impl.cc index 9cabe50843..ff519cbaba 100644 --- a/python/adbc_driver_manager/adbc_driver_manager/_blocking_impl.cc +++ b/python/adbc_driver_manager/adbc_driver_manager/_blocking_impl.cc @@ -36,6 +36,7 @@ #include #include #include +#include #include namespace pyadbc_driver_manager { diff --git a/r/adbcdrivermanager/src/driver_test.cc b/r/adbcdrivermanager/src/driver_test.cc index 7032d38b38..03857163e9 100644 --- a/r/adbcdrivermanager/src/driver_test.cc +++ b/r/adbcdrivermanager/src/driver_test.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include "driver/framework/base_driver.h"