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

GH-37636: [Go] Bump minimum go versions #37637

Merged
merged 16 commits into from
Sep 13, 2023
Merged
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ CUDA=11.0.3
DASK=latest
DOTNET=7.0
GCC_VERSION=""
GO=1.17
STATICCHECK=v0.2.2
GO=1.19.13
STATICCHECK=v0.4.5
HDFS=3.2.1
JDK=8
KARTOTHEK=latest
Expand Down
82 changes: 30 additions & 52 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,23 @@ jobs:
include:
- arch-label: AMD64
arch: amd64
go: 1.17
runs-on: ubuntu-latest
staticcheck: v0.2.2
go: 1.19
runs-on: ubuntu-latest
kou marked this conversation as resolved.
Show resolved Hide resolved
- arch-label: AMD64
arch: amd64
go: 1.18
runs-on: ubuntu-latest
staticcheck: v0.3.3
go: '1.20'
runs-on: ubuntu-latest
kou marked this conversation as resolved.
Show resolved Hide resolved
- arch-label: ARM64
arch: arm64v8
go: 1.17
staticcheck: v0.2.2
go: 1.19
kou marked this conversation as resolved.
Show resolved Hide resolved
runs-on: ["self-hosted", "arm", "linux"]
- arch-label: ARM64
arch: arm64v8
go: 1.18
staticcheck: v0.3.3
go: '1.20'
kou marked this conversation as resolved.
Show resolved Hide resolved
runs-on: ["self-hosted", "arm", "linux"]
env:
ARCH: ${{ matrix.arch }}
GO: ${{ matrix.go }}
STATICCHECK: ${{ matrix.staticcheck }}
GO: ${{ matrix.go }}
kou marked this conversation as resolved.
Show resolved Hide resolved
steps:
- name: Checkout Arrow
uses: actions/checkout@v4
Expand Down Expand Up @@ -145,7 +140,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: 1.19
cache: true
cache-dependency-path: go/go.sum
- name: Run build
Expand All @@ -161,15 +156,9 @@ jobs:
strategy:
fail-fast: false
matrix:
go: [1.17, 1.18]
include:
- go: 1.17
staticcheck: v0.2.2
- go: 1.18
staticcheck: v0.3.3
go: [1.19, '1.20']
kou marked this conversation as resolved.
Show resolved Hide resolved
env:
GO: ${{ matrix.go }}
STATICCHECK: ${{ matrix.staticcheck }}
GO: ${{ matrix.go }}
kou marked this conversation as resolved.
Show resolved Hide resolved
steps:
- name: Checkout Arrow
uses: actions/checkout@v4
Expand Down Expand Up @@ -208,15 +197,9 @@ jobs:
strategy:
fail-fast: false
matrix:
go: [1.17, 1.18]
include:
- go: 1.17
staticcheck: v0.2.2
- go: 1.18
staticcheck: v0.3.3
go: [1.19, '1.20']
kou marked this conversation as resolved.
Show resolved Hide resolved
env:
GO: ${{ matrix.go }}
STATICCHECK: ${{ matrix.staticcheck }}
steps:
- name: Checkout Arrow
uses: actions/checkout@v4
Expand Down Expand Up @@ -253,12 +236,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: [1.17, 1.18]
include:
- go: 1.17
staticcheck: v0.2.2
- go: 1.18
staticcheck: v0.3.3
go: [1.19, '1.20']
steps:
- name: Checkout Arrow
uses: actions/checkout@v4
Expand All @@ -272,7 +250,10 @@ jobs:
cache: true
cache-dependency-path: go/go.sum
- name: Install staticcheck
run: go install honnef.co/go/tools/cmd/staticcheck@${{ matrix.staticcheck }}
shell: bash
run: |
zeroshade marked this conversation as resolved.
Show resolved Hide resolved
. .env
go install honnef.co/go/tools/cmd/staticcheck@${STATICCHECK}
- name: Build
shell: bash
run: ci/scripts/go_build.sh $(pwd)
Expand All @@ -288,12 +269,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: [1.17, 1.18]
include:
- go: 1.17
staticcheck: v0.2.2
- go: 1.18
staticcheck: v0.3.3
go: [1.19, '1.20']
steps:
- name: Checkout Arrow
uses: actions/checkout@v4
Expand All @@ -306,8 +282,10 @@ jobs:
go-version: ${{ matrix.go }}
cache: true
cache-dependency-path: go/go.sum
- name: Install staticcheck
run: go install honnef.co/go/tools/cmd/staticcheck@${{ matrix.staticcheck }}
- name: Install staticcheck
run: |
. .env
go install honnef.co/go/tools/cmd/staticcheck@${STATICCHECK}
- name: Build
shell: bash
run: ci/scripts/go_build.sh $(pwd)
Expand Down Expand Up @@ -349,12 +327,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: [1.17, 1.18]
include:
- go: 1.17
staticcheck: v0.2.2
- go: 1.18
staticcheck: v0.3.3
go: [1.19, '1.20']
env:
ARROW_GO_TESTCGO: "1"
steps:
Expand All @@ -373,7 +346,9 @@ jobs:
shell: bash
run: brew install apache-arrow pkg-config
- name: Install staticcheck
run: go install honnef.co/go/tools/cmd/staticcheck@${{ matrix.staticcheck }}
run: |
. .env
go install honnef.co/go/tools/cmd/staticcheck@${STATICCHECK}
- name: Add To pkg config path
shell: bash
run: |
Expand Down Expand Up @@ -430,11 +405,14 @@ jobs:
- name: Install go
uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.19'
cache: true
cache-dependency-path: go/go.sum
- name: Install staticcheck
run: go install honnef.co/go/tools/cmd/staticcheck@v0.3.3
shell: bash
run: |
zeroshade marked this conversation as resolved.
Show resolved Hide resolved
. .env
go install honnef.co/go/tools/cmd/staticcheck@${STATICCHECK}
- name: Build
shell: bash
run: ci/scripts/go_build.sh $(pwd)
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/conda-integration.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ARG maven=3.5
ARG node=16
ARG yarn=1.22
ARG jdk=8
ARG go=1.15
ARG go=1.19.13

