Skip to content

Commit 336ec6e

Browse files
committed
Merge remote-tracking branch 'apache/main' into worktree-pr-4239-regexp-default
2 parents 941d9c7 + f65226a commit 336ec6e

65 files changed

Lines changed: 1723 additions & 2302 deletions

Some content is hidden

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

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ metastore_db
1010
target
1111
common/target
1212
spark-integration/target
13-
fuzz-testing/target
1413
spark/target
1514
native/target
1615
core/target

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ permissions:
3636
jobs:
3737
analyze:
3838
name: Analyze Actions
39-
runs-on: ubuntu-latest
39+
runs-on: ubuntu-24.04
4040
permissions:
4141
contents: read
4242
security-events: write

.github/workflows/docker-publish.yml

Lines changed: 0 additions & 79 deletions
This file was deleted.

.github/workflows/iceberg_spark_test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ on:
3636
- "spark/src/test/**"
3737
- "common/src/test/**"
3838
- "spark/src/main/scala/org/apache/comet/GenerateDocs.scala"
39-
- "fuzz-testing/**"
4039
- "spark-integration/**"
4140
pull_request:
4241
paths-ignore:
@@ -50,7 +49,6 @@ on:
5049
- "spark/src/test/**"
5150
- "common/src/test/**"
5251
- "spark/src/main/scala/org/apache/comet/GenerateDocs.scala"
53-
- "fuzz-testing/**"
5452
- "spark-integration/**"
5553
# manual trigger
5654
# https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow

.github/workflows/miri.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ on:
5151
jobs:
5252
miri:
5353
name: "Miri"
54-
runs-on: ubuntu-latest
54+
runs-on: ubuntu-24.04
5555
steps:
5656
- uses: actions/checkout@v6
5757
- name: Install Build Dependencies

.github/workflows/pr_benchmark_check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ env:
4646
jobs:
4747
benchmark-check:
4848
name: Benchmark Compile & Lint Check
49-
runs-on: ubuntu-latest
49+
runs-on: ubuntu-24.04
5050
container:
5151
image: amd64/rust
5252
steps:

.github/workflows/pr_build_linux.yml

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
# Fast lint check - gates all other jobs
6464
lint:
6565
name: Lint
66-
runs-on: ubuntu-latest
66+
runs-on: ubuntu-24.04
6767
container:
6868
image: amd64/rust
6969
steps:
@@ -77,7 +77,7 @@ jobs:
7777
lint-java:
7878
needs: lint
7979
name: Lint Java (${{ matrix.profile.name }})
80-
runs-on: ubuntu-latest
80+
runs-on: ubuntu-24.04
8181
container:
8282
image: amd64/rust
8383
env:
@@ -103,7 +103,6 @@ jobs:
103103
# spark-4.2 profiles.
104104
fail-fast: false
105105
steps:
106-
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
107106
- uses: actions/checkout@v6
108107

109108
- name: Setup Rust & Java toolchain
@@ -154,7 +153,7 @@ jobs:
154153
build-spark-4-1:
155154
needs: lint
156155
name: Build Spark 4.1, JDK 17
157-
runs-on: ubuntu-latest
156+
runs-on: ubuntu-24.04
158157
container:
159158
image: amd64/rust
160159
steps:
@@ -183,11 +182,10 @@ jobs:
183182
build-native:
184183
needs: lint
185184
name: Build Native Library
186-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=8,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
185+
runs-on: ubuntu-24.04
187186
container:
188187
image: amd64/rust
189188
steps:
190-
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
191189
- uses: actions/checkout@v6
192190
- name: Setup Rust toolchain
193191
uses: ./.github/actions/setup-builder
@@ -236,12 +234,10 @@ jobs:
236234
linux-test-rust:
237235
needs: lint
238236
name: ubuntu-latest/rust-test
239-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
237+
runs-on: ubuntu-24.04
240238
container:
241239
image: amd64/rust
242240
steps:
243-
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
244-
245241
- uses: actions/checkout@v6
246242

