Skip to content

Commit 236064d

Browse files
authored
Add native_iceberg_compat tests to CI (apache#1487)
1 parent ce5de44 commit 236064d

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

.github/workflows/pr_build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,21 @@ jobs:
7777
upload-test-reports: ${{ matrix.java_version == '17' }}
7878

7979
linux-test-native-datafusion-scan:
80-
env:
81-
COMET_PARQUET_SCAN_IMPL: "native_datafusion"
8280
strategy:
8381
matrix:
8482
os: [ubuntu-latest]
83+
scan_impl: ['native_datafusion', 'native_iceberg_compat']
8584
java_version: [17]
8685
test-target: [rust, java]
8786
spark-version: ['3.5']
8887
scala-version: ['2.12']
8988
is_push_event:
9089
- ${{ github.event_name == 'push' }}
9190
fail-fast: false
92-
name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}-native-datafusion
91+
name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}-${{ matrix.scan_impl }}
9392
runs-on: ${{ matrix.os }}
93+
env:
94+
COMET_PARQUET_SCAN_IMPL: ${{ matrix.scan_impl }}
9495
container:
9596
image: amd64/rust
9697
steps:

spark/src/test/scala/org/apache/comet/exec/CometExecSuite.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,9 @@ class CometExecSuite extends CometTestBase {
525525
}
526526

527527
test("Comet native metrics: scan") {
528+
// https://github.com/apache/datafusion-comet/issues/1441
529+
assume(CometConf.COMET_NATIVE_SCAN_IMPL.get() != CometConf.SCAN_NATIVE_ICEBERG_COMPAT)
530+
528531
withSQLConf(CometConf.COMET_EXEC_ENABLED.key -> "true") {
529532
withTempDir { dir =>
530533
val path = new Path(dir.toURI.toString, "native-scan.parquet")

spark/src/test/scala/org/apache/comet/parquet/ParquetReadSuite.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,6 +1028,9 @@ abstract class ParquetReadSuite extends CometTestBase {
10281028
}
10291029

10301030
test("scan metrics") {
1031+
// https://github.com/apache/datafusion-comet/issues/1441
1032+
assume(CometConf.COMET_NATIVE_SCAN_IMPL.get() != CometConf.SCAN_NATIVE_ICEBERG_COMPAT)
1033+
10311034
val cometScanMetricNames = Seq(
10321035
"ParquetRowGroups",
10331036
"ParquetNativeDecodeTime",

spark/src/test/scala/org/apache/spark/sql/comet/ParquetEncryptionITCase.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ class ParquetEncryptionITCase extends QueryTest with SQLTestUtils {
4949
private val key2 = encoder.encodeToString("1234567890123451".getBytes(StandardCharsets.UTF_8))
5050

5151
test("SPARK-34990: Write and read an encrypted parquet") {
52+
// https://github.com/apache/datafusion-comet/issues/1488
53+
assume(CometConf.COMET_NATIVE_SCAN_IMPL.get() != CometConf.SCAN_NATIVE_ICEBERG_COMPAT)
54+
5255
import testImplicits._
5356

5457
Seq("org.apache.parquet.crypto.keytools.PropertiesDrivenCryptoFactory").foreach {
@@ -85,6 +88,9 @@ class ParquetEncryptionITCase extends QueryTest with SQLTestUtils {
8588
}
8689

8790
test("SPARK-37117: Can't read files in Parquet encryption external key material mode") {
91+
// https://github.com/apache/datafusion-comet/issues/1488
92+
assume(CometConf.COMET_NATIVE_SCAN_IMPL.get() != CometConf.SCAN_NATIVE_ICEBERG_COMPAT)
93+
8894
import testImplicits._
8995

9096
Seq("org.apache.parquet.crypto.keytools.PropertiesDrivenCryptoFactory").foreach {

0 commit comments

Comments
 (0)