Skip to content

Commit 70c400b

Browse files
author
Kazantsev Maksim
committed
Merge remote-tracking branch 'origin/main' into elt_func
# Conflicts: # native/core/src/execution/jni_api.rs
2 parents fc22ee7 + aef41be commit 70c400b

79 files changed

Lines changed: 5659 additions & 412 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.

‎.github/workflows/docs.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ jobs:
4646
with:
4747
python-version: "3.10"
4848

49+
- name: Setup Java
50+
uses: actions/setup-java@v4
51+
with:
52+
distribution: 'temurin'
53+
java-version: '17'
54+
cache: 'maven'
55+
4956
- name: Install dependencies
5057
run: |
5158
set -x

‎.github/workflows/pr_build_linux.yml‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
jdk-version: 17 # JDK only needed for common module proto generation
7979

8080
- name: Restore Cargo cache
81-
uses: actions/cache/restore@v4
81+
uses: actions/cache/restore@v5
8282
with:
8383
path: |
8484
~/.cargo/registry
@@ -96,14 +96,14 @@ jobs:
9696
cargo build --profile ci
9797
9898
- name: Upload native library
99-
uses: actions/upload-artifact@v4
99+
uses: actions/upload-artifact@v6
100100
with:
101101
name: native-lib-linux
102102
path: native/target/ci/libcomet.so
103103
retention-days: 1
104104

105105
- name: Save Cargo cache
106-
uses: actions/cache/save@v4
106+
uses: actions/cache/save@v5
107107
if: github.ref == 'refs/heads/main'
108108
with:
109109
path: |
@@ -129,7 +129,7 @@ jobs:
129129
jdk-version: 17
130130

131131
- name: Restore Cargo cache
132-
uses: actions/cache/restore@v4
132+
uses: actions/cache/restore@v5
133133
with:
134134
path: |
135135
~/.cargo/registry
@@ -144,7 +144,7 @@ jobs:
144144
uses: ./.github/actions/rust-test
145145

146146
- name: Save Cargo cache
147-
uses: actions/cache/save@v4
147+
uses: actions/cache/save@v5
148148
if: github.ref == 'refs/heads/main'
149149
with:
150150
path: |
@@ -169,27 +169,27 @@ jobs:
169169
- name: "Spark 3.5.5, JDK 17, Scala 2.13"
170170
java_version: "17"
171171
maven_opts: "-Pspark-3.5 -Dspark.version=3.5.5 -Pscala-2.13"
172-
scan_impl: "native_comet"
172+
scan_impl: "auto"
173173

174174
- name: "Spark 3.5.6, JDK 17, Scala 2.13"
175175
java_version: "17"
176176
maven_opts: "-Pspark-3.5 -Dspark.version=3.5.6 -Pscala-2.13"
177177
scan_impl: "native_comet"
178178

179-
- name: "Spark 3.5, JDK 17, Scala 2.12 native_datafusion"
179+
- name: "Spark 3.5, JDK 17, Scala 2.12"
180180
java_version: "17"
181181
maven_opts: "-Pspark-3.5 -Pscala-2.12"
182182
scan_impl: "native_datafusion"
183183

184-
- name: "Spark 3.5, JDK 17, Scala 2.12 native_iceberg_compat"
184+
- name: "Spark 3.5, JDK 17, Scala 2.12"
185185
java_version: "17"
186186
maven_opts: "-Pspark-3.5 -Pscala-2.12"
187187
scan_impl: "native_iceberg_compat"
188188

189189
- name: "Spark 4.0, JDK 17"
190190
java_version: "17"
191191
maven_opts: "-Pspark-4.0"
192-
scan_impl: "native_comet"
192+
scan_impl: "auto"
193193
suite:
194194
- name: "fuzz"
195195
value: |
@@ -202,6 +202,7 @@ jobs:
202202
value: |
203203
org.apache.comet.exec.CometShuffleSuite
204204
org.apache.comet.exec.CometShuffle4_0Suite
205+
org.apache.comet.exec.CometNativeColumnarToRowSuite
205206
org.apache.comet.exec.CometNativeShuffleSuite
206207
org.apache.comet.exec.CometShuffleEncryptionSuite
207208
org.apache.comet.exec.CometShuffleManagerSuite
@@ -266,7 +267,7 @@ jobs:
266267
value: |
267268
org.apache.spark.sql.CometToPrettyStringSuite
268269
fail-fast: false
269-
name: ${{ matrix.os }}/${{ matrix.profile.name }} [${{ matrix.suite.name }}]
270+
name: ${{ matrix.os }}/${{ matrix.profile.name }}/${{ matrix.profile.scan_impl }} [${{ matrix.suite.name }}]
270271
runs-on: ${{ matrix.os }}
271272
container:
272273
image: amd64/rust
@@ -283,15 +284,15 @@ jobs:
283284
jdk-version: ${{ matrix.profile.java_version }}
284285

