Skip to content

Commit ae995ba

Browse files
authored
Merge branch 'main' into coalesce_batches_filter
2 parents b235243 + 67e04e7 commit ae995ba

File tree

146 files changed

+12101
-2275
lines changed

Some content is hidden

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

146 files changed

+12101
-2275
lines changed

.github/pull_request_template.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,38 @@
11
# Which issue does this PR close?
22

3+
<!--
34
We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax.
5+
-->
46

57
- Closes #NNN.
68

79
# Rationale for this change
810

11+
<!--
912
Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
1013
Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
14+
-->
1115

1216
# What changes are included in this PR?
1317

18+
<!--
1419
There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
20+
-->
1521

1622
# Are these changes tested?
1723

24+
<!--
1825
We typically require tests for all PRs in order to:
1926
1. Prevent the code from being accidentally broken by subsequent changes
2027
2. Serve as another way to document the expected behavior of the code
2128
2229
If tests are not included in your PR, please explain why (for example, are they covered by existing tests)?
30+
-->
2331

2432
# Are there any user-facing changes?
2533

34+
<!--
2635
If there are user-facing changes then we may require documentation to be updated before approving the PR.
2736
2837
If there are any breaking changes to public APIs, please call them out.
38+
-->

.github/workflows/arrow.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
container:
5757
image: amd64/rust
5858
steps:
59-
- uses: actions/checkout@v5
59+
- uses: actions/checkout@v6
6060
with:
6161
submodules: true
6262
- name: Setup Rust toolchain
@@ -115,7 +115,7 @@ jobs:
115115
container:
116116
image: amd64/rust
117117
steps:
118-
- uses: actions/checkout@v5
118+
- uses: actions/checkout@v6
119119
with:
120120
submodules: true
121121
- name: Setup Rust toolchain
@@ -143,7 +143,7 @@ jobs:
143143
container:
144144
image: amd64/rust
145145
steps:
146-
- uses: actions/checkout@v5
146+
- uses: actions/checkout@v6
147147
with:
148148
submodules: true
149149
- name: Setup Rust toolchain
@@ -163,7 +163,7 @@ jobs:
163163
container:
164164
image: amd64/rust
165165
steps:
166-
- uses: actions/checkout@v5
166+
- uses: actions/checkout@v6
167167
- name: Setup Rust toolchain
168168
uses: ./.github/actions/setup-builder
169169
- name: Setup Clippy

.github/workflows/arrow_flight.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
container:
4848
image: amd64/rust
4949
steps:
50-
- uses: actions/checkout@v5
50+
- uses: actions/checkout@v6
5151
with:
5252
submodules: true
5353
- name: Setup Rust toolchain
@@ -68,7 +68,7 @@ jobs:
6868
container:
6969
image: amd64/rust
7070
steps:
71-
- uses: actions/checkout@v5
71+
- uses: actions/checkout@v6
7272
- name: Setup Rust toolchain
7373
uses: ./.github/actions/setup-builder
7474
- name: Run gen
@@ -82,7 +82,7 @@ jobs:
8282
container:
8383
image: amd64/rust
8484
steps:
85-
- uses: actions/checkout@v5
85+
- uses: actions/checkout@v6
8686
- name: Setup Rust toolchain
8787
uses: ./.github/actions/setup-builder
8888
- name: Setup Clippy

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
name: Audit
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@v5
39+
- uses: actions/checkout@v6
4040
- name: Install cargo-audit
4141
run: cargo install cargo-audit
4242
- name: Run audit check

.github/workflows/dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
name: Release Audit Tool (RAT)
3939
runs-on: ubuntu-latest
4040
steps:
41-
- uses: actions/checkout@v5
41+
- uses: actions/checkout@v6
4242
- name: Setup Python
4343
uses: actions/setup-python@v6
4444
with:
@@ -50,7 +50,7 @@ jobs:
5050
name: Markdown format
5151
runs-on: ubuntu-latest
5252
steps:
53-
- uses: actions/checkout@v5
53+
- uses: actions/checkout@v6
5454
- uses: actions/setup-node@v6
5555
with:
5656
node-version: "14"

.github/workflows/dev_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
contents: read
3838
pull-requests: write
3939
steps:
40-
- uses: actions/checkout@v5
40+
- uses: actions/checkout@v6
4141

4242
- name: Assign GitHub labels
4343
if: |

.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
env:
4040
RUSTDOCFLAGS: "-Dwarnings --enable-index-page -Zunstable-options"
4141
steps:
42-
- uses: actions/checkout@v5
42+
- uses: actions/checkout@v6
4343
with:
4444
submodules: true
4545
- name: Setup Rust toolchain
@@ -69,9 +69,9 @@ jobs:
6969
contents: write
7070
runs-on: ubuntu-latest
7171
steps:
72-
- uses: actions/checkout@v5
72+
- uses: actions/checkout@v6
7373
- name: Download crate docs
74-
uses: actions/download-artifact@v6
74+
uses: actions/download-artifact@v7
7575
with:
7676
name: crate-docs
7777
path: website/build

.github/workflows/integration.yml

