Skip to content

Commit 6979e8c

Browse files
committed
Merge remote-tracking branch 'upstream/main' into cp315_nightly
2 parents 2d2a557 + fea7897 commit 6979e8c

1,441 files changed

Lines changed: 75371 additions & 58300 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.asf.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,17 @@ github:
3232
main: {}
3333

3434
collaborators:
35-
- anjakefala
35+
- alinaliBQ
36+
- AntoinePrv
37+
- EnricoMi
3638
- hiroyuki-sato
37-
- jbonofre
38-
- js8544
39-
- vibhatha
40-
- ZhangHuiGui
39+
- HyukjinKwon
40+
- tadeja
41+
42+
copilot_code_review:
43+
enabled: true
44+
review_drafts: true
45+
review_on_push: true
4146

4247
notifications:
4348
commits: commits@arrow.apache.org

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
!ruby/red-arrow-cuda/Gemfile
4141
!ruby/red-arrow-cuda/lib/arrow-cuda/version.rb
4242
!ruby/red-arrow-cuda/red-arrow-cuda.gemspec
43+
!ruby/red-arrow-format/Gemfile
44+
!ruby/red-arrow-format/lib/arrow-format/version.rb
45+
!ruby/red-arrow-format/red-arrow-format.gemspec
4346
!ruby/red-gandiva/Gemfile
4447
!ruby/red-gandiva/lib/gandiva/version.rb
4548
!ruby/red-gandiva/red-gandiva.gemspec

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ indent_style = space
4242
indent_size = 2
4343
indent_style = space
4444

45+
[{meson.build,meson_options.txt}]
46+
indent_size = 4
47+
indent_style = space
48+
4549
[*.cs]
4650
indent_size = 4
4751
indent_style = space

.env

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,21 @@ ULIMIT_CORE=-1
5252
# Default versions for platforms
5353
ALMALINUX=8
5454
ALPINE_LINUX=3.22
55-
DEBIAN=12
55+
DEBIAN=13
5656
FEDORA=42
5757
UBUNTU=22.04
5858

5959
# Default versions for various dependencies
60-
CLANG_TOOLS=14
60+
CLANG_TOOLS=18
6161
CMAKE=3.26.0
6262
CUDA=11.7.1
6363
DASK=latest
64-
DOTNET=8.0
6564
GCC=
6665
HDFS=3.2.1
6766
JDK=11
68-
KARTOTHEK=latest
6967
# LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
7068
LLVM=18
71-
MAVEN=3.8.7
69+
MAVEN=3.9.9
7270
NODE=20
7371
NUMBA=latest
7472
NUMBA_CUDA=latest
@@ -79,15 +77,13 @@ PYTHON_IMAGE_TAG=3.10
7977
PYTHON_ABI_TAG=cp310
8078
R=4.5
8179
SPARK=master
82-
TURBODBC=latest
8380

8481
# These correspond to images on Docker Hub that contain R, e.g. rhub/ubuntu-release:latest
8582
R_IMAGE=ubuntu-release
8683
R_ORG=rhub
8784
R_TAG=latest
8885

8986
# Env vars for R builds
90-
R_UPDATE_CLANG=false
9187
R_CUSTOM_CCACHE=false
9288
ARROW_R_DEV=TRUE
9389
R_PRUNE_DEPS=FALSE
@@ -96,17 +92,11 @@ TZ=UTC
9692
# Used through compose.yaml and serves as the default version for the
9793
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
9894
# docker tags more readable.
99-
VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release
95+
VCPKG="9b965a116838c6cdcd36bca60d1b81b030c8ab8d" # 2026.05.27 (not release, upstream commit)
10096