285286
- name: Download native library
286-
uses: actions/download-artifact@v4
287+
uses: actions/download-artifact@v7
287288
with:
288289
name: native-lib-linux
289290
# Download to release/ since Maven's -Prelease expects libcomet.so there
290291
path: native/target/release/
291292

292293
# Restore cargo registry cache (for any cargo commands that might run)
293294
- name: Cache Cargo registry
294-
uses: actions/cache@v4
295+
uses: actions/cache@v5
295296
with:
296297
path: |
297298
~/.cargo/registry
@@ -327,13 +328,13 @@ jobs:
327328
jdk-version: 11
328329

329330
- name: Download native library
330-
uses: actions/download-artifact@v4
331+
uses: actions/download-artifact@v7
331332
with:
332333
name: native-lib-linux
333334
path: native/target/release/
334335

335336
- name: Cache Maven dependencies
336-
uses: actions/cache@v4
337+
uses: actions/cache@v5
337338
with:
338339
path: |
339340
~/.m2/repository
@@ -344,7 +345,7 @@ jobs:
344345
345346
- name: Cache TPC-H data
346347
id: cache-tpch
347-
uses: actions/cache@v4
348+
uses: actions/cache@v5
348349
with:
349350
path: ./tpch
350351
key: tpch-${{ hashFiles('.github/workflows/pr_build_linux.yml') }}
@@ -383,13 +384,13 @@ jobs:
383384
jdk-version: 11
384385

385386
- name: Download native library
386-
uses: actions/download-artifact@v4
387+
uses: actions/download-artifact@v7
387388
with:
388389
name: native-lib-linux
389390
path: native/target/release/
390391

391392
- name: Cache Maven dependencies
392-
uses: actions/cache@v4
393+
uses: actions/cache@v5
393394
with:
394395
path: |
395396
~/.m2/repository
@@ -400,7 +401,7 @@ jobs:
400401
401402
- name: Cache TPC-DS data
402403
id: cache-tpcds
403-
uses: actions/cache@v4
404+
uses: actions/cache@v5
404405
with:
405406
path: ./tpcds-sf-1
406407
key: tpcds-${{ hashFiles('.github/workflows/pr_build_linux.yml') }}

‎.github/workflows/pr_build_macos.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
protoc-architecture: aarch_64
7979

8080
- name: Restore Cargo cache
81-
uses: actions/cache/restore@v4
81+
uses: actions/cache/restore@v5
8282
with:
8383
path: |
8484
~/.cargo/registry
@@ -96,14 +96,14 @@ jobs:
9696
cargo build --profile ci
9797
9898
- name: Upload native library
99-
uses: actions/upload-artifact@v4
99+
uses: actions/upload-artifact@v6
100100
with:
101101
name: native-lib-macos
102102
path: native/target/ci/libcomet.dylib
103103
retention-days: 1
104104

105105
- name: Save Cargo cache
106-
uses: actions/cache/save@v4
106+
uses: actions/cache/save@v5
107107
if: github.ref == 'refs/heads/main'
108108
with:
109109
path: |
@@ -145,6 +145,7 @@ jobs:
145145
value: |
146146
org.apache.comet.exec.CometShuffleSuite
147147
org.apache.comet.exec.CometShuffle4_0Suite
148+
org.apache.comet.exec.CometNativeColumnarToRowSuite
148149
org.apache.comet.exec.CometNativeShuffleSuite
149150
org.apache.comet.exec.CometShuffleEncryptionSuite
150151
org.apache.comet.exec.CometShuffleManagerSuite
@@ -224,15 +225,15 @@ jobs:
224225
protoc-architecture: aarch_64
225226

226227
- name: Download native library
227-
uses: actions/download-artifact@v4
228+
uses: actions/download-artifact@v7
228229
with:
229230
name: native-lib-macos
230231
# Download to release/ since Maven's -Prelease expects libcomet.dylib there
231232
path: native/target/release/
232233

233234
# Restore cargo registry cache (for any cargo commands that might run)
234235
- name: Cache Cargo registry
235-
uses: actions/cache@v4
236+
uses: actions/cache@v5
236237
with:
237238
path: |
238239
~/.cargo/registry

0 commit comments

Comments
 (0)