Skip to content

Commit a3f7f66

Browse files
authored
deps: DataFusion 52.0.0 migration (SchemaAdapter changes, etc.) [iceberg] (apache#3536)
1 parent c916849 commit a3f7f66

File tree

39 files changed

+1975
-734
lines changed

39 files changed

+1975
-734
lines changed

dev/diffs/4.0.1.diff

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2960,6 +2960,30 @@ index 09ed6955a51..236a4e99824 100644
29602960
)
29612961
}
29622962
test(s"parquet widening conversion $fromType -> $toType") {
2963+
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetVariantShreddingSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetVariantShreddingSuite.scala
2964+
index 458b5dfc0f4..d209f3c85bc 100644
2965+
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetVariantShreddingSuite.scala
2966+
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetVariantShreddingSuite.scala
2967+
@@ -26,7 +26,7 @@ import org.apache.parquet.hadoop.util.HadoopInputFile
2968+
import org.apache.parquet.schema.{LogicalTypeAnnotation, PrimitiveType}
2969+
import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName
2970+
2971+
-import org.apache.spark.sql.{QueryTest, Row}
2972+
+import org.apache.spark.sql.{IgnoreCometSuite, QueryTest, Row}
2973+
import org.apache.spark.sql.internal.SQLConf
2974+
import org.apache.spark.sql.internal.SQLConf.ParquetOutputTimestampType
2975+
import org.apache.spark.sql.test.SharedSparkSession
2976+
@@ -35,7 +35,9 @@ import org.apache.spark.unsafe.types.VariantVal
2977+
/**
2978+
* Test shredding Variant values in the Parquet reader/writer.
2979+
*/
2980+
-class ParquetVariantShreddingSuite extends QueryTest with ParquetTest with SharedSparkSession {
2981+
+class ParquetVariantShreddingSuite extends QueryTest with ParquetTest with SharedSparkSession
2982+
+ // TODO enable tests once https://github.com/apache/datafusion-comet/issues/2209 is fixed
2983+
+ with IgnoreCometSuite {
2984+
2985+
private def testWithTempDir(name: String)(block: File => Unit): Unit = test(name) {
2986+
withTempDir { dir =>
29632987
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/debug/DebuggingSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/debug/DebuggingSuite.scala
29642988
index b8f3ea3c6f3..bbd44221288 100644
29652989
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/debug/DebuggingSuite.scala

0 commit comments

Comments
 (0)