Skip to content

Commit 45cdced

Browse files
committed
Merge branch 'master' into SPARK-54651
2 parents accbbbe + 587dfa4 commit 45cdced

File tree

2,828 files changed

+159565
-45557
lines changed

Some content is hidden

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

2,828 files changed

+159565
-45557
lines changed

.asf.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
github:
1919
description: "Apache Spark - A unified analytics engine for large-scale data processing"
2020
homepage: https://spark.apache.org/
21+
features:
22+
issues: true
2123
labels:
2224
- python
2325
- scala

.github/labeler.yml

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

.github/workflows/benchmark.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ on:
2828
default: '*'
2929
jdk:
3030
type: choice
31-
description: 'JDK version: 17 or 21'
31+
description: 'JDK version: 17, 21, or 25'
3232
required: true
3333
default: '17'
3434
options:
3535
- '17'
3636
- '21'
37+
- '25'
3738
scala:
3839
type: choice
3940
description: 'Scala version: 2.13'
@@ -72,18 +73,18 @@ jobs:
7273
# Any TPC-DS related updates on this job need to be applied to tpcds-1g job of build_and_test.yml as well
7374
tpcds-1g-gen:
7475
name: "Generate an TPC-DS dataset with SF=1"
75-
if: contains(inputs.class, 'TPCDSQueryBenchmark') || contains(inputs.class, 'ZStandardTPCDSDataBenchmark') || contains(inputs.class, '*')
76+
if: contains(inputs.class, 'TPCDSQueryBenchmark') || contains(inputs.class, 'LZ4TPCDSDataBenchmark') || contains(inputs.class, 'ZStandardTPCDSDataBenchmark') || contains(inputs.class, '*')
7677
runs-on: ubuntu-latest
7778
env:
7879
SPARK_LOCAL_IP: localhost
7980
steps:
8081
- name: Checkout Spark repository
81-
uses: actions/checkout@v4
82+
uses: actions/checkout@v6
8283
# In order to get diff files
8384
with:
8485
fetch-depth: 0
8586
- name: Cache SBT and Maven
86-
uses: actions/cache@v4
87+
uses: actions/cache@v5
8788
with:
8889
path: |
8990
build/apache-maven-*
@@ -93,23 +94,23 @@ jobs:
9394
restore-keys: |
9495
build-
9596
- name: Cache Coursier local repository
96-
uses: actions/cache@v4
97+
uses: actions/cache@v5
9798
with:
9899
path: ~/.cache/coursier
99100
key: benchmark-coursier-${{ inputs.jdk }}-${{ hashFiles('**/pom.xml', '**/plugins.sbt') }}
100101
restore-keys: |
101102
benchmark-coursier-${{ inputs.jdk }}
102103
- name: Cache TPC-DS generated data
103104
id: cache-tpcds-sf-1
104-
uses: actions/cache@v4
105+
uses: actions/cache@v5
105106
with:
106107
path: |
107108
./tpcds-sf-1
108109
./tpcds-sf-1-text
109110
key: tpcds-${{ hashFiles('.github/workflows/benchmark.yml', 'sql/core/src/test/scala/org/apache/spark/sql/TPCDSSchema.scala') }}
110111
- name: Checkout tpcds-kit repository
111112
if: steps.cache-tpcds-sf-1.outputs.cache-hit != 'true'
112-
uses: actions/checkout@v4
113+
uses: actions/checkout@v6
113114
with:
114115
repository: databricks/tpcds-kit
115116
ref: 1b7fb7529edae091684201fab142d956d6afd881
@@ -119,7 +120,7 @@ jobs:
119120
run: cd tpcds-kit/tools && make OS=LINUX
120121
- name: Install Java ${{ inputs.jdk }}
121122
if: steps.cache-tpcds-sf-1.outputs.cache-hit != 'true'
122-
uses: actions/setup-java@v4
123+
uses: actions/setup-java@v5
123124
with:
124125
distribution: zulu
125126
java-version: ${{ inputs.jdk }}
@@ -136,6 +137,7 @@ jobs:
136137
runs-on: ubuntu-latest
137138
strategy:
138139
fail-fast: false
140+
max-parallel: 20
139141
matrix:
140142
split: ${{fromJSON(needs.matrix-gen.outputs.matrix)}}
141143
env:
@@ -150,12 +152,12 @@ jobs:
150152
SPARK_TPCDS_DATA_TEXT: ${{ github.workspace }}/tpcds-sf-1-text
151153
steps:
152154
- name: Checkout Spark repository
153-
uses: actions/checkout@v4
155+
uses: actions/checkout@v6
154156
# In order to get diff files
155157
with:
156158
fetch-depth: 0
157159
- name: Cache SBT and Maven
158-
uses: actions/cache@v4
160+
uses: actions/cache@v5
159161
with:
160162
path: |
161163
build/apache-maven-*
@@ -165,21 +167,21 @@ jobs:
165167
restore-keys: |
166168
build-
167169
- name: Cache Coursier local repository
168-
uses: actions/cache@v4
170+
uses: actions/cache@v5
169171
with:
170172
path: ~/.cache/coursier
171173
key: benchmark-coursier-${{ inputs.jdk }}-${{ hashFiles('**/pom.xml', '**/plugins.sbt') }}
172174
restore-keys: |
173175
benchmark-coursier-${{ inputs.jdk }}
174176
- name: Install Java ${{ inputs.jdk }}
175-
uses: actions/setup-java@v4
177+
uses: actions/setup-java@v5
176178
with:
177179
distribution: zulu
178180
java-version: ${{ inputs.jdk }}
179181
- name: Cache TPC-DS generated data
180-
if: contains(inputs.class, 'TPCDSQueryBenchmark') || contains(inputs.class, 'ZStandardTPCDSDataBenchmark') || contains(inputs.class, '*')
182+
if: contains(inputs.class, 'TPCDSQueryBenchmark') || contains(inputs.class, 'LZ4TPCDSDataBenchmark') || contains(inputs.class, 'ZStandardTPCDSDataBenchmark') || contains(inputs.class, '*')
181183
id: cache-tpcds-sf-1
182-
uses: actions/cache@v4
184+
uses: actions/cache@v5
183185
with:
184186
path: |
185187
./tpcds-sf-1
@@ -223,7 +225,7 @@ jobs:
223225
echo "Error: Failed to push after 5 attempts."
224226
exit 1
225227
- name: Upload benchmark results
226-
uses: actions/upload-artifact@v4
228+
uses: actions/upload-artifact@v6
227229
with:
228230
name: benchmark-results-${{ inputs.jdk }}-${{ inputs.scala }}-${{ matrix.split }}
229231
path: target/benchmark-results-${{ inputs.jdk }}-${{ inputs.scala }}.tar

0 commit comments

Comments
 (0)