Skip to content

Commit 9e577b7

Browse files
author
Rafał Hibner
committed
Merge branch 'main' of https://github.com/apache/arrow into asof_join_pause
2 parents 5109d5b + c2fb0e3 commit 9e577b7

433 files changed

Lines changed: 30134 additions & 4583 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.

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cpp/src/arrow/util/bpacking_*_generated.h linguist-generated=true
2+
cpp/src/parquet/chunker_*_generated.h linguist-generated=true
23
cpp/src/generated/*.cpp linguist-generated=true
34
cpp/src/generated/*.h linguist-generated=true
45
go/**/*.s linguist-generated=true

‎.github/dependabot.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ updates:
3838
commit-message:
3939
prefix: "MINOR: [Swift] "
4040
open-pull-requests-limit: 10
41-
- package-ecosystem: "npm"
42-
directory: "/js/"
43-
schedule:
44-
interval: "monthly"
45-
commit-message:
46-
prefix: "MINOR: [JS] "
47-
open-pull-requests-limit: 10
4841
- package-ecosystem: "nuget"
4942
directory: "/csharp/"
5043
schedule:

‎.github/workflows/cpp.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ jobs:
395395
ARROW_DATASET: ON
396396
ARROW_FLIGHT: ON
397397
ARROW_FLIGHT_SQL: ON
398+
ARROW_FLIGHT_SQL_ODBC: ON
398399
ARROW_GANDIVA: ON
399400
ARROW_GCS: ON
400401
ARROW_HDFS: OFF

‎.github/workflows/cpp_extra.yml‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
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: C++ Extra
19+
20+
on:
21+
push:
22+
branches:
23+
- '**'
24+
- '!dependabot/**'
25+
paths:
26+
- '.dockerignore'
27+
- '.github/workflows/cpp_extra.yml'
28+
- 'ci/conda_env_*'
29+
- 'ci/docker/**'
30+
- 'ci/scripts/cpp_*'
31+
- 'ci/scripts/install_azurite.sh'
32+
- 'ci/scripts/install_gcs_testbench.sh'
33+
- 'ci/scripts/install_minio.sh'
34+
- 'ci/scripts/msys2_*'
35+
- 'ci/scripts/util_*'
36+
- 'cpp/**'
37+
- 'docker-compose.yml'
38+
- 'format/Flight.proto'
39+
- 'testing'
40+
tags:
41+
- '**'
42+
pull_request:
43+
paths:
44+
- '.dockerignore'
45+
- '.github/workflows/cpp_extra.yml'
46+
- 'ci/conda_env_*'
47+
- 'ci/docker/**'
48+
- 'ci/scripts/cpp_*'
49+
- 'ci/scripts/install_azurite.sh'
50+
- 'ci/scripts/install_gcs_testbench.sh'
51+
- 'ci/scripts/install_minio.sh'
52+
- 'ci/scripts/msys2_*'
53+
- 'ci/scripts/util_*'
54+
- 'cpp/**'
55+
- 'docker-compose.yml'
56+
- 'format/Flight.proto'
57+
- 'testing'
58+
types:
59+
- labeled
60+
- opened
61+
- reopened
62+
- synchronize
63+
schedule:
64+
- cron: |
65+
0 0 * * *
66+
67+
concurrency:
68+
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
69+
cancel-in-progress: true
70+
71+
permissions:
72+
contents: read
73+
74+
jobs:
75+
check-labels:
76+
name: Check labels
77+
runs-on: ubuntu-latest
78+
timeout-minutes: 5
79+
outputs:
80+
ci-extra: ${{ steps.check.outputs.ci-extra }}
81+
steps:
82+
- name: Check
83+
id: check
84+
env:
85+
GH_TOKEN: ${{ github.token }}
86+
run: |
87+
case "${GITHUB_EVENT_NAME}" in
88+
push|workflow_dispatch)
89+
ci_extra=true
90+
;;
91+
pull_request)
92+
n_ci_extra_labels=$(
93+
gh pr view ${{ github.event.number }} \
94+
--jq '.labels[].name | select(. == "CI: Extra")' \
95+
--json labels \
96+
--repo ${GITHUB_REPOSITORY} | wc -l)
97+
if [ "${n_ci_extra_labels}" -eq 1 ]; then
98+
ci_extra=true
99+
else
100+
ci_extra=false
101+
fi
102+
;;
103+
esac
104+
105+
echo "ci-extra=${ci_extra}" >> "${GITHUB_OUTPUT}"
106+
107+
docker:
108+
needs: check-labels
109+
name: ${{ matrix.title }}
110+
runs-on: ${{ matrix.runs-on }}
111+
if: needs.check-labels.outputs.ci-extra == 'true'
112+
timeout-minutes: 75
113+
strategy:
114+
fail-fast: false
115+
matrix:
116+
include:
117+
- image: conda-cpp
118+
run-options: >-
119+
-e ARROW_USE_MESON=ON
120+
runs-on: ubuntu-latest
121+
title: AMD64 Ubuntu Meson
122+
env:
123+
ARCHERY_DEBUG: 1
124+
ARROW_ENABLE_TIMING_TESTS: OFF
125+
# DOCKER_VOLUME_PREFIX: ".docker/"
126+
steps:
127+
- name: Checkout Arrow
128+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
129+
with:
130+
fetch-depth: 0
131+
submodules: recursive
132+
- name: Cache Docker Volumes
133+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
134+
with:
135+
path: .docker
136+
key: extra-${{ matrix.image }}-${{ hashFiles('cpp/**') }}
137+
restore-keys: extra-${{ matrix.image }}-
138+
- name: Setup Python
139+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
140+
with:
141+
python-version: 3
142+
- name: Setup Archery
143+
run: python3 -m pip install -e dev/archery[docker]
144+
- name: Execute Docker Build
145+
env:
146+
ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
147+
ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
148+
run: |
149+
# GH-40558: reduce ASLR to avoid ASAN/LSAN crashes
150+
sudo sysctl -w vm.mmap_rnd_bits=28
151+
source ci/scripts/util_enable_core_dumps.sh
152+
archery docker run ${{ matrix.run-options || '' }} ${{ matrix.image }}
153+
- name: Docker Push
154+
if: >-
155+
success() &&
156+
github.event_name == 'push' &&
157+
github.repository == 'apache/arrow' &&
158+
github.ref_name == 'main'
159+
env:
160+
ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
161+
ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
162+
continue-on-error: true
163+
run: archery docker push ${{ matrix.image }}