# Install Archery and integration dependencies
COPY ci/conda_env_archery.txt /arrow/ci/
Expand Down
4 changes: 2 additions & 2 deletions ci/docker/debian-11-go.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
# under the License.

ARG arch=amd64
ARG go=1.17
ARG staticcheck=v0.2.2
ARG go=1.19
ARG staticcheck=v0.4.5
FROM ${arch}/golang:${go}-bullseye

# FROM collects all the args, get back the staticcheck version arg
Expand Down
3 changes: 3 additions & 0 deletions go/arrow/compute/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,9 @@ func (v *vectorExecutor) WrapResults(ctx context.Context, out <-chan Datum, hasC
case <-ctx.Done():
return nil
case output = <-out:
if output == nil {
return nil
}
// if the inputs contained at least one chunked array
// then we want to return chunked output
if hasChunked {
Expand Down
2 changes: 1 addition & 1 deletion go/arrow/compute/exprs/builders_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestNewScalarFunc(t *testing.T) {
require.NoError(t, err)

assert.Equal(t, "add(i32(1), i32(10), {overflow: [ERROR]}) => i32", fn.String())
assert.Equal(t, "add:i32_i32", fn.Name())
assert.Equal(t, "add:i32_i32", fn.CompoundName())
}

func TestFieldRefDotPath(t *testing.T) {
Expand Down
54 changes: 27 additions & 27 deletions go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,60 +20,60 @@ go 1.20

require (
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c
github.com/andybalholm/brotli v1.0.4
github.com/apache/thrift v0.16.0
github.com/andybalholm/brotli v1.0.5
github.com/apache/thrift v0.17.0
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
github.com/goccy/go-json v0.10.0
github.com/goccy/go-json v0.10.2
github.com/golang/snappy v0.0.4
github.com/google/flatbuffers v23.1.21+incompatible
github.com/google/flatbuffers v23.5.26+incompatible
github.com/klauspost/asmfmt v1.3.2
github.com/klauspost/compress v1.15.15
github.com/klauspost/cpuid/v2 v2.2.3
github.com/klauspost/compress v1.16.7
github.com/klauspost/cpuid/v2 v2.2.5
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3
github.com/pierrec/lz4/v4 v4.1.17
github.com/stretchr/testify v1.8.1
github.com/pierrec/lz4/v4 v4.1.18
github.com/stretchr/testify v1.8.4
github.com/zeebo/xxh3 v1.0.2
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
golang.org/x/sync v0.1.0
golang.org/x/sys v0.5.0
golang.org/x/tools v0.6.0
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
golang.org/x/sync v0.3.0
golang.org/x/sys v0.12.0
golang.org/x/tools v0.13.0
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
gonum.org/v1/gonum v0.12.0
google.golang.org/grpc v1.53.0
google.golang.org/protobuf v1.28.1
modernc.org/sqlite v1.20.4
google.golang.org/grpc v1.54.0
google.golang.org/protobuf v1.31.0
modernc.org/sqlite v1.21.2
)

require (
github.com/google/uuid v1.3.0
github.com/substrait-io/substrait-go v0.2.1-0.20230517203920-30fa08bd57d0
github.com/substrait-io/substrait-go v0.4.2
)

require (
github.com/alecthomas/participle/v2 v2.0.0 // indirect
github.com/alecthomas/participle/v2 v2.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/goccy/go-yaml v1.9.8 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/goccy/go-yaml v1.11.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/text v0.7.0 // indirect
google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/uint128 v1.2.0 // indirect
lukechampine.com/uint128 v1.3.0 // indirect
modernc.org/cc/v3 v3.40.0 // indirect
modernc.org/ccgo/v3 v3.16.13 // indirect
modernc.org/libc v1.22.2 // indirect
modernc.org/libc v1.22.4 // indirect
modernc.org/mathutil v1.5.0 // indirect
modernc.org/memory v1.5.0 // indirect
modernc.org/opt v0.1.3 // indirect
Expand Down
Loading