JDBC: Merge with master, fix failing tests

.dockerignore

@@ -61,3 +61,5 @@
 !rust/datafusion/Cargo.toml
 !rust/datafusion/benches
 !rust/integration-testing/Cargo.toml
+!go/go.mod
+!go/go.sum

.env

@@ -47,24 +47,27 @@ ULIMIT_CORE=-1
 
 # Default versions for platforms
 ALMALINUX=8
+ALPINE_LINUX=3.16
 DEBIAN=11
 FEDORA=35
 UBUNTU=20.04
 
 # Default versions for various dependencies
 CLANG_TOOLS=12
-CUDA=9.1
+CUDA=11.0.3
 DASK=latest
 DOTNET=6.0
 GCC_VERSION=""
 GO=1.16
+STATICCHECK=v0.2.2
 HDFS=3.2.1
 JDK=8
 KARTOTHEK=latest
 # LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
 LLVM=13
 MAVEN=3.5.4
 NODE=16
+NUMBA=latest
 NUMPY=latest
 PANDAS=latest
 PYTHON=3.8

.gitattributes

@@ -5,3 +5,5 @@ r/src/arrowExports.cpp linguist-generated=true
 r/man/*.Rd linguist-generated=true
 cpp/src/generated/*.h linguist-generated=true
 r/NEWS.md merge=union
+go/**/*.s linguist-generated=true
+go/arrow/unionmode_string.go linguist-generated=true

.github/workflows/cpp.yml

@@ -119,7 +119,7 @@ jobs:
  docker-compose run --rm minimal
 
  macos:
- name: AMD64 MacOS 10.15 C++
+ name: AMD64 macOS 11 C++
  runs-on: macos-latest
  if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
  timeout-minutes: 60
@@ -193,7 +193,7 @@ jobs:
  name: AMD64 ${{ matrix.name }} C++17
  runs-on: ${{ matrix.os }}
  if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
- timeout-minutes: 45
+ timeout-minutes: 60
  strategy:
  fail-fast: false
  matrix:
@@ -202,14 +202,12 @@ jobs:
  include:
  - os: windows-2019
  name: Windows 2019
- generator: Visual Studio 16 2019
  env:
  ARROW_BOOST_USE_SHARED: OFF
  ARROW_BUILD_BENCHMARKS: ON
  ARROW_BUILD_SHARED: ON
  ARROW_BUILD_STATIC: OFF
  ARROW_BUILD_TESTS: ON
- ARROW_CXXFLAGS: "/std:c++17"
  ARROW_DATASET: ON
  ARROW_FLIGHT: OFF
  ARROW_HDFS: ON
@@ -227,11 +225,13 @@ jobs:
  ARROW_WITH_ZLIB: ON
  ARROW_WITH_ZSTD: ON
  BOOST_SOURCE: BUNDLED
- CMAKE_ARGS: '-A x64 -DOPENSSL_ROOT_DIR=C:\Program Files\OpenSSL-Win64'
- CMAKE_GENERATOR: ${{ matrix.generator }}
+ CMAKE_CXX_STANDARD: "17"
+ CMAKE_GENERATOR: Ninja
  CMAKE_INSTALL_LIBDIR: bin
  CMAKE_INSTALL_PREFIX: /usr
  CMAKE_UNITY_BUILD: ON
+ OPENSSL_ROOT_DIR: >-
+ C:\Program Files\OpenSSL-Win64
  NPROC: 3
  steps:
  - name: Disable Crash Dialogs
@@ -254,9 +254,30 @@ jobs:
  - name: Download Timezone Database
  shell: bash
  run: ci/scripts/download_tz_database.sh
- - name: Build
+ - name: Install ccache
  shell: bash