247243
- name: Setup Rust & Java toolchain
@@ -292,11 +288,6 @@ jobs:
292288
maven_opts: "-Pspark-3.5 -Pscala-2.13"
293289
scan_impl: "native_iceberg_compat"
294290

295-
- name: "Spark 4.0, JDK 17"
296-
java_version: "17"
297-
maven_opts: "-Pspark-4.0"
298-
scan_impl: "auto"
299-
300291
- name: "Spark 4.0, JDK 21"
301292
java_version: "21"
302293
maven_opts: "-Pspark-4.0"
@@ -342,6 +333,7 @@ jobs:
342333
org.apache.spark.sql.comet.ParquetEncryptionITCase
343334
org.apache.comet.exec.CometNativeReaderSuite
344335
org.apache.comet.CometIcebergNativeSuite
336+
org.apache.comet.CometIcebergRewriteActionSuite
345337
org.apache.comet.iceberg.IcebergReflectionSuite
346338
- name: "csv"
347339
value: |
@@ -401,14 +393,13 @@ jobs:
401393
org.apache.spark.sql.CometCollationSuite
402394
fail-fast: false
403395
name: ${{ matrix.profile.name }}/${{ matrix.profile.scan_impl }} [${{ matrix.suite.name }}]
404-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
396+
runs-on: ubuntu-24.04
405397
container:
406398
image: amd64/rust
407399
env:
408400
JAVA_TOOL_OPTIONS: ${{ (matrix.profile.java_version == '17' || matrix.profile.java_version == '21') && '--add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=java.base/sun.util.calendar=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED' || '' }}
409401

410402
steps:
411-
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
412403
- uses: actions/checkout@v6
413404

414405
- name: Setup Rust & Java toolchain
@@ -449,14 +440,12 @@ jobs:
449440
verify-benchmark-results-tpch:
450441
needs: build-native
451442
name: Verify TPC-H Results
452-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
443+
runs-on: ubuntu-24.04
453444
container:
454445
image: amd64/rust
455446
env:
456447
JAVA_TOOL_OPTIONS: --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=java.base/sun.util.calendar=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.nio.cs=ALL-UNNAMED --add-opens=java.base/sun.security.action=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED
457448
steps:
458-
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
459-
460449
- uses: actions/checkout@v6
461450

462451
- name: Setup Rust & Java toolchain
@@ -505,7 +494,7 @@ jobs:
505494
verify-benchmark-results-tpcds:
506495
needs: build-native
507496
name: Verify TPC-DS Results (${{ matrix.join }})
508-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
497+
runs-on: ubuntu-24.04
509498
container:
510499
image: amd64/rust
511500
env:
@@ -515,8 +504,6 @@ jobs:
515504
join: [sort_merge, broadcast, hash]
516505
fail-fast: false
517506
steps:
518-
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
519-
520507
- uses: actions/checkout@v6
521508

522509
- name: Setup Rust & Java toolchain

.github/workflows/pr_build_macos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ jobs:
181181
org.apache.spark.sql.comet.ParquetEncryptionITCase
182182
org.apache.comet.exec.CometNativeReaderSuite
183183
org.apache.comet.CometIcebergNativeSuite
184+
org.apache.comet.CometIcebergRewriteActionSuite
184185
org.apache.comet.iceberg.IcebergReflectionSuite
185186
- name: "csv"
186187
value: |

.github/workflows/pr_markdown_format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828

2929
jobs:
3030
prettier-check:
31-
runs-on: ubuntu-latest
31+
runs-on: ubuntu-24.04
3232
steps:
3333
- uses: actions/checkout@v6
3434

.github/workflows/pr_missing_suites.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ on:
3030

3131
jobs:
3232
check-missing-suites:
33-
runs-on: ubuntu-latest
33+
runs-on: ubuntu-24.04
3434
steps:
3535
- uses: actions/checkout@v6
3636
- name: Check Missing Suites

0 commit comments

Comments
 (0)