Lines changed: 70 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,58 +78,112 @@ jobs:
7878
run:
7979
shell: bash
8080
steps:
81+
- name: Monitor disk usage - Initial
82+
run: |
83+
echo "=== Initial Disk Usage ==="
84+
df -h /
85+
echo ""
86+
87+
- name: Remove unnecessary preinstalled software
88+
run: |
89+
echo "=== Cleaning up host disk space ==="
90+
echo "Disk space before cleanup:"
91+
df -h /
92+
93+
# Clean apt cache
94+
apt-get clean || true
95+
96+
# Remove GitHub Actions tool cache
97+
rm -rf /__t/* || true
98+
99+
# Remove large packages from host filesystem (mounted at /host/)
100+
rm -rf /host/usr/share/dotnet || true
101+
rm -rf /host/usr/local/lib/android || true
102+
rm -rf /host/usr/local/.ghcup || true
103+
rm -rf /host/opt/hostedtoolcache/CodeQL || true
104+
105+
echo ""
106+
echo "Disk space after cleanup:"
107+
df -h /
108+
echo ""
109+
81110
# This is necessary so that actions/checkout can find git
82111
- name: Export conda path
83112
run: echo "/opt/conda/envs/arrow/bin" >> $GITHUB_PATH
84113
# This is necessary so that Rust can find cargo
85114
- name: Export cargo path
86115
run: echo "/root/.cargo/bin" >> $GITHUB_PATH
87-
- name: Check rustup
88-
run: which rustup
89-
- name: Check cmake
90-
run: which cmake
116+
117+
# Checkout repos (using shallow clones with fetch-depth: 1)
91118
- name: Checkout Arrow
92-
uses: actions/checkout@v5
119+
uses: actions/checkout@v6
93120
with:
94121
repository: apache/arrow
95122
submodules: true
96-
fetch-depth: 0
123+
fetch-depth: 1
97124
- name: Checkout Arrow Rust
98-
uses: actions/checkout@v5
125+
uses: actions/checkout@v6
99126
with:
100127
path: rust
101128
submodules: true
102-
fetch-depth: 0
129+
fetch-depth: 1
103130
- name: Checkout Arrow .NET
104-
uses: actions/checkout@v5
131+
uses: actions/checkout@v6
105132
with:
106133
repository: apache/arrow-dotnet
107134
path: dotnet
135+
fetch-depth: 1
108136
- name: Checkout Arrow Go
109-
uses: actions/checkout@v5
137+
uses: actions/checkout@v6
110138
with:
111139
repository: apache/arrow-go
112140
path: go
141+
fetch-depth: 1
113142
- name: Checkout Arrow Java
114-
uses: actions/checkout@v5
143+
uses: actions/checkout@v6
115144
with:
116145
repository: apache/arrow-java
117146
path: java
147+
fetch-depth: 1
118148
- name: Checkout Arrow JavaScript
119-
uses: actions/checkout@v5
149+
uses: actions/checkout@v6
120150
with:
121151
repository: apache/arrow-js
122152
path: js
153+
fetch-depth: 1
123154
- name: Checkout Arrow nanoarrow
124-
uses: actions/checkout@v5
155+
uses: actions/checkout@v6
125156
with:
126157
repository: apache/arrow-nanoarrow
127158
path: nanoarrow
159+
fetch-depth: 1
160+
161+
- name: Monitor disk usage - After checkouts
162+
run: |
163+
echo "=== After Checkouts ==="
164+
df -h /
165+
echo ""
166+
128167
- name: Build
129168
run: conda run --no-capture-output ci/scripts/integration_arrow_build.sh $PWD /build
169+
170+
- name: Monitor disk usage - After build
171+
if: always()
172+
run: |
173+
echo "=== After Build ==="
174+
df -h /
175+
echo ""
176+
130177
- name: Run
131178
run: conda run --no-capture-output ci/scripts/integration_arrow.sh $PWD /build
132179

180+
- name: Monitor disk usage - After tests
181+
if: always()
182+
run: |
183+
echo "=== After Tests ==="
184+
df -h /
185+
echo ""
186+
133187
# test FFI against the C-Data interface exposed by pyarrow
134188
pyarrow-integration-test:
135189
name: Pyarrow C Data Interface
@@ -140,7 +194,7 @@ jobs:
140194
# PyArrow 15 was the first version to introduce StringView/BinaryView support
141195
pyarrow: ["15", "16", "17"]
142196
steps:
143-
- uses: actions/checkout@v5
197+
- uses: actions/checkout@v6
144198
with:
145199
submodules: true
146200
- name: Setup Rust toolchain
@@ -149,12 +203,12 @@ jobs:
149203
rustup default ${{ matrix.rust }}
150204
rustup component add rustfmt clippy
151205
- name: Cache Cargo
152-
uses: actions/cache@v4
206+
uses: actions/cache@v5
153207
with:
154208
path: /home/runner/.cargo
155209
key: cargo-maturin-cache-
156210
- name: Cache Rust dependencies
157-
uses: actions/cache@v4
211+
uses: actions/cache@v5
158212
with:
159213
path: /home/runner/target
160214
# this key is not equal because maturin uses different compilation flags.

.github/workflows/miri.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
name: MIRI
4848
runs-on: ubuntu-latest
4949
steps:
50-
- uses: actions/checkout@v5
50+
- uses: actions/checkout@v6
5151
with:
5252
submodules: true
5353
- name: Setup Rust toolchain

.github/workflows/parquet-geospatial.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
container:
4242
image: amd64/rust
4343
steps:
44-
- uses: actions/checkout@v5
44+
- uses: actions/checkout@v6
4545
with:
4646
submodules: true
4747
- name: Setup Rust toolchain
@@ -56,7 +56,7 @@ jobs:
5656
container:
5757
image: amd64/rust
5858
steps:
59-
- uses: actions/checkout@v5
59+
- uses: actions/checkout@v6
6060
with:
6161
submodules: true
6262
- name: Setup Rust toolchain
@@ -70,7 +70,7 @@ jobs:
7070
container:
7171
image: amd64/rust
7272
steps:
73-
- uses: actions/checkout@v5
73+
- uses: actions/checkout@v6
7474
- name: Setup Rust toolchain
7575
uses: ./.github/actions/setup-builder
7676
- name: Setup Clippy

0 commit comments

Comments
 (0)