- run: ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
+ run: |
+ ci/scripts/install_ccache.sh 4.6.2 /usr
+ - name: Setup ccache
+ shell: bash
+ run: |
+ ci/scripts/ccache_setup.sh
+ - name: ccache info
+ id: ccache-info
+ shell: bash
+ run: |
+ echo "::set-output name=cache-dir::$(ccache --get-config cache_dir)"
+ - name: Cache ccache
+ uses: actions/cache@v2
+ with:
+ path: ${{ steps.ccache-info.outputs.cache-dir }}
+ key: cpp-ccache-windows-${{ hashFiles('cpp/**') }}
+ restore-keys: cpp-ccache-windows-
+ - name: Build
+ shell: cmd
+ run: |
+ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+ bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
  - name: Test
  shell: bash
  run: ci/scripts/cpp_test.sh $(pwd) $(pwd)/build

.github/workflows/csharp.yml

@@ -91,7 +91,7 @@ jobs:
  run: ci/scripts/csharp_test.sh $(pwd)
 
  macos:
- name: AMD64 MacOS 10.15 C# ${{ matrix.dotnet }}
+ name: AMD64 macOS 11 C# ${{ matrix.dotnet }}
  runs-on: macos-latest
  if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
  timeout-minutes: 15

.github/workflows/go.yml

@@ -50,9 +50,15 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- go: [1.16]
+ go: [1.16, 1.18]
+ include:
+ - go: 1.16
+ staticcheck: v0.2.2
+ - go: 1.18
+ staticcheck: latest
  env:
  GO: ${{ matrix.go }}
+ STATICCHECK: ${{ matrix.staticcheck }}
  steps:
  - name: Checkout Arrow
  uses: actions/checkout@v3
@@ -80,9 +86,15 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- go: [1.16]
+ go: [1.16, 1.18]
+ include:
+ - go: 1.16
+ staticcheck: v0.2.2
+ - go: 1.18
+ staticcheck: latest
  env:
  GO: ${{ matrix.go }}
+ STATICCHECK: ${{ matrix.staticcheck }}
  steps:
  - name: Checkout Arrow
  uses: actions/checkout@v3
@@ -111,9 +123,15 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- go: [1.16]
+ go: [1.16, 1.18]
+ include:
+ - go: 1.16
+ staticcheck: v0.2.2
+ - go: 1.18
+ staticcheck: latest
  env:
  GO: ${{ matrix.go }}
+ STATICCHECK: ${{ matrix.staticcheck }}
  steps:
  - name: Checkout Arrow
  uses: actions/checkout@v3
@@ -140,19 +158,26 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- go: [1.16]
- steps:
- - name: Install go
- uses: actions/setup-go@v1
- with:
- go-version: ${{ matrix.go }}
+ go: [1.16, 1.18]
+ include:
+ - go: 1.16
+ staticcheck: v0.2.2
+ - go: 1.18
+ staticcheck: latest
+ steps: 
  - name: Checkout Arrow
  uses: actions/checkout@v3
  with:
  fetch-depth: 0
  submodules: recursive
+ - name: Install go
+ uses: actions/setup-go@v3
+ with:
+ go-version: ${{ matrix.go }}
+ cache: true
+ cache-dependency-path: go/go.sum 
  - name: Install staticcheck
- run: go install honnef.co/go/tools/cmd/staticcheck@v0.2.2
+ run: go install honnef.co/go/tools/cmd/staticcheck@${{ matrix.staticcheck }}
  - name: Build
  shell: bash
  run: ci/scripts/go_build.sh $(pwd)
@@ -161,26 +186,33 @@ jobs:
  run: ci/scripts/go_test.sh $(pwd)
 
  macos:
- name: AMD64 MacOS 10.15 Go ${{ matrix.go }}
+ name: AMD64 macOS 11 Go ${{ matrix.go }}
  runs-on: macos-latest
  if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
  timeout-minutes: 15
  strategy:
  fail-fast: false
  matrix:
- go: [1.16]
- steps:
- - name: Install go
- uses: actions/setup-go@v1
- with:
- go-version: ${{ matrix.go }}
+ go: [1.16, 1.18]
+ include:
+ - go: 1.16
+ staticcheck: v0.2.2
+ - go: 1.18
+ staticcheck: latest
+ steps: 
  - name: Checkout Arrow
  uses: actions/checkout@v3
  with:
  fetch-depth: 0
  submodules: recursive
+ - name: Install go
+ uses: actions/setup-go@v3
+ with:
+ go-version: ${{ matrix.go }}
+ cache: true
+ cache-dependency-path: go/go.sum
  - name: Install staticcheck