‎.github/workflows/dev.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
5454
with:
5555
python-version: 3.12
56+
- uses: r-lib/actions/setup-r@bd49c52ffe281809afa6f0fecbf37483c5dd0b93 # v2.11.3
5657
- name: Install pre-commit
5758
run: |
5859
python -m pip install pre-commit

‎.github/workflows/integration.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,8 @@ on:
3030
- 'ci/**'
3131
- 'dev/archery/**'
3232
- 'docker-compose.yml'
33-
- 'go/**'
3433
- 'integration/**'
35-
- 'js/**'
3634
- 'cpp/**'
37-
- 'java/**'
3835
- 'csharp/**'
3936
- 'format/**'
4037
pull_request:
@@ -44,12 +41,9 @@ on:
4441
- 'ci/**'
4542
- 'dev/archery/**'
4643
- 'docker-compose.yml'
47-
- 'go/**'
4844
- 'integration/**'
49-
- 'js/**'
5045
- 'cpp/**'
5146
- 'csharp/**'
52-
- 'java/**'
5347
- 'format/**'
5448

5549
concurrency:
@@ -72,30 +66,35 @@ jobs:
7266
timeout-minutes: 60
7367
steps:
7468
- name: Checkout Arrow
75-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
69+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7670
with:
7771
fetch-depth: 0
7872
submodules: recursive
7973
- name: Checkout Arrow Rust
80-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
74+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8175
with:
8276
repository: apache/arrow-rs
8377
path: rust
8478
- name: Checkout Arrow nanoarrow
85-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
79+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8680
with:
8781
repository: apache/arrow-nanoarrow
8882
path: nanoarrow
8983
- name: Checkout Arrow Go
90-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
84+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9185
with:
9286
repository: apache/arrow-go
9387
path: go
9488
- name: Checkout Arrow Java
95-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
89+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9690
with:
9791
repository: apache/arrow-java
9892
path: java
93+
- name: Checkout Arrow JS
94+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
95+
with:
96+
repository: apache/arrow-js
97+
path: js
9998
- name: Free up disk space
10099
run: |
101100
ci/scripts/util_free_space.sh
@@ -121,6 +120,7 @@ jobs:
121120
-e ARCHERY_DEFAULT_BRANCH=${{ github.event.repository.default_branch }} \
122121
-e ARCHERY_INTEGRATION_WITH_GO=1 \
123122
-e ARCHERY_INTEGRATION_WITH_JAVA=1 \
123+
-e ARCHERY_INTEGRATION_WITH_JS=1 \
124124
-e ARCHERY_INTEGRATION_WITH_NANOARROW=1 \
125125
-e ARCHERY_INTEGRATION_WITH_RUST=1 \
126126
conda-integration

0 commit comments

Comments
 (0)