10197
# This must be updated when we update
10298
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
10399
# This is a workaround for our CI problem that "archery docker build" doesn't
104100
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
105-
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-10-13
106-
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-10-13
107-
108-
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
109-
# See https://github.com/conan-io/conan-docker-tools#readme and
110-
# https://hub.docker.com/u/conanio for available images.
111-
CONAN_BASE=gcc11-ubuntu16.04
112-
CONAN_VERSION=2.12.1
101+
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-06-03
102+
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-06-03

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cpp/src/arrow/util/bpacking_*_generated_internal.h linguist-generated=true
22
cpp/src/parquet/chunker_*_generated.h linguist-generated=true
33
cpp/src/generated/*.cpp linguist-generated=true
44
cpp/src/generated/*.h linguist-generated=true
5+
cpp/src/generated/*.tcc linguist-generated=true
56
go/**/*.s linguist-generated=true
67
go/arrow/unionmode_string.go linguist-generated=true
78
go/arrow/internal/flatbuf/*.go linguist-generated=true

.github/CODEOWNERS

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,6 @@
2525
# Arrow Format
2626
# /format/
2727

28-
## Components
29-
/c_glib/ @kou
30-
# /cpp/
31-
/cpp/src/arrow/acero @westonpace
32-
/cpp/src/arrow/adapters/orc @wgtmac
33-
/cpp/src/arrow/engine @westonpace
34-
/cpp/src/arrow/flight/ @lidavidm
35-
/cpp/src/parquet @wgtmac
36-
/matlab/ @kevingurney @kou @sgilmore10
37-
/python/ @AlenkaF @raulcd @rok
38-
/python/pyarrow/_flight.pyx @lidavidm
39-
/python/pyarrow/**/*gandiva* @wjones127
40-
/r/ @jonkeane @thisisnic
41-
/ruby/ @kou
42-
4328
# Docs
4429
# /docs/
4530
# *.md
@@ -51,20 +36,43 @@
5136
/.github/ @assignUser @jonkeane @kou @raulcd
5237
.asf.yaml @assignUser @kou @raulcd
5338
.pre-commit-config.yaml @raulcd
54-
.travis.yml @assignUser @kou @raulcd
55-
appveyor.yml @assignUser @kou @raulcd
5639
# .git*
5740

58-
# release scripts, archery etc.
41+
# Release scripts, archery etc.
5942
/ci/ @assignUser @jonkeane @kou @raulcd
6043
/dev/ @assignUser @jonkeane @kou @raulcd
6144
.dockerignore @raulcd
6245
.env @assignUser @jonkeane @kou @raulcd
6346
compose.yaml @assignUser @jonkeane @kou @raulcd
6447