- run: go install honnef.co/go/tools/cmd/staticcheck@v0.2.2
+ run: go install honnef.co/go/tools/cmd/staticcheck@${{ matrix.staticcheck }}
  - name: Build
  shell: bash
  run: ci/scripts/go_build.sh $(pwd)
@@ -189,31 +221,38 @@ jobs:
  run: ci/scripts/go_test.sh $(pwd)
 
  macos-cgo:
- name: AMD64 MacOS 10.15 Go ${{ matrix.go }} - CGO
+ name: AMD64 macOS 11 Go ${{ matrix.go }} - CGO
  runs-on: macos-latest
  if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
  timeout-minutes: 60
  strategy:
  fail-fast: false
  matrix:
- go: [1.16]
+ go: [1.16, 1.18]
+ include:
+ - go: 1.16
+ staticcheck: v0.2.2
+ - go: 1.18
+ staticcheck: latest
  env:
  ARROW_GO_TESTCGO: "1"
- steps:
- - name: Install go
- uses: actions/setup-go@v1
- with:
- go-version: ${{ matrix.go }}
+ steps: 
  - name: Checkout Arrow
  uses: actions/checkout@v3
  with:
  fetch-depth: 0
  submodules: recursive
+ - name: Install go
+ uses: actions/setup-go@v3
+ with:
+ go-version: ${{ matrix.go }}
+ cache: true
+ cache-dependency-path: go/go.sum
  - name: Brew Install Arrow
  shell: bash
  run: brew install apache-arrow
  - name: Install staticcheck
- run: go install honnef.co/go/tools/cmd/staticcheck@v0.2.2
+ run: go install honnef.co/go/tools/cmd/staticcheck@${{ matrix.staticcheck }}
  - name: Build
  shell: bash
  run: ci/scripts/go_build.sh $(pwd)
@@ -264,11 +303,13 @@ jobs:
  echo "CGO_LDFLAGS=-g -O2 -L$(cygpath --windows ${MINGW_PREFIX}/lib) -L$(cygpath --windows ${MINGW_PREFIX}/bin)" >> $GITHUB_ENV
  echo "MINGW_PREFIX=$(cygpath --windows ${MINGW_PREFIX})" >> $GITHUB_ENV
  - name: Install go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with:
- go-version: '1.17'
+ go-version: '1.18'
+ cache: true
+ cache-dependency-path: go/go.sum
  - name: Install staticcheck
- run: go install honnef.co/go/tools/cmd/staticcheck@v0.2.2
+ run: go install honnef.co/go/tools/cmd/staticcheck@latest
  - name: Build
  shell: bash
  run: ci/scripts/go_build.sh $(pwd)

.github/workflows/java.yml

@@ -101,7 +101,7 @@ jobs:
  run: archery docker push ${{ matrix.image }}
 
  macos:
- name: AMD64 MacOS 10.15 Java JDK ${{ matrix.jdk }}
+ name: AMD64 macOS 11 Java JDK ${{ matrix.jdk }}
  runs-on: macos-latest
  if: github.event_name == 'push'
  timeout-minutes: 30
@@ -125,3 +125,30 @@ jobs:
  - name: Test
  shell: bash
  run: ci/scripts/java_test.sh $(pwd) $(pwd)/build
+
+ windows:
+ name: AMD64 Windows Server 2022 Java JDK ${{ matrix.jdk }}
+ runs-on: windows-latest
+ if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
+ timeout-minutes: 30
+ strategy:
+ fail-fast: false
+ matrix:
+ jdk: [11]
+ steps:
+ - name: Set up Java
+ uses: actions/setup-java@v3
+ with:
+ java-version: ${{ matrix.jdk }}
+ distribution: 'temurin'
+ - name: Checkout Arrow
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ submodules: recursive
+ - name: Build
+ shell: bash
+ run: ci/scripts/java_build.sh $(pwd) $(pwd)/build
+ - name: Test
+ shell: bash
+ run: ci/scripts/java_test.sh $(pwd) $(pwd)/build