You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by li...@apache.org on 2024/09/19 04:30:51 UTC

(arrow-adbc) branch main updated: chore(go/adbc): bump go version, other dependencies (#2150)

This is an automated email from the ASF dual-hosted git repository.

lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git


The following commit(s) were added to refs/heads/main by this push:
     new 36fce3d6c chore(go/adbc): bump go version, other dependencies (#2150)
36fce3d6c is described below

commit 36fce3d6c276d0a19bae6ddcd186b84530da8d62
Author: David Li <li...@gmail.com>
AuthorDate: Thu Sep 19 13:30:46 2024 +0900

    chore(go/adbc): bump go version, other dependencies (#2150)
    
    1.21 is EOL so we have to use 1.22 now
    
    ---------
    
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
---
 .env                                                   | 2 +-
 .pre-commit-config.yaml                                | 6 +++---
 go/adbc/driver/flightsql/flightsql_adbc_server_test.go | 8 ++++----
 go/adbc/go.mod                                         | 9 ++++++---
 go/adbc/go.sum                                         | 8 ++++----
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.env b/.env
index c2ed465e4..2f648eaf5 100644
--- a/.env
+++ b/.env
@@ -33,7 +33,7 @@ MANYLINUX=2014
 MAVEN=3.6.3
 PLATFORM=linux/amd64
 PYTHON=3.9
-GO=1.21.8
+GO=1.22.4
 ARROW_MAJOR_VERSION=14
 DOTNET=8.0
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3079a817b..7ba293bc3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -59,11 +59,11 @@ repos:
         - "--linelength=90"
         - "--verbose=2"
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.59.1
+    rev: v1.61.0
     hooks:
     - id: golangci-lint
       entry: bash -c 'cd go/adbc && golangci-lint run --fix --timeout 5m'
-      types_or: [go]
+      types_or: [go, go-mod]
   - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
     rev: v2.13.0
     hooks:
@@ -102,7 +102,7 @@ repos:
       pass_filenames: false
       entry: "./ci/scripts/run_rat_local.sh"
     - id: check-cgo-adbc-header
-      name: Ensure CGO adbc.h is sync'd
+      name: Ensure CGO adbc.h is syncd
       language: script
       pass_filenames: true
       files: '(c/driver_manager/adbc_driver_manager\.)|(^adbc\.h)'
diff --git a/go/adbc/driver/flightsql/flightsql_adbc_server_test.go b/go/adbc/driver/flightsql/flightsql_adbc_server_test.go
index 601755175..dd17e4588 100644
--- a/go/adbc/driver/flightsql/flightsql_adbc_server_test.go
+++ b/go/adbc/driver/flightsql/flightsql_adbc_server_test.go
@@ -585,12 +585,12 @@ func (srv *IncrementalPollTestServer) PollFlightInfo(ctx context.Context, desc *
 		if query.query == "unavailable" {
 			testCase = unavailableCase
 		} else {
-			return nil, status.Errorf(codes.Unimplemented, fmt.Sprintf("Invalid case %s", query.query))
+			return nil, status.Errorf(codes.Unimplemented, "Invalid case %s", query.query)
 		}
 	}
 
 	if testCase.differentRetryDescriptor && progress != int64(query.nextIndex) {
-		return nil, status.Errorf(codes.InvalidArgument, fmt.Sprintf("Used wrong retry descriptor, expected %d but got %d", query.nextIndex, progress))
+		return nil, status.Errorf(codes.InvalidArgument, "Used wrong retry descriptor, expected %d but got %d", query.nextIndex, progress)
 	}
 
 	if query.unavailable {
@@ -645,7 +645,7 @@ func (srv *IncrementalPollTestServer) PollFlightInfoStatement(ctx context.Contex
 
 	testCase, ok := srv.testCases[query.GetQuery()]
 	if !ok {
-		return nil, status.Errorf(codes.Unimplemented, fmt.Sprintf("Invalid case %s", query.GetQuery()))
+		return nil, status.Errorf(codes.Unimplemented, "Invalid case %s", query.GetQuery())
 	}
 
 	srv.queries[queryId] = &IncrementalQuery{
@@ -662,7 +662,7 @@ func (srv *IncrementalPollTestServer) PollFlightInfoPreparedStatement(ctx contex
 
 	testCase, ok := srv.testCases[req]
 	if !ok {
-		return nil, status.Errorf(codes.Unimplemented, fmt.Sprintf("Invalid case %s", req))
+		return nil, status.Errorf(codes.Unimplemented, "Invalid case %s", req)
 	}
 
 	srv.mu.Lock()
diff --git a/go/adbc/go.mod b/go/adbc/go.mod
index 014fe1dfe..c000f0fe5 100644
--- a/go/adbc/go.mod
+++ b/go/adbc/go.mod
@@ -17,7 +17,10 @@
 
 module github.com/apache/arrow-adbc/go/adbc
 
-go 1.21
+go 1.22.0
+
+// TODO(https://github.com/apache/arrow-adbc/issues/2021): unpin go
+toolchain go1.22.4
 
 require (
 	cloud.google.com/go/bigquery v1.62.0
@@ -31,7 +34,7 @@ require (
 	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
 	golang.org/x/oauth2 v0.23.0
 	golang.org/x/sync v0.8.0
-	golang.org/x/tools v0.24.0
+	golang.org/x/tools v0.25.0
 	google.golang.org/api v0.197.0
 	google.golang.org/grpc v1.66.2
 	google.golang.org/protobuf v1.34.2
@@ -106,7 +109,7 @@ require (
 	go.opentelemetry.io/otel/metric v1.29.0 // indirect
 	go.opentelemetry.io/otel/trace v1.29.0 // indirect
 	golang.org/x/crypto v0.27.0 // indirect
-	golang.org/x/mod v0.20.0 // indirect
+	golang.org/x/mod v0.21.0 // indirect
 	golang.org/x/net v0.29.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/term v0.24.0 // indirect
diff --git a/go/adbc/go.sum b/go/adbc/go.sum
index 70c8933cf..b20911c4a 100644
--- a/go/adbc/go.sum
+++ b/go/adbc/go.sum
@@ -244,8 +244,8 @@ golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeId
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
-golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -285,8 +285,8 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
-golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
+golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
+golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk=
 golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=