65-
# R specific packaging tooling
48+
# Components
49+
50+
## C GLib
51+
/c_glib/ @kou
52+
53+
## C++
54+
/cpp/src/arrow/acero @westonpace
55+
/cpp/src/arrow/adapters/orc @wgtmac
56+
/cpp/src/arrow/engine @westonpace
57+
/cpp/src/arrow/flight/ @lidavidm
58+
/cpp/src/parquet @wgtmac
59+
60+
## MATLAB
61+
/.github/workflows/matlab.yml @kevingurney @sgilmore10
62+
/matlab/ @kevingurney @kou @sgilmore10
63+
64+
## Python
65+
/python/ @AlenkaF @raulcd @rok
66+
/python/pyarrow/_flight.pyx @lidavidm
67+
/python/pyarrow/**/*gandiva* @wjones127
68+
69+
## R
70+
/r/ @jonkeane @thisisnic
6671
/r/configure* @assignUser
6772
/r/Makefile @assignUser
6873
/r/PACKAGING.md @assignUser
6974
/r/tools/ @assignUser
70-
.Rbuildignore @assignUser
75+
/r/.Rbuildignore @assignUser
76+
77+
## Ruby
78+
/ruby/ @kou
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: ODBC Windows Reusable
19+
inputs:
20+
github-token:
21+
description: 'GITHUB_TOKEN for vcpkg caching'
22+
required: true
23+
runs:
24+
using: "composite"
25+
steps:
26+
- name: Disable Crash Dialogs
27+
shell: pwsh
28+
run: |
29+
reg add `
30+
"HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting" `
31+
/v DontShowUI `
32+
/t REG_DWORD `
33+
/d 1 `
34+
/f
35+
- name: Download Timezone Database
36+
shell: bash
37+
run: ci/scripts/download_tz_database.sh
38+
- name: Install ccache
39+
shell: bash
40+
run: |
41+
ci/scripts/install_ccache.sh 4.12.1 /usr
42+
- name: Setup ccache
43+
shell: bash
44+
run: |
45+
ci/scripts/ccache_setup.sh
46+
- name: ccache info
47+
id: ccache-info
48+
shell: bash
49+
run: |
50+
echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
51+
- name: Cache ccache
52+
uses: actions/cache@v5
53+
with:
54+
path: ${{ steps.ccache-info.outputs.cache-dir }}
55+
key: cpp-odbc-ccache-windows-x64-${{ hashFiles('cpp/**') }}
56+
restore-keys: cpp-odbc-ccache-windows-x64-
57+
- name: Checkout vcpkg
58+
uses: actions/checkout@v6
59+
with:
60+
persist-credentials: false
61+
fetch-depth: 0
62+
path: vcpkg
63+
repository: microsoft/vcpkg
64+
- name: Bootstrap vcpkg
65+
shell: pwsh
66+
run: |
67+
vcpkg\bootstrap-vcpkg.bat
68+
$VCPKG_ROOT = $(Resolve-Path -LiteralPath "vcpkg").ToString()
69+
Write-Output ${VCPKG_ROOT} | `
70+
Out-File -FilePath ${Env:GITHUB_PATH} -Encoding utf8 -Append
71+
Write-Output "VCPKG_ROOT=${VCPKG_ROOT}" | `
72+
Out-File -FilePath ${Env:GITHUB_ENV} -Encoding utf8 -Append
73+
- name: Setup NuGet credentials for vcpkg caching
74+
shell: bash
75+
run: |
76+
$(vcpkg fetch nuget | tail -n 1) \
77+
sources add \
78+
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json" \
79+
-storepasswordincleartext \
80+
-name "GitHub" \
81+
-username "$GITHUB_REPOSITORY_OWNER" \
82+
-password "${{ inputs.github-token }}"
83+
$(vcpkg fetch nuget | tail -n 1) \
84+
setapikey "${{ inputs.github-token }}" \
85+
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
86+
- name: Build
87+
shell: cmd
88+
run: |
89+
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
90+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
91+
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
92+
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
93+
- name: Register Flight SQL ODBC Driver
94+
shell: cmd
95+
run: |
96+
call "cpp\src\arrow\flight\sql\odbc\tests\install_odbc.cmd" ${{ github.workspace }}\build\cpp\%ARROW_BUILD_TYPE%\arrow_flight_sql_odbc.dll

.github/pull_request_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ If this is your first pull request you can find detailed information on how to c
44

55
* [New Contributor's Guide](https://arrow.apache.org/docs/dev/developers/guide/step_by_step/pr_lifecycle.html#reviews-and-merge-of-the-pull-request)
66
* [Contributing Overview](https://arrow.apache.org/docs/dev/developers/overview.html)
7+
* [AI-generated Code Guidance](https://arrow.apache.org/docs/dev/developers/overview.html#ai-generated-code)
78

89
Please remove this line and the above text before creating your pull request.
910

.github/workflows/archery.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,15 @@ jobs:
5858
timeout-minutes: 15
5959
steps:
6060
- name: Checkout Arrow
61-
uses: actions/checkout@v5
61+
uses: actions/checkout@v6
6262
with:
63+
persist-credentials: false
6364
fetch-depth: 0
6465
- name: Git Fixup
6566
shell: bash
6667
run: git branch $ARCHERY_DEFAULT_BRANCH origin/$ARCHERY_DEFAULT_BRANCH || true
6768
- name: Setup Python
68-
uses: actions/setup-python@v6.0.0
69+
uses: actions/setup-python@v6
6970
with:
7071
python-version: '3.12'
7172
- name: Install pygit2 binary wheel

.github/workflows/check_labels.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ on:
3232
description: "Whether to force running the jobs"
3333
value: ${{ jobs.check-labels.outputs.force }}
3434

35+
permissions:
36+
contents: read
37+
pull-requests: read
38+
3539
jobs:
3640
check-labels:
3741
name: Check labels
@@ -43,11 +47,14 @@ jobs:
4347
steps:
4448
- name: Checkout Arrow
4549
if: github.event_name == 'pull_request'
46-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
50+
uses: actions/checkout@v6
51+
with:
52+
persist-credentials: false
4753
- name: Check
4854
id: check
4955
env:
5056
GH_TOKEN: ${{ github.token }}
57+
PARENT_WORKFLOW: ${{ inputs.parent-workflow }}
5158
run: |
5259
set -ex
5360
case "${GITHUB_EVENT_NAME}" in
@@ -67,7 +74,7 @@ jobs:
6774
git diff --stat origin/${GITHUB_BASE_REF}..
6875
if git diff --stat origin/${GITHUB_BASE_REF}.. | \
6976
grep \
70-
--fixed-strings ".github/workflows/${{ inputs.parent-workflow }}.yml" \
77+
--fixed-strings ".github/workflows/${PARENT_WORKFLOW}.yml" \
7178
--quiet; then
7279
echo "force=true" >> "${GITHUB_OUTPUT}"
7380
fi

0 commit comments

Comments
 (0)