Skip to content

Commit 547e206

Browse files
andygroveclaude
andauthored
chore: Remove IgnoreCometNativeScan from ParquetEncryptionSuite in 3.5.7 diff (#3304)
The three Parquet encryption tests (SPARK-34990, SPARK-37117, SPARK-42114) now pass with both native_datafusion and native_iceberg_compat scan implementations, so the IgnoreCometNativeScan annotations are no longer needed. Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 62e8c2a commit 547e206

1 file changed

Lines changed: 0 additions & 43 deletions

File tree

dev/diffs/3.5.7.diff

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2941,49 +2941,6 @@ index 52abd248f3a..7a199931a08 100644
29412941
case h: HiveTableScanExec => h.partitionPruningPred.collect {
29422942
case d: DynamicPruningExpression => d.child
29432943
}
2944-
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/ParquetEncryptionSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/ParquetEncryptionSuite.scala
2945-
index 549431ef4f4..e48f1730da6 100644
2946-
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/ParquetEncryptionSuite.scala
2947-
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/ParquetEncryptionSuite.scala
2948-
@@ -22,7 +22,7 @@ import java.io.RandomAccessFile
2949-
import java.nio.charset.StandardCharsets
2950-
import java.util.Base64
2951-
2952-
-import org.apache.spark.sql.QueryTest
2953-
+import org.apache.spark.sql.{IgnoreCometNativeScan, QueryTest}
2954-
import org.apache.spark.sql.hive.test.TestHiveSingleton
2955-
2956-
/**
2957-
@@ -37,7 +37,8 @@ class ParquetEncryptionSuite extends QueryTest with TestHiveSingleton {
2958-
private val key1 = encoder.encodeToString("1234567890123450".getBytes(StandardCharsets.UTF_8))
2959-
private val key2 = encoder.encodeToString("1234567890123451".getBytes(StandardCharsets.UTF_8))
2960-
2961-
- test("SPARK-34990: Write and read an encrypted parquet") {
2962-
+ test("SPARK-34990: Write and read an encrypted parquet",
2963-
+ IgnoreCometNativeScan("no encryption support yet")) {
2964-
withTempDir { dir =>
2965-
withSQLConf(
2966-
"parquet.crypto.factory.class" ->
2967-
@@ -64,7 +65,8 @@ class ParquetEncryptionSuite extends QueryTest with TestHiveSingleton {
2968-
}
2969-
}
2970-
2971-
- test("SPARK-37117: Can't read files in Parquet encryption external key material mode") {
2972-
+ test("SPARK-37117: Can't read files in Parquet encryption external key material mode",
2973-
+ IgnoreCometNativeScan("no encryption support yet")) {
2974-
withTempDir { dir =>
2975-
withSQLConf(
2976-
"parquet.crypto.factory.class" ->
2977-
@@ -91,7 +93,8 @@ class ParquetEncryptionSuite extends QueryTest with TestHiveSingleton {
2978-
}
2979-
}
2980-
2981-
- test("SPARK-42114: Test of uniform parquet encryption") {
2982-
+ test("SPARK-42114: Test of uniform parquet encryption",
2983-
+ IgnoreCometNativeScan("no encryption support yet")) {
2984-
withTempDir { dir =>
2985-
withSQLConf(
2986-
"parquet.crypto.factory.class" ->
29872944
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/PartitionedTablePerfStatsSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/PartitionedTablePerfStatsSuite.scala
29882945
index de3b1ffccf0..2a76d127093 100644
29892946
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/PartitionedTablePerfStatsSuite.scala

0 commit comments

Comments
 (0)