Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions dev/diffs/4.0.4.diff
Original file line number Diff line number Diff line change
Expand Up @@ -3056,16 +3056,6 @@ index 08fd8a9ecb5..06967aec8e1 100644
case _ =>
}
assert(numPartitions > 0)
@@ -303,6 +312,9 @@ class ParquetRowIndexSuite extends QueryTest with SharedSparkSession {
val conf = RowIndexTestConf(useDataSourceV2 = useDataSourceV2)

test(s"invalid row index column type - ${conf.desc}") {
+ // https://github.com/apache/datafusion-comet/issues/3886
+ // Comet throws RuntimeException instead of SparkException
+ assume(false)
withSQLConf(conf.sqlConfs: _*) {
withTempPath{ path =>
val df = spark.range(0, 10, 1, 1).toDF("id")
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetSchemaPruningSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetSchemaPruningSuite.scala
index 5c0b7def039..151184bc98c 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetSchemaPruningSuite.scala
Expand Down
10 changes: 0 additions & 10 deletions dev/diffs/4.1.3.diff
Original file line number Diff line number Diff line change
Expand Up @@ -3222,16 +3222,6 @@ index 08fd8a9ecb5..06967aec8e1 100644
case _ =>
}
assert(numPartitions > 0)
@@ -303,6 +312,9 @@ class ParquetRowIndexSuite extends QueryTest with SharedSparkSession {
val conf = RowIndexTestConf(useDataSourceV2 = useDataSourceV2)

test(s"invalid row index column type - ${conf.desc}") {
+ // https://github.com/apache/datafusion-comet/issues/3886
+ // Comet throws RuntimeException instead of SparkException
+ assume(false)
withSQLConf(conf.sqlConfs: _*) {
withTempPath{ path =>
val df = spark.range(0, 10, 1, 1).toDF("id")
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetSchemaPruningSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetSchemaPruningSuite.scala
index 5c0b7def039..151184bc98c 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetSchemaPruningSuite.scala
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,11 @@ case class CometScanRule(session: SparkSession)
"input_file_block_start, or input_file_block_length")
return None
}
if (ShimFileFormat.findRowIndexColumnIndexInSchema(scanExec.requiredSchema) >= 0) {
// Check the name directly instead of calling findRowIndexColumnIndexInSchema, which validates
// the temporary column's type and can throw a raw RuntimeException. Falling back lets Spark's
// Parquet reader wrap that validation failure as FAILED_READ_FILE.
if (scanExec.requiredSchema.fieldNames.contains(
ShimFileFormat.ROW_INDEX_TEMPORARY_COLUMN_NAME)) {
withFallbackReason(scanExec, "Native Parquet scan does not support row index generation")
return None
}
Expand Down
Loading